Changeset 9620

Timestamp:

Feb 7, 2017 9:53:31 AM (3 years ago)

Author:

Zimon Kuhs

Message:

#5284

Added the 'lazy' attribute to the equations that had 'nta' removed in r9610.

Location:

trunk/Compiler

Files:

• ModelicaFlatTree/src/jastadd/FlatUtil.jrag (modified) (3 diffs)
• ModelicaFrontEnd/src/jastadd/instance/InstanceTree.jrag (modified) (3 diffs)
• ModelicaMiddleEnd/src/jastadd/TransformCanonical.jrag (modified) (1 diff)

trunk/Compiler/ModelicaFlatTree/src/jastadd/FlatUtil.jrag

@@ -2156 +2156 @@
         }
     }
-    
+
     public class FClass {
         public <V extends FDynamicResolver> V dynamicResolver(V res) {
@@ -2163 +2163 @@
         }
     }
-    
-    syn Opt FClass.getFDynamicResolverOpt() = new DynamicOpt();
-    syn Opt FIndexReductionResolver.getFVariableOpt() = new DynamicOpt();
-    syn Opt FIndexReductionResolver.getFAbstractEquationOpt() = new DynamicOpt();
-    
+
+    syn lazy Opt FClass.getFDynamicResolverOpt() = new DynamicOpt();
+    syn lazy Opt FIndexReductionResolver.getFVariableOpt() = new DynamicOpt();
+    syn lazy Opt FIndexReductionResolver.getFAbstractEquationOpt() = new DynamicOpt();
+
     /**
      * Dynamic resolver used during index reduction to handle differentiated
@@ -2173 +2173 @@
      */
     public class FIndexReductionResolver {
-        
+
         private final Map<String, FVariable> lookupMap = new HashMap<String, FVariable>();
         /**

trunk/Compiler/ModelicaFrontEnd/src/jastadd/instance/InstanceTree.jrag

@@ -938 +938 @@
     eq InstPrimitive.getInstClassDeclList() = new List();
 
-    syn List<InstComponentDecl> InstRecordConstructor.getInstComponentDeclList() {
+    syn lazy List<InstComponentDecl> InstRecordConstructor.getInstComponentDeclList() {
         InstClassDecl rec = getRecord().myInstClassDecl().actualInstClass();
         List<InstComponentDecl> l = new List<InstComponentDecl>();
@@ -946 +946 @@
     }
 
-    syn List<InstExtends> InstRecordConstructor.getInstExtendsList() {
+    syn lazy List<InstExtends> InstRecordConstructor.getInstExtendsList() {
         InstClassDecl rec = getRecord().myInstClassDecl().actualInstClass();
         List l = new List();
@@ -955 +955 @@
     }
 
-    syn List<InstModification> InstRecordConstructor.getInstModificationList() {
+    syn lazy List<InstModification> InstRecordConstructor.getInstModificationList() {
         List<InstModification> res = new List<InstModification>();
         for (InstFunctionArgument ifa : getArgs()) {

trunk/Compiler/ModelicaMiddleEnd/src/jastadd/TransformCanonical.jrag

@@ -1098 +1098 @@
     eq FIfWhenClause.getFStatement().needsIndicatorInit()  = true;
     eq FWhileStmt.getWhileStmt().needsIndicatorInit()      = true;
-    
-    /**
-     * A reference to the FVariable set as indicator for a FRelExp
-     * Only used in algorithms
-     */
-    syn Opt<FIdUseExp> FRelExp.getIndicatorOpt() = new Opt<FIdUseExp>();
-    
+
+    /**
+     * A reference to the FVariable set as indicator for a FRelExp
+     * Only used in algorithms
+     */
+    syn lazy Opt<FIdUseExp> FRelExp.getIndicatorOpt() = new Opt<FIdUseExp>();
+
     /**
      * Creates an indicator for this FRelExp