NFFrontEnd small fix for array expressions ($array)

Belonging to [master]: - #1991
OpenModelica · Nov 7, 2017 · 42bc0b1 · 42bc0b1
1 parent 1e05283
commit 42bc0b1
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Compiler/NFFrontEnd/NFCall.mo b/Compiler/NFFrontEnd/NFCall.mo
@@ -221,10 +221,17 @@ uniontype Call
     list<InstNode> iters;
     ComponentRef arr_fn_ref;
     Call call, arr_call;
+    Absyn.ComponentRef aby_fn_ref;
   algorithm
-    (fn_ref, fn_node, _) := Function.instFunc(functionName,scope,info);
+    aby_fn_ref := match functionName
+      case Absyn.CREF_IDENT("$array",{}) then Absyn.CREF_IDENT("array",{});
+      else functionName;
+    end match;
+
+    (fn_ref, fn_node, _) := Function.instFunc(aby_fn_ref,scope,info);
     (exp, iters) := instIteratorCallArgs(functionArgs, scope, info);
-    call := match functionName
+
+    call := match aby_fn_ref
 
       case Absyn.CREF_IDENT("min",_) algorithm
         (arr_fn_ref, _) := Function.instFunc(Absyn.CREF_IDENT("array", {}),scope,info);