- Fixed ExpressionSimplify.simplify testcases using the bootstrapping

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6644 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 27, 2010 · 326775b · 326775b
1 parent 6ea1dd6
commit 326775b
Show file tree

Hide file tree

Showing 12 changed files with 224 additions and 223 deletions.
diff --git a/Compiler/Builtin.mo b/Compiler/Builtin.mo
@@ -1973,6 +1973,9 @@ protected constant DAE.Type list2boolean=(
 protected constant DAE.Type AlistA2boolean=(
           DAE.T_FUNCTION({("el",typeA),("lst",(DAE.T_LIST(typeA),NONE()))},DAE.T_BOOL_DEFAULT,DAE.NO_INLINE()),NONE());
 
+protected constant DAE.Type boxed2int=(
+          DAE.T_FUNCTION({("x",typeBoxedAny)},DAE.T_INTEGER_DEFAULT,DAE.NO_INLINE()),NONE());
+
 protected constant DAE.Type boxed2any=(
           DAE.T_FUNCTION({("x",typeBoxedAny)},((DAE.T_NOTYPE(),NONE())),DAE.NO_INLINE()),NONE());
 
@@ -3027,6 +3030,7 @@ algorithm
         // Global State
         env = Env.extendFrameT(env, "getGlobalRoot", int2boxed);
         env = Env.extendFrameT(env, "setGlobalRoot", intBoxedNoRetcall);
+        env = Env.extendFrameT(env, "valueConstructor", boxed2int);
       then env;
     case env then env;
   end matchcontinue;

diff --git a/Compiler/ErrorExt.mo b/Compiler/ErrorExt.mo
@@ -55,13 +55,13 @@ public function updateCurrentComponent
 end updateCurrentComponent;
 
 public function addMessage
-  input Error.ErrorID inErrorID1;
-  input String inString2;
-  input String inString3;
-  input String inString4;
-  input list<String> inStringLst5;
+  input Error.ErrorID id;
+  input String msg_type;
+  input String msg_severity;
+  input String msg;
+  input list<String> msg_tokens;
 
-  external "C" ;
+  external "C" Error_addMessage(id,msg_type,msg_severity,msg,msg_tokens) annotation(Library = "omcruntime");
 end addMessage;
 
 public function addSourceMessage