Changed impl of hashtable to binary tree in environment. The lookup i…

…s still buggy. Solution needs big redesign.

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

modeq/Makefile.in

@@ -22,7 +22,7 @@ MYRML	= ./myrmlc
 
 
 LDFLAGS = -L$(RMLHOME)/lib/plain $(ANTLR_LIBP) -lrml -lm -lantlr $(LIBSOCKET) \
-	 -lssl -lmico -lcrypto -lm -lpthread 
+	 -lssl -lmico -lm -lpthread 
 
 PROG	= modeq
 AST	= absyn_builder/absyn_builder.a

modeq/builtin.rml

@@ -672,7 +672,7 @@ val array_array2int
 relation simple_initial_env =
 
   rule	(*Debug.fprint ("insttr","Creating initial env.\n") &*)
-	Env.open_scope(Env.empty_env,false,10) => env &
+	Env.open_scope(Env.empty_env,false,NONE) => 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 &
@@ -690,7 +690,7 @@ end
 relation initial_env =
 
   rule	(*Debug.fprint ("insttr","Creating initial env.\n") &*)
-	Env.open_scope(Env.empty_env,false,400) => env &
+	Env.open_scope(Env.empty_env,false,NONE) => 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 &

modeq/builtin_safe.rml

@@ -486,7 +486,7 @@ val array_array2int
 
 relation initial_env =
 
-  rule	Env.open_scope(Env.empty_env,false,400) => env1 &
+  rule	Env.open_scope(Env.empty_env,false,NONE) => env1 &
 	Env.extend_frame_c(env1, rl_type) => env2 &
 	Env.extend_frame_c(env2, int_type) => env3 
 

modeq/ceval.rml

@@ -1087,8 +1087,7 @@ relation get_builtin_attribute: (Exp.ComponentRef, Exp.ComponentRef, string,
 	Inst.make_env_from_program(p',Absyn.IDENT("")) => env &
 	Lookup.lookup_class(env,classname',true)
 	  => (c as SCode.CLASS(n, _, encflag, r, _), env') &
-	Env.open_scope(env',encflag,0) => env'' &
-	Env.name_scope(env'',n) => env3 &
+	Env.open_scope(env',encflag,SOME(n)) => env3 &
 	ClassInf.start(r,n) => ci_state &
 	Inst.inst_class_in(env3, Types.NOMOD, Prefix.NOPRE, [], ci_state, 
 			   c, false, [], false, false)
@@ -1116,8 +1115,7 @@ relation get_builtin_attribute: (Exp.ComponentRef, Exp.ComponentRef, string,
 	Inst.make_env_from_program(p',Absyn.IDENT("")) => env &
 	Lookup.lookup_class(env,classname',true)
 	  => (c as SCode.CLASS(n, _, encflag, r, _), env') &
-	Env.open_scope(env',encflag,0) => env'' &
-	Env.name_scope(env'',n) => env3 &
+	Env.open_scope(env',encflag,SOME(n)) => env3 &
 	ClassInf.start(r,n) => ci_state &
 	Inst.inst_class_in(env3, Types.NOMOD, Prefix.NOPRE, [], ci_state, 
 			   c, false, [], false, false)

modeq/dump.rml

@@ -68,6 +68,7 @@ module Dump:
   relation op_symbol : Absyn.Operator => string
   relation print_bool : bool => ()
   relation print_select: (bool,string,string) => ()
+  relation print_option : (('a option),('a => ())) => () 
   relation select_string: (bool,string,string) => string
   relation get_string_list : ('a list, 'a => string, string) => string
   relation get_option_str: ('a option, 'a => string) => string 
@@ -2090,13 +2091,13 @@ relation print_select: (bool,string,string) => () =
 
 end
 
-relation print_option = (* : ('a option)*('a => 'b) = *)
+relation print_option : (('a option),('a => ())) => () =
 
-  axiom	print_option(NONE,_)
+  axiom	print_option(NONE,_) => ()
 
   rule	r( x )
 	------
-	print_option(SOME(x),r)
+	print_option(SOME(x),r) => ()
 end
 
 relation print_list_debug : (string, 'a list, 'a => (), string) => () =