Changeset 14237

Timestamp:

Nov 29, 2019 6:08:13 PM (12 days ago)

Author:

amartensen

Message:

#5879 moved up the myEnvironment() equations from InstGeneratedInner to InstClassDecl, minor cleanup to the contribution for the NTA InstGeneratedInner.

Location:

branches/dev-2559/Compiler/ModelicaFrontEnd/src/jastadd

Files:

• ast/InstanceTree.ast (modified) (1 diff)
• errorcheck/ErrorCheck.jrag (modified) (1 diff)
• flattening/Flattening.jrag (modified) (2 diffs)
• flattening/connections/Connections.jrag (modified) (1 diff)
• instance/InnerOuter.jrag (modified) (3 diffs)

branches/dev-2559/Compiler/ModelicaFrontEnd/src/jastadd/ast/InstanceTree.ast

@@ -41 +41 @@
                                [Dummy3:InstConstraining];      // Dummy node to prevent InstConstraining from being classified as root
 
-abstract InstClassDecl: InstBaseNode ::= <SrcClassDecl:SrcClassDecl> /[ClassAnnotation:InstClassModification]/ /FunctionType:FType/ /GeneratedInnerModifications:InstModification*/;
+abstract InstClassDecl: InstBaseNode ::= <SrcClassDecl:SrcClassDecl> /[ClassAnnotation:InstClassModification]/ /FunctionType:FType/ /InstGeneratedInners:InstGeneratedInner*/ /GeneratedInnerModifications:InstModification*/;
 abstract InstBaseClassDecl : InstClassDecl ::= [InstConstrainingClass] InstRestriction;
 InstLibNode              : InstClassDecl ::= /ActualInstClass:InstClassDecl/;

branches/dev-2559/Compiler/ModelicaFrontEnd/src/jastadd/errorcheck/ErrorCheck.jrag

@@ -693 +693 @@
             }
             getInstRestriction().collectErrors(checkType);
-            getInstGeneratedInners().collectErrors(checkType);
+            getInstGeneratedInnersList().collectErrors(checkType);
             if (getSrcBaseClassDecl() instanceof SrcFullClassDecl) {
                 SrcFullClassDecl fcd = (SrcFullClassDecl) getSrcBaseClassDecl();

branches/dev-2559/Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag

@@ -98 +98 @@
         Flattener f = new Flattener(fc);
         flatten(f, FlattenBindingExp.ALL, level);
-        getInstGeneratedInners().flatten(f, FlattenBindingExp.ALL, level);
+        getInstGeneratedInnersList().flatten(f, FlattenBindingExp.ALL, level);
         flattenUsedFuncsAndEnums(f);
         flattenInstClassDeclExtra(f);
@@ -324 +324 @@
     public void InstClassDecl.flattenUsedFuncsAndEnums(Flattener f) {
         super.flattenUsedFuncsAndEnums(f);
-        getInstGeneratedInners().flattenUsedFuncsAndEnums(f);
+        getInstGeneratedInnersList().flattenUsedFuncsAndEnums(f);
     }
 

branches/dev-2559/Compiler/ModelicaFrontEnd/src/jastadd/flattening/connections/Connections.jrag

@@ -1336 +1336 @@
     public void InstClassDecl.buildConnectionSets(FAccess prefix, ConnectionSetManager csm, boolean connect) {
         super.buildConnectionSets(prefix, csm, connect);
-        getInstGeneratedInners().buildConnectionSets(prefix, csm, connect);
+        getInstGeneratedInnersList().buildConnectionSets(prefix, csm, connect);
     }
 

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

@@ -76 +76 @@
         String name = outer.name();
         InstGeneratedInner res = null;
-        List<InstGeneratedInner> inners = getInstGeneratedInners();
+        List<InstGeneratedInner> inners = getInstGeneratedInnersList();
         for (InstGeneratedInner node : inners) {
             if (node.matches(name)) {
@@ -87 +87 @@
         } else {
             res = new InstGeneratedInner(this, outer, nonInner);
-            inners.add(res);
-            inners.getChild(inners.getNumChild() - 1);  // Make sure res is final
+            addInstGeneratedInners(res);
+            return getInstGeneratedInners(getNumInstGeneratedInners() - 1).getInstComponentDecl();  // Make sure res is final
         }
         return res.getInstComponentDecl();
     }
 
-    syn nta List<InstGeneratedInner> InstClassDecl.getInstGeneratedInners() = new List<InstGeneratedInner>();
+    syn nta List<InstGeneratedInner> InstClassDecl.getInstGeneratedInnersList() = new List<InstGeneratedInner>();
 
     eq InstClassDecl.getGeneratedInnerModifications().lookupInstComponentInInstElement(String name) {
-        for (InstGeneratedInner igi : getInstGeneratedInners()) {
+        for (InstGeneratedInner igi : getInstGeneratedInnersList()) {
             InstComponentDecl icd = igi.getInstComponentDecl();
             if (icd.matches(name)) {
@@ -105 +105 @@
     }
 
-    eq InstGeneratedInner.getChild().myEnvironment()            = new Environment().mergeInnerClone(myGeneratedInnerModifications());
-    eq InstGeneratedInner.getChild().myEnvironment(String name) = new Environment().mergeInnerClone(myGeneratedInnerModifications()).filter(name);
+    eq InstClassDecl.getInstGeneratedInners().myEnvironment()            = new Environment().mergeInnerClone(getGeneratedInnerModificationsList());
+    eq InstClassDecl.getInstGeneratedInners().myEnvironment(String name) = new Environment().mergeInnerClone(getGeneratedInnerModificationsList()).filter(name);
     
-    inh List<InstModification> InstGeneratedInner.myGeneratedInnerModifications();
-    eq InstClassDecl.getChild().myGeneratedInnerModifications() = getGeneratedInnerModificationsList(); 
-
     syn lazy List<InstModification> InstClassDecl.getGeneratedInnerModificationsList() {
         List<InstModification> res = new List<>();