[FE] new API and replaceable support

adrpo · OpenModelica-Hudson · commit ad34730536c2 · 2019-05-14T09:40:02.000+02:00
- work in progress - to use, just add +d=nfAPI to the OMEdit simulation flags - handling of getComponentAnnotations via NF (some models are about 6x faster) - some crashes in OMEdit, not debugged yet, for example: Modelica.Fluid.Examples.AST_BatchPlant.BatchPlant_StandardWater Belonging to [master]: - OpenModelica/OpenModelica#175 - #3087
diff --git a/Compiler/FrontEnd/Absyn.mo b/Compiler/FrontEnd/Absyn.mo
@@ -6917,5 +6917,38 @@ algorithm
   end match;
 end pathPartCount;
 
+public function getAnnotationsFromConstraintClass
+  input Option<ConstrainClass> inCC;
+  output list<ElementArg> outElArgLst;
+algorithm
+  outElArgLst := match(inCC)
+    local list<ElementArg> elementArgs;
+    case SOME(CONSTRAINCLASS(comment = SOME(COMMENT(annotation_ = SOME(ANNOTATION(elementArgs))))))
+      then elementArgs;
+    else {};
+  end match;
+end getAnnotationsFromConstraintClass;
+
+public function getAnnotationsFromItems
+  input list<ComponentItem> inComponentItems;
+  input list<ElementArg> ccAnnotations;
+  output list<list<ElementArg>> outLst = {};
+protected
+  list<Absyn.ElementArg> annotations;
+  list<String> res;
+  String str;
+algorithm
+  for comp in listReverse(inComponentItems) loop
+    annotations := match comp
+      case Absyn.COMPONENTITEM(comment = SOME(Absyn.COMMENT(annotation_ =
+          SOME(Absyn.ANNOTATION(annotations)))))
+        then listAppend(annotations, ccAnnotations);
+      else ccAnnotations;
+    end match;
+
+    outLst := annotations :: outLst;
+  end for;
+end getAnnotationsFromItems;
+
 annotation(__OpenModelica_Interface="frontend");
 end Absyn;
diff --git a/Compiler/FrontEnd/Constants.mo b/Compiler/FrontEnd/Constants.mo
@@ -227,9 +227,9 @@ record Transformation
 end Transformation;
 
 record Placement
-  Boolean visible = true;
-  Transformation transformation \"Placement in the dagram layer\";
-  Transformation iconTransformation \"Placement in the icon layer\";
+  parameter Boolean visible = true;
+  parameter Transformation transformation \"Placement in the dagram layer\";
+  parameter Transformation iconTransformation \"Placement in the icon layer\";
 end Placement;
 
 record IconMap
@@ -413,9 +413,9 @@ end OnMouseDownEditString;
 //
 record Dialog
    parameter String tab = \"General\";
-   parameter String group = \"\";
+   parameter String group = \"Parameters\";
    parameter Boolean enable = true;
-   parameter Boolean showStartAttribute;
+   parameter Boolean showStartAttribute = false;
    parameter Boolean colorSelector = false;
    parameter Selector loadSelector;
    parameter Selector saveSelector;
diff --git a/Compiler/FrontEnd/DAEUtil.mo b/Compiler/FrontEnd/DAEUtil.mo
@@ -1930,10 +1930,16 @@ public function getVariableBindingsStr "
   input list<DAE.Element> elts;
   output String str;
 protected
-  list<DAE.Element> varlst;
+  list<DAE.Element> varlst, els;
 algorithm
-  varlst := getVariableList(elts);
-  str := getBindingsStr(varlst);
+  str := match elts
+    case {DAE.COMP(dAElist = els)} then getVariableBindingsStr(els);
+    else
+     algorithm
+       varlst := getVariableList(elts);
+       str := getBindingsStr(varlst);
+     then str;
+  end match;
 end getVariableBindingsStr;
 
 protected function getVariableList "
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -893,7 +893,7 @@ package Internal "Contains internal implementations, e.g. overloaded builtin fun
 
   function solverClock
     input Clock c;
