Encapsulated messages added

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

Author: Vadim Engelson

modeq/builtin.rml

@@ -485,7 +485,7 @@ val array_array2int
 relation initial_env =
 
   rule	Debug.fprint ("insttr","Creating initial env.\n") &
-	Env.open_scope(Env.empty_env) => env1 &
+	Env.open_scope(Env.empty_env,false) => env1 &
 	Env.extend_frame_c(env1, rl_type) => env2 &
 	Env.extend_frame_c(env2, int_type) => env3 &
 	Env.extend_frame_c(env3, str_type) => env4 &

modeq/builtin_safe.rml

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

modeq/env.rml

@@ -41,7 +41,10 @@ module Env:
 
   type Ident = string
 
-  datatype Frame = FRAME of (Ident * Item) list
+  datatype Frame = FRAME of (Ident * Item) list * bool
+  (* bool=true means that FRAME is created due to encapsulated class  *)
+
+
 
   datatype Item = VAR of Types.Var * SCode.Element option * bool
 		| CLASS of SCode.Class * Env
@@ -50,10 +53,13 @@ module Env:
 
   type Env = Frame list
 
-  val empty_frame : Frame
+  val empty_not_encapsulated_frame   : Frame
+  val empty_encapsulated_frame : Frame
+
+  
   val empty_env   : Env
 
-  relation open_scope       : Env => Env
+  relation open_scope       : (Env,bool) => Env
   relation extend_frame_c   : (Env, SCode.Class) => Env
   relation extend_frame_classes   : (Env, SCode.Program) => Env
   relation extend_frame_v   : (Env, Types.Var,SCode.Element option,bool) => Env
@@ -78,7 +84,8 @@ with "print.rml"
 
 (** - Values *)
 
-val empty_frame = FRAME([])
+val empty_not_encapsulated_frame = FRAME([],false)  
+val empty_encapsulated_frame = FRAME([],true)
 val empty_env = []
 
 (** - Relations *)
@@ -89,14 +96,14 @@ val empty_env = []
  ** top of the stack of frames.
  **)
 
-relation open_scope: Env => Env =
+relation open_scope: (Env,bool) => Env =
 
-  axiom	open_scope(env) => empty_frame::env
+  axiom	open_scope(env,encflag) =>  FRAME([],encflag)::env
 
 (*  rule
 	Print.print_buf "\nOpens scope."
 	-----------
-	open_scope(env) => empty_frame::env
+	open_scope(env,encflag) => FRAME([],encflag)::env
 *)
 end
 
@@ -113,15 +120,15 @@ relation extend_frame_c : (Env, SCode.Class) => Env =
 	Print.print_buf " + " &
 	Print.print_buf n &
 	Print.print_buf " = " &
-	print_env ((FRAME((n,CLASS(c,env))::items)::fs)) &
+	print_env ((FRAME((n,CLASS(c,env))::items,encflag)::fs)) &
 	Print.print_buf "\n" 
 	----------------
-	extend_frame_c(env as (FRAME(items)::fs),c as SCode.CLASS(n,_,_,_))
-	  => ((FRAME((n,CLASS(c,env))::items)::fs))
+	extend_frame_c(env as (FRAME(items,encflag)::fs),c as SCode.CLASS(n,_,_,_))
+	  => ((FRAME((n,CLASS(c,env))::items,encflag)::fs))
 *)
 
-  axiom	extend_frame_c(env as (FRAME(items)::fs),c as SCode.CLASS(n,_,_,_,_))
-	  => ((FRAME((n,CLASS(c,env))::items)::fs))
+  axiom	extend_frame_c(env as (FRAME(items,encflag)::fs),c as SCode.CLASS(n,_,_,_,_))
+	  => ((FRAME((n,CLASS(c,env))::items,encflag)::fs))
 
 end
 
@@ -148,15 +155,15 @@ relation extend_frame_v : (Env,Types.Var,SCode.Element option,bool) => Env =
    Print.print_buf " + " &
    Print.print_buf n &
 	Print.print_buf " = " &
-   print_env (FRAME((n,VAR(v))::items)::fs) &
+   print_env (FRAME((n,VAR(v))::items,encflag)::fs) &
    Print.print_buf "\n" 
    ----------------
