- Merging

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6625 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 26, 2010 · 5c64b6e · 5c64b6e
2 parents 993032b + 323bdfe
commit 5c64b6e
Show file tree

Hide file tree

Showing 3 changed files with 883 additions and 31 deletions.
diff --git a/Compiler/Lookup.mo b/Compiler/Lookup.mo
@@ -2474,13 +2474,21 @@ algorithm
       list<DAE.Exp> expl;
       Integer x,dims;
     case({},_) then true;
-    case(((exp as DAE.ICONST(integer = x)) :: expl ),dims)
+    // Constant index
+    case (exp :: expl, dims)
       equation
+        x = Exp.expInt(exp);
         true = (x<=dims);
         true = checkSubscriptsRange2(expl,dims);
       then
         true;
-    case(_,_) then fail();
+    // Variable index, can't check at compile time.
+    case (exp :: expl, dims)
+      equation
+        failure(x = Exp.expInt(exp));
+        true = checkSubscriptsRange2(expl, dims);
+      then
+        true;
    end matchcontinue;
 end checkSubscriptsRange2;