fixed bug with faster icon annotation

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@1038 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

modeq/builtin.rml

@@ -47,6 +47,7 @@ module Builtin:
   val real_type : SCode.Class
 
   relation initial_env : () => Env.Env
+  relation simple_initial_env : () => Env.Env
 
 end
 
@@ -668,7 +669,24 @@ val array_array2int
  ** up using this relation.  It creates an empty environment and adds
  ** all the built-in definitions to it.
  **)
-
+relation simple_initial_env =
+
+  rule	Debug.fprint ("insttr","Creating initial env.\n") &
+	Env.open_scope(Env.empty_env,false) => env &
+	Env.extend_frame_c(env, rl_type) => env &
+	Env.extend_frame_c(env, int_type) => env &
+	Env.extend_frame_c(env, str_type) => env &
+	Env.extend_frame_c(env, bool_type) => env &
+	Env.extend_frame_c(env, enum_type) => env &
+	Env.extend_frame_c(env, real_type) => env &
+	Env.extend_frame_c(env, integer_type) => env &
+	Env.extend_frame_c(env, string_type) => env &
+	Env.extend_frame_c(env, boolean_type) => env &
+	Env.extend_frame_c(env, state_select_type) => env 
+	----------------------------------
+ 	simple_initial_env () => env
+end
+
 relation initial_env =
 
   rule	Debug.fprint ("insttr","Creating initial env.\n") &

modeq/inst.rml

@@ -307,7 +307,8 @@ relation make_env_from_program: (SCode.Program,SCode.Path) => Env.Env =
 end
 
 relation make_simple_env_from_program: (SCode.Program,SCode.Path) => Env.Env = 
-  rule	add_program_to_env([],prog,c) => env'
+  rule	Builtin.simple_initial_env => env &
+	add_program_to_env(env,prog,c) => env'
 	--------------------------------
 	make_simple_env_from_program (prog,c) => env'
 end

modeq/runtime/socketimpl.c

@@ -89,7 +89,6 @@ RML_BEGIN_LABEL(Socket__handlerequest)
   }
   len = recv(sock,buf,bufSize,0);
   buf[len]=0;
-  printf("got %s\n",buf);
   FD_ZERO(&sockSet);
   FD_SET(sock,&sockSet); // create fd set of 
   while ( select(1,&sockSet,NULL,NULL,&timeout) > 0) {