Changeset 13719 for trunk/Compiler/ModelicaFlatTree/src/jastadd/ConstantEvaluation/ConstantEvaluation.jrag

Timestamp:

Oct 10, 2019 2:41:07 PM (2 months ago)

Author:

Christian Andersson

Message:

Recommitted changeset:13700 to trunk with two bug fixes. Related to ticket:5837

Location:

trunk

Files:

• . (modified) (1 prop)
• Compiler/ModelicaFlatTree/src/jastadd/ConstantEvaluation/ConstantEvaluation.jrag (modified) (7 diffs)

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

@@ -5079 +5079 @@
         }
         
-        public AlgorithmEvaluator createAlgorithmEvaluator(AbstractOptionRegistry options, Map<CommonVariableDecl, CValue> values) {
+        public AlgorithmEvaluator createAlgorithmEvaluator(OptionRegistry options, Map<CommonVariableDecl, CValue> values) {
             return new AlgorithmEvaluator(externalEvaluationEnabled, options, values);
         }
         
-        public AlgorithmEvaluator createEmptyAlgorithmEvaluator(AbstractOptionRegistry options) {
+        public AlgorithmEvaluator createEmptyAlgorithmEvaluator(OptionRegistry options) {
             return new AlgorithmEvaluator(true, options, Collections.<CommonVariableDecl, CValue>emptyMap());
         }
@@ -5149 +5149 @@
         
         @Override
-        public AlgorithmEvaluator createAlgorithmEvaluator(AbstractOptionRegistry options, Map<CommonVariableDecl, CValue> values) {
+        public AlgorithmEvaluator createAlgorithmEvaluator(OptionRegistry options, Map<CommonVariableDecl, CValue> values) {
             return new PartialAlgorithmEvaluator(externalEvaluationEnabled(), options, values, this);
         }
@@ -5183 +5183 @@
         
         @Override
-        public AlgorithmEvaluator createAlgorithmEvaluator(AbstractOptionRegistry options, Map<CommonVariableDecl, CValue> values) {
+        public AlgorithmEvaluator createAlgorithmEvaluator(OptionRegistry options, Map<CommonVariableDecl, CValue> values) {
             if (this.values == null) {
                 this.values = values;
@@ -5277 +5277 @@
     public class AlgorithmEvaluator extends VariableEvaluator {
         
-        protected Map<CommonVariableDecl, CValue> values;
-        private AbstractOptionRegistry options;
-        
-        public AlgorithmEvaluator(boolean evaluateExternalEnabled, AbstractOptionRegistry options, Map<CommonVariableDecl, CValue> values) {
+        protected final Map<CommonVariableDecl, CValue> values;
+        private final OptionRegistry options;
+        
+        public AlgorithmEvaluator(boolean evaluateExternalEnabled, OptionRegistry options, Map<CommonVariableDecl, CValue> values) {
             super(evaluateExternalEnabled);
             this.values  = values;
@@ -5287 +5287 @@
         
         public int externalEvaluation() {
-            return externalEvaluationEnabled() ? options.getIntegerOption("external_constant_evaluation") : 0;
+            return externalEvaluationEnabled() ? options.external_constant_evaluation.getValue() : 0;
         }
         
@@ -5351 +5351 @@
         protected ArrayList<IfEvaluation> ifStack;
         
-        public PartialAlgorithmEvaluator(boolean evaluateExternalEnabled, AbstractOptionRegistry options,
+        public PartialAlgorithmEvaluator(boolean evaluateExternalEnabled, OptionRegistry options,
                 Map<CommonVariableDecl, CValue> values, PartialVariableEvaluator variableEvaluator) {
             super(evaluateExternalEnabled, options, values);
@@ -5368 +5368 @@
         
         @Override
-        public AlgorithmEvaluator createAlgorithmEvaluator(AbstractOptionRegistry options, Map<CommonVariableDecl, CValue> values) {
+        public AlgorithmEvaluator createAlgorithmEvaluator(OptionRegistry options, Map<CommonVariableDecl, CValue> values) {
             return variableEvaluator.createAlgorithmEvaluator(options, values);
         }