Flat modelica output improvements.

- Don't quote time.
- Handle builtin call names correctly.

Author: perost

OMCompiler/Compiler/NFFrontEnd/NFCall.mo

@@ -578,7 +578,7 @@ public
 
       case UNTYPED_ARRAY_CONSTRUCTOR()
         algorithm
-          name := AbsynUtil.pathString(Function.name(NFBuiltinFuncs.ARRAY_FUNC));
+          name := AbsynUtil.pathString(Function.nameConsiderBuiltin(NFBuiltinFuncs.ARRAY_FUNC));
           arg_str := Expression.toString(call.exp);
           c := stringDelimitList(list(InstNode.name(Util.tuple21(iter)) + " in " +
             Expression.toString(Util.tuple22(iter)) for iter in call.iters), ", ");
@@ -596,14 +596,14 @@ public
 
       case TYPED_CALL()
         algorithm
-          name := AbsynUtil.pathString(Function.name(call.fn));
+          name := AbsynUtil.pathString(Function.nameConsiderBuiltin(call.fn));
           arg_str := stringDelimitList(list(Expression.toString(arg) for arg in call.arguments), ", ");
         then
           name + "(" + arg_str + ")";
 
       case TYPED_ARRAY_CONSTRUCTOR()
         algorithm
-          name := AbsynUtil.pathString(Function.name(NFBuiltinFuncs.ARRAY_FUNC));
+          name := AbsynUtil.pathString(Function.nameConsiderBuiltin(NFBuiltinFuncs.ARRAY_FUNC));
           arg_str := Expression.toString(call.exp);
           c := stringDelimitList(list(InstNode.name(Util.tuple21(iter)) + " in " +
             Expression.toString(Util.tuple22(iter)) for iter in call.iters), ", ");
@@ -612,7 +612,7 @@ public
 
       case TYPED_REDUCTION()
         algorithm
-          name := AbsynUtil.pathString(Function.name(call.fn));
+          name := AbsynUtil.pathString(Function.nameConsiderBuiltin(call.fn));
           arg_str := Expression.toString(call.exp);
           c := stringDelimitList(list(InstNode.name(Util.tuple21(iter)) + " in " +
             Expression.toString(Util.tuple22(iter)) for iter in call.iters), ", ");
@@ -633,7 +633,7 @@ public
     str := match call
       case TYPED_CALL()
         algorithm
-          name := AbsynUtil.pathString(Function.name(call.fn));
+          name := AbsynUtil.pathString(Function.nameConsiderBuiltin(call.fn));
           arg_str := stringDelimitList(list(Expression.toFlatString(arg) for arg in call.arguments), ", ");
         then
           if Function.isBuiltin(call.fn) then
@@ -649,7 +649,7 @@ public
             // calls are reverted to their original form here.
             str := toFlatString(devectorizeCall(call));
           else
-            name := AbsynUtil.pathString(Function.name(NFBuiltinFuncs.ARRAY_FUNC));
+            name := AbsynUtil.pathString(Function.nameConsiderBuiltin(NFBuiltinFuncs.ARRAY_FUNC));
             arg_str := Expression.toFlatString(call.exp);
             c := stringDelimitList(list(InstNode.name(Util.tuple21(iter)) + " in " +
               Expression.toFlatString(Util.tuple22(iter)) for iter in call.iters), ", ");
@@ -660,7 +660,7 @@ public
 
       case TYPED_REDUCTION()
         algorithm
-          name := AbsynUtil.pathString(Function.name(call.fn));
+          name := AbsynUtil.pathString(Function.nameConsiderBuiltin(call.fn));
           arg_str := Expression.toFlatString(call.exp);
           c := stringDelimitList(list(InstNode.name(Util.tuple21(iter)) + " in " +
             Expression.toFlatString(Util.tuple22(iter)) for iter in call.iters), ", ");

OMCompiler/Compiler/NFFrontEnd/NFComponentRef.mo

@@ -695,7 +695,12 @@ public
   algorithm
     (cr, subs) := stripSubscripts(cref);
     strl := toFlatString_impl(cr, strl);
-    str := stringAppendList({"'", stringDelimitList(strl, "."), "'", Subscript.toFlatStringList(subs)});
+
+    str := match listHead(strl)
+      case "time" then "time";
+      case "_" then "_";
+      else stringAppendList({"'", stringDelimitList(strl, "."), "'", Subscript.toFlatStringList(subs)});
+    end match;
   end toFlatString;
 
   function toFlatString_impl

OMCompiler/Compiler/NFFrontEnd/NFInst.mo

@@ -175,10 +175,6 @@ algorithm
   // to the model.
   flatModel := Package.collectConstants(flatModel, functions);
 
-  //if Config.flatModelica() then
-  //  FlatModel.printFlatString(flatModel, FunctionTree.listValues(functions));
-  //end if;
-
   // Scalarize array components in the flat model.
   if Flags.isSet(Flags.NF_SCALARIZE) then
     flatModel := Scalarize.scalarize(flatModel);