Changeset 14164

Timestamp:

Nov 25, 2019 12:32:01 PM (11 days ago)

Author:

molsson

Message:

Merged revision(s) 14105-14107, 14121, 14141 from branches/dev-mo-2559:
Added support for compiling with modifications to test framework. (#5879)
........
Removed automatic adding of missing parenthesis when compiling with modifications in unit test. (#5879)
........
Added an implicit space before modification added for unit test, to avoid syntax error when giving only annotation. (#5879)
........
#5879 improved name lookup in InstGeneratedInner. removed implicit space added in r14107.
........
#5879 using vendorAnnotation() instead of hard-coded string
........

Location:

branches/dev-mo-st

Files:

• . (modified) (1 prop)
• Compiler/ModelicaFrontEnd/src/jastadd/instance/InnerOuter.jrag (modified) (1 diff)
• Compiler/ModelicaFrontEnd/test/modelica/NameTests.mo (modified) (1 diff)
• Compiler/TestFramework/src/jastadd/TestCase.jrag (modified) (4 diffs)

branches/dev-mo-st/Compiler/ModelicaFrontEnd/src/jastadd/instance/InnerOuter.jrag

@@ -93 +93 @@
     syn nta List<InstGeneratedInner> InstClassDecl.getInstGeneratedInners() = new List<InstGeneratedInner>();
 
-    eq InstGeneratedInner.getChild().myEnvironment() = new Environment();
-    eq InstGeneratedInner.getChild().myEnvironment(String name) = new Environment();
+    eq InstGeneratedInner.getChild().lookupInstComponentInInstElement(String name) {
+        InstComponentDecl icd = getInstComponentDecl();
+        if (icd.matches(name)) {
+            return InstLookupResult.<InstComponentDecl>found(icd);
+        }
+        return icd.genericLookupInstComponent(name);
+    }
+
+    eq InstGeneratedInner.getChild().myEnvironment()            = new Environment().mergeInnerClone(getGeneratedInnerModifications());
+    eq InstGeneratedInner.getChild().myEnvironment(String name) = new Environment().mergeInnerClone(getGeneratedInnerModifications()).filter(name);
+    
+    syn nta List<InstModification> InstGeneratedInner.getGeneratedInnerModifications() {
+        List<InstModification> res = new List<>();
+        SrcModification annotation = myInnerAnnotation(name());
+        if (annotation != null) {
+            res.add(annotation.newInstModification());
+        }
+        return res;
+    }
+    
+    inh SrcModification InstGeneratedInner.myInnerAnnotation(String name);
+    eq BaseNode.getChild().myInnerAnnotation(String name) = null;
+    eq InstClassDecl.getChild().myInnerAnnotation(String name) {
+        AnnotationNode an = annotation().vendorNode().forPath("inners").forPath(name);
+        if (!an.exists()) {
+            return null;
+        }
+        return (SrcModification) an.ast();
+    }
 
     public InstGeneratedInner.InstGeneratedInner(InstClassDecl parent, InstComponentDecl outer, InstComponentDecl nonInner) {

branches/dev-mo-st/Compiler/ModelicaFrontEnd/test/modelica/NameTests.mo

@@ -4294 +4294 @@
 end OrderFile4;
 
+
+model ModificationOnTest1
+    Real x = time;
+
+annotation(__JModelica(UnitTesting(tests={
+    FlatteningTestCase(
+        name="ModificationOnTest1",
+        description="Check that a modification to the test class can be added in test annotation",
+        modification="(x=2)",
+        flatModel="
+fclass NameTests.ModificationOnTest1
+ Real x = 2;
+end NameTests.ModificationOnTest1;
+")})));
+end ModificationOnTest1;
+
 end NameTests;

branches/dev-mo-st/Compiler/TestFramework/src/jastadd/TestCase.jrag

@@ -60 +60 @@
     private String sourceFileName = null;
     private String className = null;
+    private String modification = null;
     private int beginLine = -1;
 
@@ -292 +293 @@
     }
 
+    /**
+     * @return the modification
+     */
+    public String getModification() {
+        return modification;
+    }
+
+    /**
+     * @param name the modification to set
+     */
+    public void setModification(String modification) {
+        this.modification = modification;
+    }
+
+    /**
+     * Returns the class name with any set modification added to it, 
+     * using the syntax accepted by ModelicaCompiler.
+     */
+    public String makeClassNameWithMod() {
+        StringBuilder buf = new StringBuilder(className);
+        if (modification != null) {
+            buf.append(modification);
+        }
+        return buf.toString();
+    }
+    
     /**
      * @return the beginLine
@@ -600 +627 @@
         // Instantiate and check for errors.
         InstProgramRoot ipr = sr.getProgram().getInstProgramRoot();
+        String classNameWithMod = makeClassNameWithMod();
         Collection<Problem> problems = null;
         try {
-            ipr.checkErrorsInInstClass(className, checkType);
+            ipr.checkErrorsInInstClass(classNameWithMod, checkType);
             problems = sr.collectWarnings();
         } catch (CompilerException e) {
@@ -610 +638 @@
         
         // Test instantiated class
-        InstClassDecl icd = ipr.instantiateModel(getClassName());
+        InstClassDecl icd = ipr.instantiateModel(classNameWithMod);
         uif.modelInstantiated(icd);
         if (testInstantiated(icd)) return;