- fixed a small bug with the check for DynamicSelect/OnMouse* in anno…

…tations. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7060 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 17, 2010 · 0e522bb · 0e522bb
1 parent 421a1d7
commit 0e522bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Compiler/Absyn.mo b/Compiler/Absyn.mo
@@ -4507,10 +4507,9 @@ algorithm
       equation
         b1 = stringEq(name, "DynamicSelect");
         b2 = (0 == System.strncmp("OnMouse", name, 7));
-        b = boolOr(b1, b2);
-        b = boolNot(b);
+        true = boolOr(b1, b2);        
       then 
-        b;
+        false;
 
     // search inside, some(exp)
     case (MODIFICATION(modification = SOME(CLASSMOD(dive, expOpt))) :: rest)

diff --git a/Compiler/Interactive.mo b/Compiler/Interactive.mo
@@ -14412,6 +14412,9 @@ algorithm
             Connect.emptySet, placementclass, {}, false, Inst.TOP_CALL(), ConnectionGraph.EMPTY);
 
         str = DAEUtil.getVariableBindingsStr(DAEUtil.daeElements(dae));
+
+        // print("Env: " +& Env.printEnvStr(env) +& "\n");
+
         (_,graphicexp2,prop) = Static.elabGraphicsExp(cache, env, graphicexp, false, Prefix.NOPRE(), Absyn.dummyInfo); // TODO: FIXME: Someone forgot to add Absyn.Info to this function's input
         (cache, graphicexp2, prop) = Ceval.cevalIfConstant(cache, env, graphicexp2, prop, false);
         Print.clearErrorBuf() "this is to clear the error-msg generated by the annotations." ;
@@ -14470,6 +14473,9 @@ algorithm
                          UnitAbsyn.noStore, mod_2, Prefix.NOPRE(), Connect.emptySet,
                          placementclass, {}, false, Inst.TOP_CALL(), ConnectionGraph.EMPTY);
         str = DAEUtil.getVariableBindingsStr(DAEUtil.daeElements(dae));
+
+        // print("Env: " +& Env.printEnvStr(env) +& "\n");
+
         (_,graphicexp2,prop) = Static.elabGraphicsExp(cache, env, graphicexp, false,Prefix.NOPRE(), Absyn.dummyInfo); // TODO: FIXME: Someone forgot to add Absyn.Info to this function's input
         Print.clearErrorBuf() "this is to clear the error-msg generated by the annotations." ;
         gexpstr = ExpressionDump.printExpStr(graphicexp2);