-    input String solverMethod;
+    parameter input String solverMethod;
     output Clock clk;
     external "builtin";
   end solverClock;
@@ -2743,6 +2743,18 @@ external "builtin";
 annotation(preferredView="text");
 end getPackages;
 
+function getAllSubtypeOf
+  "Returns the list of all classes that extend from class_ given a parentClass where the lookup for class_ should start"
+  input TypeName parentClass = $TypeName(AllLoadedClasses);
+  input TypeName class_;
+  input Boolean qualified = false;
+  input Boolean includePartial = false;
+  input Boolean sort = false;
+  output TypeName classNames[:];
+external "builtin";
+annotation(preferredView="text");
+end getAllSubtypeOf;
+
 partial function basePlotFunction "Extending this does not seem to work at the moment. A real shame; functions below are copy-paste and all need to be updated if the interface changes."
   input String fileName = "<default>" "The filename containing the variables. <default> will read the last simulation result";
   input String interpolation = "linear" "
diff --git a/Compiler/NFFrontEnd/NFBuiltin.mo b/Compiler/NFFrontEnd/NFBuiltin.mo
@@ -390,6 +390,7 @@ constant InstNode TIME =
       NFBinding.EMPTY_BINDING,
       NFComponent.INPUT_ATTR,
       NONE(),
+      NONE(),
       Absyn.dummyInfo)),
     InstNode.EMPTY_NODE(),
     InstNodeType.NORMAL_COMP());
diff --git a/Compiler/NFFrontEnd/NFBuiltinFuncs.mo b/Compiler/NFFrontEnd/NFBuiltinFuncs.mo
@@ -77,7 +77,7 @@ constant SCode.Element DUMMY_ELEMENT = SCode.CLASS(
 
 // Default Integer parameter.
 constant Component INT_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(),
-  Type.INTEGER(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), Absyn.dummyInfo);
+  Type.INTEGER(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), NONE(), Absyn.dummyInfo);
 
 constant InstNode INT_PARAM = InstNode.COMPONENT_NODE("i",
   Visibility.PUBLIC,
@@ -86,7 +86,7 @@ constant InstNode INT_PARAM = InstNode.COMPONENT_NODE("i",
 
 // Default Real parameter.
 constant Component REAL_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(),
-  Type.REAL(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), Absyn.dummyInfo);
+  Type.REAL(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), NONE(), Absyn.dummyInfo);
 
 constant InstNode REAL_PARAM = InstNode.COMPONENT_NODE("r",
   Visibility.PUBLIC,
@@ -95,7 +95,7 @@ constant InstNode REAL_PARAM = InstNode.COMPONENT_NODE("r",
 
 // Default Boolean parameter.
 constant Component BOOL_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(),
-  Type.BOOLEAN(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), Absyn.dummyInfo);
+  Type.BOOLEAN(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), NONE(), Absyn.dummyInfo);
 
 constant InstNode BOOL_PARAM = InstNode.COMPONENT_NODE("b",
   Visibility.PUBLIC,
@@ -104,7 +104,7 @@ constant InstNode BOOL_PARAM = InstNode.COMPONENT_NODE("b",
 
 // Default String parameter.
 constant Component STRING_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(),
-  Type.STRING(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), Absyn.dummyInfo);
+  Type.STRING(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), NONE(), Absyn.dummyInfo);
 
 constant InstNode STRING_PARAM = InstNode.COMPONENT_NODE("s",
   Visibility.PUBLIC,
@@ -113,7 +113,7 @@ constant InstNode STRING_PARAM = InstNode.COMPONENT_NODE("s",
 
 // Default enumeration(:) parameter.
 constant Component ENUM_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(),
-  Type.ENUMERATION_ANY(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), Absyn.dummyInfo);
+  Type.ENUMERATION_ANY(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), NONE(), Absyn.dummyInfo);
 
 constant InstNode ENUM_PARAM = InstNode.COMPONENT_NODE("e",
   Visibility.PUBLIC,
@@ -290,7 +290,7 @@ constant Function SMOOTH = Function.FUNCTION(Path.IDENT("smooth"),
 
 
 constant Component CLOCK_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(),
-  Type.CLOCK(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), Absyn.dummyInfo);
+  Type.CLOCK(), NFBinding.EMPTY_BINDING, NFBinding.EMPTY_BINDING, NFComponent.DEFAULT_ATTR, NONE(), NONE(), Absyn.dummyInfo);
 
 constant InstNode CLOCK_PARAM = InstNode.COMPONENT_NODE("s",
   Visibility.PUBLIC,
diff --git a/Compiler/NFFrontEnd/NFComponent.mo b/Compiler/NFFrontEnd/NFComponent.mo
@@ -177,6 +177,7 @@ uniontype Component
     Binding binding;
     Binding condition;
     Component.Attributes attributes;
+    Option<Modifier> ann "the annotation from SCode.Comment as a modifier";
     Option<SCode.Comment> comment;
     SourceInfo info;
   end TYPED_COMPONENT;
@@ -342,7 +343,7 @@ uniontype Component
     component := match component
       case UNTYPED_COMPONENT()
         then TYPED_COMPONENT(component.classInst, ty, component.binding,
-          component.condition, component.attributes, component.comment, component.info);
+          component.condition, component.attributes, NONE(), component.comment, component.info);
 
       case TYPED_COMPONENT()
         algorithm
