Changeset 13800 for branches/dev-5819/Compiler/ModelicaFlatTree/src/jastadd/FlatAPI/FlatAPIAttributes.jrag

Timestamp:

Oct 22, 2019 11:31:16 AM (7 weeks ago)

Author:

randersson

Message:

#5819 Merged trunk into branch

Location:

branches/dev-5819

Files:

• . (modified) (1 prop)
• Compiler/ModelicaFlatTree/src/jastadd/FlatAPI/FlatAPIAttributes.jrag (modified) (2 diffs)

branches/dev-5819/Compiler/ModelicaFlatTree/src/jastadd/FlatAPI/FlatAPIAttributes.jrag

@@ -109 +109 @@
     syn CValue FVariable.attributeCValueBoolean(String name, boolean def) {
         FAttribute a = findAttribute(name);
-        return (attributeSet(a) ? attributeExp(a).ceval() : new CValueBoolean(def)).expandArray(size());
+        return (attributeSet(a) ? attributeExp(a).ceval() : CValueBoolean.valueOf(def)).expandArray(size());
     }
     syn CValue FVariable.attributeCValueReal(String name, double def) {
         FAttribute a = findAttribute(name);
-        return (attributeSet(a) ? attributeExp(a).ceval() : new CValueReal(def)).expandArray(size());
+        return (attributeSet(a) ? attributeExp(a).ceval() : CValueReal.valueOf(def)).expandArray(size());
     }
     syn CValue FVariable.attributeCValueInteger(String name, int def) {
         FAttribute a = findAttribute(name);
-        return (attributeSet(a) ? attributeExp(a).ceval() : new CValueInteger(def)).expandArray(size());
+        return (attributeSet(a) ? attributeExp(a).ceval() : CValueInteger.valueOf(def)).expandArray(size());
     }
     syn CValue FVariable.attributeCValueEnum(String name, FType type, int def) {
@@ -200 +200 @@
     syn CValue FVariable.startAttributeCValue()   = CValue.UNKNOWN;
     eq FRealVariable.startAttributeCValue()       = attributeCValueReal(FAttribute.START, 0.0);
-    eq FDerivativeVariable.startAttributeCValue() = new CValueReal(0.0);
+    eq FDerivativeVariable.startAttributeCValue() = CValueReal.valueOf(0.0);
     eq FIntegerVariable.startAttributeCValue()    = attributeCValueInteger(FAttribute.START, 0);
     eq FBooleanVariable.startAttributeCValue()    = attributeCValueBoolean(FAttribute.START, false);