- Call instantiateDaeFunction when elaborating a cref that is a funct…

…ion reference git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5785 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jul 2, 2010 · 879e3ca · 879e3ca
1 parent 809f1e2
commit 879e3ca
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/Compiler/Static.mo b/Compiler/Static.mo
@@ -74,6 +74,7 @@ public import SCode;
 public import SCodeUtil;
 public import Values;
 
+protected import DAEDump;
 
 public type Ident = String;
 
@@ -8298,15 +8299,15 @@ algorithm
         tys = Util.listMap(vars, Types.getVarType);
         fargs = Util.listThreadTuple(fieldNames, tys);
         slots = makeEmptySlots(fargs);
-        (cache,args_1,newslots,constlist,_,_) = elabInputArgs(cache,env, args, nargs, slots, true /*checkTypes*/ ,impl,{});
+        (cache,args_1,newslots,constlist,_,dae1) = elabInputArgs(cache,env, args, nargs, slots, true /*checkTypes*/ ,impl,{});
         const = Util.listReduce(constlist, Types.constAnd);
         tyconst = elabConsts(t, const);
         prop = getProperties(t, tyconst);
         (cache,newslots2) = fillDefaultSlots(cache,newslots, c, env, impl);
         args_2 = expListFromSlots(newslots2);
         (cache, fqPath) = Inst.makeFullyQualified(cache, env_1, fn);
       then
-        (cache,DAE.METARECORDCALL(fqPath,args_2,fieldNames,index),prop,DAEUtil.emptyDae);
+        (cache,DAE.METARECORDCALL(fqPath,args_2,fieldNames,index),prop,dae1);
         /* ------ */
 
     case (cache,env,fn,args,nargs,impl,stopElab,st) /* ..Other functions */
@@ -9922,7 +9923,7 @@ algorithm
       Boolean doVect;
       DAE.ExpType et;
       Absyn.InnerOuter io;
-      DAE.DAElist dae;
+      DAE.DAElist dae,dae1,dae2;
       String str,fn_str,scope;
       DAE.Properties props;
       Lookup.SplicedExpData splicedExpData;
@@ -9952,18 +9953,21 @@ algorithm
       then
         (cache,exp,DAE.PROP(t,const),acc_1,dae);
 
-    // MetaModelica Partial Function. sjoelund
+    // MetaModelica Partial Function
     case (cache,env,c,impl,doVect)
       equation
         //true = RTOpts.debugFlag("fnptr") or RTOpts.acceptMetaModelicaGrammar();
         path = Absyn.crefToPath(c);
-        (cache,typelist,dae) = Lookup.lookupFunctionsInEnv(cache,env,path);
+        (cache,typelist,dae1) = Lookup.lookupFunctionsInEnv(cache,env,path);
         t :: _ = typelist;
         (_,SOME(fpath)) = t;
         t = Types.makeFunctionPolymorphicReference(t);
         c = Absyn.pathToCref(fpath);
         expCref = Exp.toExpCref(c);
         exp = DAE.CREF(expCref,DAE.ET_FUNCTION_REFERENCE_FUNC());
+        // This is not done by lookup - only elabCall. So we should do it here.
+        (cache,dae2) = instantiateDaeFunction(cache,env,path,false,NONE,true);
+        dae = DAEUtil.joinDaeLst({dae1,dae2});
       then
         (cache,exp,DAE.PROP(t,DAE.C_CONST()),SCode.RO(),dae);