@@ -807,6 +808,16 @@ uniontype Component
     end match;
   end comment;
 
+  function ann
+    input Component component;
+    output Option<Modifier> ann;
+  algorithm
+    ann := match component
+      case TYPED_COMPONENT() then component.ann;
+      else NONE();
+    end match;
+  end ann;
+
   function getEvaluateAnnotation
     input Component component;
     output Boolean evaluate;
diff --git a/Compiler/NFFrontEnd/NFModelicaBuiltin.mo b/Compiler/NFFrontEnd/NFModelicaBuiltin.mo
@@ -2914,6 +2914,18 @@ external "builtin";
 annotation(preferredView="text");
 end getPackages;
 
+function getAllSubtypeOf
+  "Returns the list of all classes that extend from class_ given a parentClass where the lookup for class_ should start"
+  input TypeName parentClass = $TypeName(AllLoadedClasses);
+  input TypeName class_;
+  input Boolean qualified = false;
+  input Boolean includePartial = false;
+  input Boolean sort = false;
+  output TypeName classNames[:];
+external "builtin";
+annotation(preferredView="text");
+end getAllSubtypeOf;
+
 partial function basePlotFunction "Extending this does not seem to work at the moment. A real shame; functions below are copy-paste and all need to be updated if the interface changes."
   input String fileName = "<default>" "The filename containing the variables. <default> will read the last simulation result";
   input String interpolation = "linear" "
diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -88,6 +88,7 @@ import Graph;
 import HashSetString;
 import Inst;
 import InstFunction;
+import InteractiveUtil;
 import List;
 import Lookup;
 import Mod;
@@ -533,7 +534,7 @@ algorithm
              systemPath, gccVersion, gd, strlinearizeTime, direction, suffix;
       list<DAE.Exp> simOptions;
       list<Values.Value> vals;
-      Absyn.Path path,classpath,className,baseClassPath;
+      Absyn.Path path,classpath,className,baseClassPath,parentClass;
       SCode.Program scodeP,sp;
       Option<list<SCode.Element>> fp;
       FCore.Graph env;
@@ -558,7 +559,9 @@ algorithm
       Real timeTotal,timeSimulation,timeStamp,val,x1,x2,y1,y2,r,r1,r2,linearizeTime,curveWidth,offset,offset1,offset2,scaleFactor,scaleFactor1,scaleFactor2;
       GlobalScript.Statements istmts;
       list<GlobalScript.Statements> istmtss;
