Changeset d102cff in OpenModelica

Timestamp:

2013-04-12T19:17:55+02:00 (11 years ago)

Author:

Adrian Pop <adrian.pop@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

e8335829

Parents:

182b8deb

Message:

• attempt to fix bug #2113, let's see how many tests we break.
• is not 100% sure that the arguments to fill should not be known at compile time.

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@15804 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

• Compiler/FrontEnd/Static.mo (modified) (7 diffs)

Compiler/FrontEnd/Static.mo

@@ -3437 +3437 @@
     case (cache,env,(s :: dims),_,impl,pre,_)
       equation
-        (cache,s_1,prop,_) = elabExp(cache, env, s, impl,NONE(),true,pre,info);
-        (cache,dims_1,dimprops,_) = elabExpList(cache,env, dims, impl,NONE(),true,pre,info);
+        (cache,s_1,prop,_) = elabExp(cache, env, s, impl,NONE(), true, pre, info);
+        (cache,dims_1,dimprops,_) = elabExpList(cache, env, dims, impl, NONE(), true, pre, info);
         (dims_1,_) = Types.matchTypes(dims_1, List.map(dimprops,Types.getPropType), DAE.T_INTEGER_DEFAULT, false);
         c1 = Types.propertiesListToConst(dimprops);
@@ -3444 +3444 @@
         c1 = Types.constAnd(c1,Types.propAllConst(prop));
         sty = Types.getPropType(prop);
-        (cache,dimvals,_) = Ceval.cevalList(cache,env, dims_1, impl, NONE(), Ceval.NO_MSG());
-        (cache,exp,prop) = elabBuiltinFill2(cache,env, s_1, sty, dimvals,c1,pre);
-      then
-        (cache,exp,prop);
+        (cache,dimvals,_) = Ceval.cevalList(cache, env, dims_1, impl, NONE(), Ceval.NO_MSG());
+        (cache,exp,prop) = elabBuiltinFill2(cache, env, s_1, sty, dimvals, c1, pre);
+      then
+        (cache, exp, prop);
 
     // If the previous case failed we probably couldn't constant evaluate the
     // dimensions. Create a function call to fill instead, and let the compiler sort it out later.
-    case (cache, env, (s :: dims), _, impl,pre,_)
+    case (cache, env, (s :: dims), _, impl, pre, _)
       equation
         c1 = unevaluatedFunctionVariability(env);
-        (cache, s_1, prop, _) = elabExp(cache, env, s, impl,NONE(), true,pre,info);
-        (cache, dims_1, dimprops, _) = elabExpList(cache, env, dims, impl, NONE(), true,pre,info);
+        (cache, s_1, prop, _) = elabExp(cache, env, s, impl,NONE(), true, pre, info);
+        (cache, dims_1, dimprops, _) = elabExpList(cache, env, dims, impl, NONE(), true, pre, info);
         (dims_1,_) = Types.matchTypes(dims_1, List.map(dimprops,Types.getPropType), DAE.T_INTEGER_DEFAULT, false);
         sty = Types.getPropType(prop);
@@ -3467 +3467 @@
     // Non-constant dimensons are also allowed in the case of non-expanded arrays
     // TODO: check that the diemnsions are parametric?
-    case (cache, env, (s :: dims), _, impl,pre,_)
+    case (cache, env, (s :: dims), _, impl, pre, _)
       equation
         false = Config.splitArrays();
-        (cache, s_1, DAE.PROP(sty, c1), _) = elabExp(cache, env, s, impl,NONE(), true,pre,info);
-        (cache, dims_1, dimprops, _) = elabExpList(cache, env, dims, impl,NONE(), true,pre,info);
+        (cache, s_1, DAE.PROP(sty, c1), _) = elabExp(cache, env, s, impl,NONE(), true, pre, info);
+        (cache, dims_1, dimprops, _) = elabExpList(cache, env, dims, impl,NONE(), true, pre, info);
         sty = makeFillArgListType(sty, dimprops);
         exp_type = Types.simplifyType(sty);
@@ -4379 +4379 @@
     case (cache,env,args,_,impl,pre,_)
       equation
-        (cache,e,p) = elabBuiltinFill(cache,env, (Absyn.INTEGER(0) :: args),{}, impl,pre,info);
+        (cache,e,p) = elabBuiltinFill(cache, env, (Absyn.INTEGER(0) :: args), {}, impl, pre, info);
       then
         (cache,e,p);
@@ -4390 +4390 @@
   input list<DAE.Properties> inProps;
   output Boolean res;
-
 protected
   list<DAE.Type> types;
@@ -4406 +4405 @@
   input Integer dimException;
   output Boolean res;
-
 protected
   list<DAE.Type> types;
@@ -14100 +14098 @@
     case _ equation true = Env.inFunctionScope(inEnv); then DAE.C_VAR();
     case _ equation true = Flags.getConfigBool(Flags.CHECK_MODEL); then DAE.C_UNKNOWN();
+    // bug #2113, seems that there is nothing in the specs 
+    // that requires that fill arguments are of parameter/constant 
+    // variability, so allow it.
+    else DAE.C_UNKNOWN();
   end matchcontinue;
 end unevaluatedFunctionVariability;