Changeset 13919 for branches/dev-mo-2530/Compiler/ModelicaMiddleEnd/src/jastadd/scalarization/Scalarization.jrag

Timestamp:

Oct 31, 2019 12:54:25 PM (6 weeks ago)

Author:

molsson

Message:

Merged revision(s) 13884, 13917 from branches/dev-mo-2278-merge

Location:

branches/dev-mo-2530

Files:

• . (modified) (1 prop)
• Compiler/ModelicaMiddleEnd/src/jastadd/scalarization/Scalarization.jrag (modified) (2 diffs)

branches/dev-mo-2530/Compiler/ModelicaMiddleEnd/src/jastadd/scalarization/Scalarization.jrag

@@ -619 +619 @@
     public class ScalarizingVariableInstance {
         
-        private TypePrefixVariability variability; 
-        
-        private VisibilityType visibility;
+        private final TypePrefixVariability variability; 
+        
+        private final VisibilityType visibility;
         
         // Binding expression
-        private FExp bExp;
+        private final FExp bExp;
         
         // (Mapped) attributes of this variable
-        private Map<String, FAttribute> mattrs; 
+        private final Map<String, FAttribute> mattrs; 
         
         // Full name of this variable
-        private String name;
+        private final String name;
         
         // input/output prefix of top-level variable
-        private CausalityConnectorPrefix inputOutput;
-        
-        private Index index;
+        private final CausalityConnectorPrefix inputOutput;
+        
+        private final Index index;
         
         private ScalarizingVariableInstance(String name, Map<String, FAttribute> mattrs, FExp be,
@@ -645 +645 @@
             this.variability = variability;
             this.visibility = visibility;
-            this.inputOutput = inputOutput;
+            /* If we have a record with input/output prefix that contains a parameter,
+             * that parameter should not inherit the input/output prefix */
+            this.inputOutput = variability.parameterOrLess() ? CausalityConnectorPrefix.NONE : inputOutput;
         }