-   extend_frame_v(env as (FRAME(items)::fs),v as Types.VAR(n,_,_,_,_))
-   => (FRAME((n,VAR(v))::items)::fs)
+   extend_frame_v(env as (FRAME(items,encflag)::fs),v as Types.VAR(n,_,_,_,_))
+   => (FRAME((n,VAR(v))::items,encflag)::fs)
  *)
 
-  axiom extend_frame_v(FRAME(items)::fs,v as Types.VAR(n,_,_,_,_),c,i)
-	    => (FRAME((n,VAR(v,c,i))::items)::fs)
+  axiom extend_frame_v(FRAME(items,encflag)::fs,v as Types.VAR(n,_,_,_,_),c,i)
+	    => (FRAME((n,VAR(v,c,i))::items,encflag)::fs)
 
 end
 
@@ -172,17 +179,17 @@ relation update_frame_v : (Env,Types.Var,bool) => Env =
 
   rule	v = n
 	---------------------------	
-	update_frame_v(FRAME((id,VAR(Types.VAR(v,_,_,_,_),c,_))::rest)::rest2,v2 as Types.VAR(n,_,_,_,_),i) 
-	    => (FRAME((id,VAR(v2,NONE,i))::rest)::rest2)
+	update_frame_v(FRAME((id,VAR(Types.VAR(v,_,_,_,_),c,_))::rest,encflag)::rest2,v2 as Types.VAR(n,_,_,_,_),i) 
+	    => (FRAME((id,VAR(v2,NONE,i))::rest,encflag)::rest2)
   rule	not v = n &
-	update_frame_v(FRAME(rest)::rest2,v2,i) => FRAME(res)::reslst
+	update_frame_v(FRAME(rest,encflag)::rest2,v2,i) => FRAME(res,encflag)::reslst
 	-------------------------------------------
-	update_frame_v(FRAME((id,VAR(v1 as Types.VAR(v,_,_,_,_),c,i1))::rest)::rest2,v2 as Types.VAR(n,_,_,_,_),i)
-	    => FRAME((id,VAR(v1,c,i1))::res)::reslst
+	update_frame_v(FRAME((id,VAR(v1 as Types.VAR(v,_,_,_,_),c,i1))::rest,encflag)::rest2,v2 as Types.VAR(n,_,_,_,_),i)
+	    => FRAME((id,VAR(v1,c,i1))::res,encflag)::reslst
 
 
-  axiom update_frame_v(FRAME([])::fs,v as Types.VAR(n,_,_,_,_),_)
-	    => (FRAME([])::fs)
+  axiom update_frame_v(FRAME([],encflag)::fs,v as Types.VAR(n,_,_,_,_),_)
+	    => (FRAME([],encflag)::fs)
 end
 
 (** relation: extend_frame_t
@@ -202,22 +209,22 @@ relation extend_frame_t : (Env,Ident,Types.Type) => Env =
 	Print.print_buf " + " &
 	Print.print_buf n &
 	Print.print_buf " = " &
-	print_env (FRAME((n,TYPE(t))::items)::fs) &
+	print_env (FRAME((n,TYPE(t))::items,encflag)::fs) &
 	Print.print_buf "\n" 
 	----------------
-	extend_frame_t(env as (FRAME(items)::fs), n, t)
-	  => (FRAME((n,TYPE(t))::items)::fs)
+	extend_frame_t(env as (FRAME(items,encflag)::fs), n, t)
+	  => (FRAME((n,TYPE(t))::items,encflag)::fs)
 *)
 
-  axiom extend_frame_t(FRAME(items)::fs, n, t)
-	  => (FRAME((n,TYPE(t))::items)::fs)
+  axiom extend_frame_t(FRAME(items,encflag)::fs, n, t)
+	  => (FRAME((n,TYPE(t))::items,encflag)::fs)
 
 end
 
 relation extend_frame_i : (Env,Absyn.Import) => Env =
 
-  axiom extend_frame_i(FRAME(items)::fs,imp)
-	  => (FRAME(("",IMPORT(imp))::items)::fs)
+  axiom extend_frame_i(FRAME(items,encflag)::fs,imp)
+	  => (FRAME(("",IMPORT(imp))::items,encflag)::fs)
 end
 
 relation top_frame : Env => Frame =
@@ -243,11 +250,13 @@ end
 
 relation print_frame : Frame => () =
 