-      Boolean have_corba, bval, anyCode, b, b1, b2, externalWindow, logX, logY, autoScale, forceOMPlot, gcc_res, omcfound, rm_res, touch_res, uname_res,  ifcpp, ifmsvc,sort, builtin, showProtected, includeConstants, inputConnectors, outputConnectors, mergeAST;
+      Boolean have_corba, bval, anyCode, b, b1, b2, externalWindow, logX, logY, autoScale, forceOMPlot,
+              gcc_res, omcfound, rm_res, touch_res, uname_res,  ifcpp, ifmsvc,sort, builtin, showProtected,
+              includeConstants, inputConnectors, outputConnectors, mergeAST, includePartial, qualified;
       FCore.Cache cache;
       Absyn.ComponentRef  crefCName;
       list<tuple<String,Values.Value>> resultValues;
@@ -1766,6 +1769,20 @@ algorithm
         v = Values.REAL(r);
       then (cache,v);
 
+    case (cache,_,"getAllSubtypeOf",{
+          Values.CODE(Absyn.C_TYPENAME(parentClass)),
+          Values.CODE(Absyn.C_TYPENAME(path)),
+          Values.BOOL(qualified),
+          Values.BOOL(includePartial),
+          Values.BOOL(sort)},_)
+      equation
+        paths = InteractiveUtil.getAllSubtypeOf(parentClass, path, SymbolTable.getAbsyn(), qualified, includePartial);
+        paths = listReverse(paths);
+        paths = if sort then List.sort(paths, Absyn.pathGe) else paths;
+        vals = List.map(paths,ValuesUtil.makeCodeTypeName);
+      then
+        (cache,ValuesUtil.makeArray(vals));
+
     else
       algorithm
         (cache,v) := CevalScriptBackend.cevalInteractiveFunctions3(inCache,inEnv,inFunctionName,inVals,msg);
diff --git a/Compiler/Script/CevalScriptBackend.mo b/Compiler/Script/CevalScriptBackend.mo
@@ -3138,8 +3138,8 @@ algorithm
       Absyn.Class absynClass;
       String str,re;
       Option<SCode.Program> fp;
-      SCode.Program scodeP, scodePNew, scode_builtin;
-      Absyn.Program p,ptot,p_builtin;
+      SCode.Program scodeP, scodePNew, scode_builtin, graphicProgramSCode;
+      Absyn.Program p,ptot,p_builtin, placementProgram;
       DAE.FunctionTree funcs;
 
    case (cache,env,_)
@@ -3168,6 +3168,14 @@ algorithm
         scodeP := listAppend(scode_builtin, SymbolTable.getSCode());
         ExecStat.execStat("FrontEnd - Absyn->SCode");
 
+        // add also the graphics annotations if we are using the NF_API
+        if Flags.isSet(Flags.NF_API) then
+          placementProgram := Interactive.modelicaAnnotationProgram(Config.getAnnotationVersion());
+          graphicProgramSCode := SCodeUtil.translateAbsyn2SCode(placementProgram);
+          scodeP := listAppend(scode_builtin, SymbolTable.getSCode());
+          scodeP := listAppend(scodeP, graphicProgramSCode);
+        end if;
+
         (dae, funcs) := NFInst.instClassInProgram(className, scodeP);
 
         cache := FCore.emptyCache();
diff --git a/Compiler/Script/Interactive.mo b/Compiler/Script/Interactive.mo
diff --git a/Compiler/Script/InteractiveUtil.mo b/Compiler/Script/InteractiveUtil.mo
diff --git a/Compiler/Script/NFApi.mo b/Compiler/Script/NFApi.mo
diff --git a/Compiler/Stubs/NFApi.mo b/Compiler/Stubs/NFApi.mo
diff --git a/Compiler/boot/LoadCompilerSources.mos b/Compiler/boot/LoadCompilerSources.mos
