*** empty log message ***

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

modeq/dae.rml

@@ -73,6 +73,7 @@ module DAE:
   datatype DAElist = DAE of Element list
 
   relation dump: DAElist => ()
+  relation dump_elements : Element list => () 
   relation dump_str: DAElist => string
   relation dump_debug: DAElist => ()
   relation dump_debug_element : Element => ()

modeq/inst.rml

@@ -354,7 +354,11 @@ relation inst_classdef: (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 	inst_list(env'',mods,pre,csets'',ci_state''', inst_algorithm, als)
 	  => (dae3,env''',csets''', ci_state'''') &
 	list_append(dae1,dae2) => dae5 &
-	list_append(dae5,dae3) => dae
+	list_append(dae5,dae3) => dae &
+	print "element list \n"&
+	DAE.dump_elements dae &
+	print "Env: \n" &
+	Env.print_env env'''
 	------------------------------------------------------
 	inst_classdef(env,mods,pre, csets, ci_state,
 		      SCode.PARTS(els,eqs,als), re, prot, inst_dims)
@@ -419,7 +423,7 @@ relation inst_element_list : (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 	inst_element_list(env',mod,pre,csets',ci_state',els, inst_dims)
 	  => (dae2,env'',csets'',ci_state'',tys2) &
 	list_append(tys1, tys2) => tys &
-	list_append(dae1, dae2) => dae
+	list_append(dae1, dae2) => dae 
 	------------------------------
 	inst_element_list(env,mod,pre,csets,ci_state,el::els, inst_dims)
 	  => (dae, env'', csets'', ci_state'', tys)
@@ -2263,14 +2267,22 @@ end
 relation inst_mod_equation : (Exp.ComponentRef, Types.Type, Mod)
 	  => DAE.Element list =
 
+  rule	print "inst_mod_equation\n" &
+	Exp.cref_str cr => str &
+	print "cref = " & print str &
+	print "\nmod=" &
+	Mod.print_mod mod &
+	int_eq(1,0) => true
+	----------
+	inst_mod_equation(cr,ty1,mod) => []
 
   rule	Static.elab_type ty1 => t &
 	inst_eq_equation(Exp.CREF(cr,t),
 			 Static.PROP(ty1,false(*FIXME*)), e,prop2) => dae
 	-----------------------------------------------
 	inst_mod_equation(cr,ty1, mod as Mod.MOD(_,_,SOME((e,prop2))))
 	  => dae
-	  
+
   axiom inst_mod_equation(_,_,Mod.MOD(_,_,NONE)) => []
   axiom inst_mod_equation(_,_,Mod.NOMOD) => []
 

modeq/interactive.rml

@@ -51,6 +51,7 @@ with "rtopts.rml"
 with "util.rml"
 with "parse.rml"
 with "prefix.rml"
+with "mod.rml"
 (** relation: evaluate
  ** This relation evaluates expressions feeded interactively to the compiler.
 **)
@@ -367,15 +368,16 @@ end
 relation get_annotation_string: Absyn.Annotation => string =
 
   rule	SCode.build_mod(SOME(Absyn.CLASSMOD([mod],NONE)),false) => mod' & 
-	let pstring = "record Placement Boolean visible=true; Transformation transformation; Transformation iconTransformation" &
+	let pstring = "record Placement Boolean visible=true; Transformation transformation; Transformation iconTransformation; end Placement;" &
 	let tstring = "record Transformation Real x=0; Real y=0; Real scale=1; Real aspectRatio=1; Boolean flipHorizontal=false; Boolean flipVertical=false; Real rotation=0; end Transformation;" &
 	string_append(tstring,pstring) => totstring &	
         Parser.parsestring totstring => p &
-	SCode.elaborate p => p' &
+	SCode.elaborate(p) => p' &
 	Inst.make_env_from_program(p',Absyn.IDENT("Placement")) => env  & 
 	get_class_in_program("Placement",p) => placementc &
 	SCode.elab_class(placementc) => placementclass &
-	Inst.inst_class(env,mod',Prefix.NOPRE,[],placementclass,[]) => (dae,cs,t,state) &
+	Mod.elab_mod (env,Prefix.NOPRE,mod') => mod'' &
+	Inst.inst_class(env,mod'',Prefix.NOPRE,[],placementclass,[]) => (dae,cs,t,state) &
 	DAE.get_variable_bindings_str dae => str 
 	---------------------------
 	get_annotation_string(Absyn.ANNOTATION([(mod as (Absyn.MODIFICATION(_,Absyn.CREF_IDENT("Placement",_),_)))])) => str