- Made more things work

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6715 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 29, 2010 · ee93614 · ee93614
1 parent 862ae8c
commit ee93614
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Compiler/Expression.mo b/Compiler/Expression.mo
@@ -3433,7 +3433,7 @@ algorithm
     case (e,rel,ext_arg)
       equation
         str = ExpressionDump.printExpStr(e);
-        str = "Expression.traverseExp not implemented correctly: " +& str;
+        str = "Expression.traverseExp or one of the user-defined functions using it is not implemented correctly: " +& str;
         Error.addMessage(Error.INTERNAL_ERROR, {str});
       then
         fail();

diff --git a/Compiler/SimCode.mo b/Compiler/SimCode.mo
@@ -2138,8 +2138,7 @@ algorithm
         list<DAE.Exp> expl;
       equation
         true = RTOpts.acceptMetaModelicaGrammar();
-        expl = Algorithm.getAllExps(algorithm_);
-        expl = getMatchingExpsList(expl, matchMetarecordCalls);
+        expl = BackendDAEUtil.traverseAlgorithmExps(algorithm_, matchMetarecordCalls, {});
         (accRecDecls,rt_2) = elaborateRecordDeclarationsForMetarecords(expl, accRecDecls, rt);
         //TODO: ? what about rest ? , can be there something else after the ALGORITHM
         (accRecDecls,rt_2) = elaborateRecordDeclarations(rest, accRecDecls, rt_2);
@@ -7441,6 +7440,7 @@ algorithm
         e2 = Expression.makeCrefExp(cref,DAE.ET_FUNCTION_REFERENCE_VAR());
       then
         ((e,e2::acc));
+    case itpl then itpl;
   end matchcontinue;
 end matchFnRefs;