Bug fix for expContains, added missing case for ENUM_LITERAL.

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6818 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 1, 2010 · 0ee5822 · 0ee5822
1 parent d1ff158
commit 0ee5822
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Compiler/Expression.mo b/Compiler/Expression.mo
@@ -5738,7 +5738,7 @@ algorithm
     case (DAE.RCONST(real = _),cr) then false;
     case (DAE.SCONST(string = _),cr) then false;
     case (DAE.BCONST(bool = _),cr) then false;
-
+    case (DAE.ENUM_LITERAL(name=_), cr) then false;
     case (DAE.ARRAY(array = explist),cr)
       equation
         reslist = Util.listMap1(explist, expContains, cr);

diff --git a/Compiler/ExpressionDump.mo b/Compiler/ExpressionDump.mo
@@ -1252,6 +1252,15 @@ algorithm
         res_str = stringAppendList({gen_str,"BCONST ","true","\n"});
       then
         res_str;
+
+    case (DAE.ENUM_LITERAL(name = fcn, index = i), level)
+      equation
+        gen_str = genStringNTime("   |", level);
+        s = Absyn.pathString(fcn);
+        istr = intString(i);
+        res_str = stringAppendList({gen_str, "ENUM_LITERAL ", s, " [", istr, "]", "\n"});
+      then
+        res_str;  
 
     case (DAE.CREF(componentRef = c,ty=ty),level) /* Graphviz.LNODE(\"CREF\",{s},{},{}) */
       equation