-  rule	Print.print_buf "FRAME: " &
+  rule	Print.print_buf "FRAME: (enc=" &
+        Dump.print_bool  encflag  &
+        Print.print_buf ") " &
 	print_frame_contents cont &
 	Print.print_buf "\n"
 	--------------------------------------------
-	print_frame FRAME(cont)
+	print_frame FRAME(cont,encflag)
 
 end
 
@@ -335,7 +344,7 @@ relation build_frame_graphviz : Frame => Graphviz.Node =
 	build_item_listnode (itemlist, is_type_item,"TYPES") => typesnode &
 	let nodelist = [varsnode,classesnode,typesnode]
 	-------------------------------------------
-	build_frame_graphviz FRAME(itemlist) => Graphviz.NODE("FRAME",[],nodelist)
+	build_frame_graphviz FRAME(itemlist,encflag) => Graphviz.NODE("FRAME",[],nodelist)
 end
 
 relation build_item_listnode : ((Ident * Item) list, (Ident * Item) => (), string) 

modeq/inst.rml

@@ -198,7 +198,7 @@ relation instantiate_class : (SCode.Program, SCode.Path) => DAE.DAElist =
 
   rule	Builtin.initial_env => env &
 	inst_class_decls(env,cdecls,path)=> (env',_) &
-	Lookup.lookup_class(env',path) => (cdef, env'') &
+	Lookup.lookup_class(env',path,true) => (cdef, env'') &
 	inst_class(env'',Mod.NOMOD,Prefix.NOPRE,[],cdef,[],false) => (dae,_,_,_) &
 	Absyn.path_string path => pathstr
 	--------------------------------------------
@@ -356,15 +356,15 @@ relation inst_class : (Env, Mod, Prefix, Connect.Sets, SCode.Class, InstDims,boo
 	------------------------------------------------------	
 	inst_class(env,mod,pre, csets, SCode.CLASS(n,true,_,_,_),_,false) => fail
 
-  rule	Env.open_scope(env) => env' &
+  rule	Env.open_scope(env,encflag) => env' &
 	ClassInf.start(r,n) => ci_state &
 	inst_class_in(env', mod, pre, csets, ci_state, c, false,inst_dims,impl)
 	  => (dae1,_,csets',ci_state', tys) &
 	Connect.equations csets' => dae2 &
 	list_append(dae1, dae2) => dae &
 	mktype(ci_state',tys) => ty
 	-------------------------------------------
-	inst_class(env, mod, pre, csets, c as SCode.CLASS(n,_,_,r,_),inst_dims,impl)
+	inst_class(env, mod, pre, csets, c as SCode.CLASS(n,_,encflag,r,_),inst_dims,impl)
 	  => (dae, [], ty,ci_state')
 
   rule	Print.print_buf "- inst_class " & Print.print_buf n & Print.print_buf " failed\n"
@@ -446,7 +446,7 @@ relation inst_classdef: (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
   rule	Prefix.print_prefix_str pre => prestr &
 	Absyn.path_string cn => cnstr &
 	Debug.fprintl ("insttr", ["inst_class derived: ", cnstr, ", pre=",prestr,"\n"]) &
-	Lookup.lookup_class(env,cn) => (c as SCode.CLASS(cn2,_,_,r,_), cenv) &
+	Lookup.lookup_class(env,cn,true) => (c as SCode.CLASS(cn2,_,_,r,_), cenv) &
 	Mod.lookup_modification_p(mods,cn) => m &
 	Mod.elab_mod(env,pre,mod) => mod' &
 	ClassInf.start(r, cn2) => new_ci_state &
@@ -466,7 +466,7 @@ relation inst_classdef: (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 	(** found in the environment, this rule prints an error *)
 	(** message. *)
 
-  rule	not Lookup.lookup_class(env,cn) => (_,_) &
+  rule	not Lookup.lookup_class(env,cn,false) => (_,_) &
 	Absyn.path_string(cn) => cns &
 	Print.print_buf "# unknown class: " & Print.print_buf cns & Print.print_buf "\n"
 	----------------------------------------
@@ -573,7 +573,7 @@ relation extend_components_to_env : (Env, Mod, Prefix, Connect.Sets, ClassInf.St
 			    SCode.Element list, InstDims, bool)
 	    => (Env) =
 
-  rule	Lookup.lookup_class(env,t) => (cl,cenv) & 
+  rule	Lookup.lookup_class(env,t,true) => (cl,cenv) & 
 	Debug.fprint ("decl", "got class \n") &
 
 	(** PA: PROBLEM, Modifiers should be merged in this phase, but
@@ -659,7 +659,7 @@ relation inst_element : (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 
   rule	Absyn.path_string(cn) => cns &
 	Debug.fprintln ("insttr", "Looking for base class") &
-	Lookup.lookup_class(env,cn) => (c as SCode.CLASS(cn2,_,_,restr,def), cenv) &
+	Lookup.lookup_class(env,cn,true) => (c as SCode.CLASS(cn2,_,_,restr,def), cenv) &
 	Debug.fprintln ("insttr", "Base class found") &
 	Mod.lookup_modification_p(mods,cn) => classmod &
 	Debug.fprintln ("insttr", "Modifications fetched") &
@@ -705,7 +705,7 @@ relation inst_element : (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 		     SCode.CLASSDEF(n,_,_,_),_,_)
 	  => fail
 
-  rule	Lookup.lookup_class(env,Absyn.IDENT(n)) => (_,_) &
+  rule	Lookup.lookup_class(env,Absyn.IDENT(n),false) => (_,_) &
 	Print.print_buf "# Trying to redeclare the variable " & Print.print_buf n &
 	Print.print_buf " as a class\n"
 	---------------------
@@ -772,7 +772,7 @@ relation inst_element : (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 	Debug.fcall("insttr",Env.print_env,env) &
 	Debug.fprint("insttr"," \n") &
 
-	Lookup.lookup_class(env,t) => (cl,cenv) & 
+	Lookup.lookup_class(env,t,true) => (cl,cenv) & 
 
 	Debug.fprintl ("insttr", ["found type for: ", n, "\n"]) &
 	Debug.fprintln ("insttr", "Looking up class modifications") &
@@ -848,7 +848,7 @@ relation inst_element : (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 	 **)
 
 	(**  Failure *)
-  rule	not Lookup.lookup_class(env,t) => (cl,cenv) &
+  rule	not Lookup.lookup_class(env,t,false) => (cl,cenv) &
 	Absyn.path_string(t) => s &
 	Print.print_buf "# unknown class '" & Print.print_buf s & Print.print_buf "' while instantiating " &
 	Prefix.prefix_add(n,[],pre) => pre' &
@@ -1105,7 +1105,7 @@ relation update_variable_in_env: (Mod.Mod,Absyn.ComponentRef, Env.Env, bool)
 	    attr as SCode.ATTR(ad,flow,acc,param,dir),
 	    t,m)),_) &
 
-	Lookup.lookup_class(env,t) => (cl,cenv) & 
+	Lookup.lookup_class(env,t,false) => (cl,cenv) & 
 
 	get_cref_from_mod(m) => crefs &
  	update_variables_in_env(mods,crefs,env,impl) => env2' &
@@ -2046,7 +2046,7 @@ end
 (** HJ: **)
 relation add_for_loop_scope : (Env.Env, Ident, Types.Type) => Env.Env =
 
-  rule	Env.open_scope env => env' &
+  rule	Env.open_scope (env,false) => env' &
 	Env.extend_frame_v(env',
 			   Types.VAR(i,
 				     Types.ATTR(false,
@@ -2414,7 +2414,7 @@ relation unroll : (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 
   axiom	unroll (_,_,_,csets,_,_,Values.ARRAY([]),_) => ([], csets)
 
-  rule	Env.open_scope env => env' &
+  rule	Env.open_scope (env,false) => env' &
 	Env.extend_frame_v (env',
 			    Types.VAR(i, Types.ATTR(false,
 						    SCode.RO,
@@ -3061,7 +3061,7 @@ relation inst_record_constructor_elt : (Env.Env,SCode.Element) =>
   rule	Debug.fprint ("recconst", "inst_record_constructor_elt called\n") &
 	elab_arraydim(env,dim,NONE,true,NONE) => dimexp &
 	Debug.fprint ("recconst", "elaborated arraydim\n") &
-	Lookup.lookup_class(env,t) => (cl,cenv) &
+	Lookup.lookup_class(env,t,true) => (cl,cenv) &
 	Debug.fprint ("recconst", "looked up class\n") &
 	Mod.elab_mod(env,Prefix.NOPRE,mod) => mod' &