Constant evaluate fixed attributes

OpenModelica · Mar 17, 2017 · b93e15a · b93e15a
1 parent 15883dd
commit b93e15a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/Compiler/NFFrontEnd/NFCeval.mo b/Compiler/NFFrontEnd/NFCeval.mo
@@ -49,6 +49,11 @@ uniontype EvalTarget
     SourceInfo info;
   end DIMENSION;
 
+  record ATTRIBUTE
+    Expression exp;
+    SourceInfo info;
+  end ATTRIBUTE;
+
   record IGNORE_ERRORS end IGNORE_ERRORS;
 end EvalTarget;
 

diff --git a/Compiler/NFFrontEnd/NFTyping.mo b/Compiler/NFFrontEnd/NFTyping.mo
@@ -373,10 +373,39 @@ protected
 algorithm
   name := Modifier.name(attribute);
   binding := Modifier.binding(attribute);
+
   binding := typeBinding(binding, scope);
+
+  binding := match name
+    case "fixed" then evalBinding(binding);
+    else binding;
+  end match;
+
   attribute := Modifier.setBinding(binding, attribute);
 end typeTypeAttribute;
 
+function evalBinding
+  input output Binding binding;
+algorithm
+  binding := match binding
+    local
+      Expression exp;
+
+    case Binding.TYPED_BINDING()
+      algorithm
+        exp := Ceval.evalExp(binding.bindingExp, Ceval.EvalTarget.ATTRIBUTE(binding.bindingExp, binding.info));
+        exp := SimplifyExp.simplifyExp(exp);
+      then
+        Binding.TYPED_BINDING(exp, binding.bindingType, binding.variability, binding.propagatedDims, binding.info);
+
+    else
+      algorithm
+        assert(false, getInstanceName() + " failed for " + Binding.toString(binding));
+      then
+        fail();
+  end match;
+end evalBinding;
+
 function checkRealAttributes
   input list<Modifier> attributes;
 algorithm