Removed luc_pop last checkin since he removed a lot of my stuff from …

…previous version. Also fixed bug with Gear model.

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

Compiler/Env.rml

@@ -153,6 +153,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   relation update_frame_v   : (Env, Types.Var,bool(*encapsulated*),Env) => Env
   relation extend_frame_t : (Env,Ident,Types.Type) => Env
   relation extend_frame_i : (Env, Absyn.Import) => Env
+  relation add_bc_frame :  (Env,Env) => Env 
   relation top_frame : Env => Frame
   relation get_env_path: (Env) => Absyn.Path option
   relation print_env_path: (Env) => ()
@@ -369,6 +370,20 @@ relation extend_frame_i : (Env,Absyn.Import) => Env =
 	  => (FRAME(sid,ht,httypes, IMPORT(imp)::imps,bcframes,crs,encflag)::fs)
 end
 
+(** relation: add_bc_frame
+ ** author: PA
+ **
+ ** Adds a baseclass frame to the environment from the baseclass environment
+ ** to the list of base classes of the top frame of the passed environment.
+**)
+
+relation add_bc_frame : (Env(* env*),
+			 Env(* bc env*)) => Env =
+
+  axiom	add_bc_frame(FRAME(sid,cls,tps,imps,bc,crefs,enc)::fs,f::_) =>
+	FRAME(sid,cls,tps,imps,f::bc,crefs,enc)::fs
+end
+
 (** relation: top_frame
  **
  ** Returns the top frame.
@@ -478,21 +493,25 @@ relation print_frame_str : Frame => string =
 	print_bintree_str httypes => s2  &
 	print_imports_str imps => s3 &
 	Util.bool_string encflag => encflag_str &
+	print_env_str bcframes => s4 &
 	Util.string_append_list(["FRAME: ", sid, " (enc=", encflag_str,
 				 ") \nclasses and vars:\n=============\n",
 				 s1,
 			 	 "   Types:\n======\n",
 				 s2,
 				 "   Imports:\n=======\n",
 				 s3,
+				 "   bcframes:\n=======\n",
+				 s4,
 				 "\n\n\n"]) => res
 	--------------------------------------------
 	print_frame_str FRAME(SOME(sid),ht,httypes,imps,bcframes,crs,encflag)
 	  => res
 
   rule	print_bintree_str ht => s1 &
 	print_bintree_str httypes => s2  &
-	print_imports_str imps => s3 &
+	print_imports_str imps => s3 &	
+	print_env_str bcframes => s4 &
 	Util.bool_string encflag => encflag_str &
 	Util.string_append_list(["FRAME: unnamed (enc=", encflag_str,
 				 ") \nclasses and vars:\n=============\n",
@@ -501,6 +520,8 @@ relation print_frame_str : Frame => string =
 				 s2,
 				 "   Imports:\n=======\n",
 				 s3,
+				 "   bcframes:\n=======\n",
+				 s4,
 				 "\n\n\n"]) => res
 	--------------------------------------------
 	print_frame_str FRAME(NONE,ht,httypes,imps,bcframes,crs,encflag) => res
@@ -570,8 +591,8 @@ relation print_frame_element_str: (Ident * Item) => string =
 	print_frame_vars_str(compframe) => frame_str &
 	Types.print_binding_str(bind) => bind_str &
 	Util.string_append_list(["v:",n," ",s,"(",elt_str,") [",tp_str,"] {",
-				var_str,"}, binding:", bind_str,", compframe:",
-				 frame_str]) => res
+				var_str,"}, binding:", bind_str(*,", compframe:",
+				 frame_str*)]) => res
 	---------------------------------------------
 	print_frame_element_str ((n,VAR(tv as Types.VAR(_,Types.ATTR(_,_,var,_),_,tp,bind),SOME((elt,_)),i,compframe::_))) => res
 

Compiler/ErrorExt.rml

@@ -74,5 +74,9 @@ relation add_source_message:(Error.ErrorID,
 
 relation print_messages_str:() => string
 relation get_messages_str:() => string
+
+relation error_off:() => () 
+
+relation error_on:() => ()
 end