*** empty log message ***

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

modeq/explode.rml

@@ -125,6 +125,7 @@ module SCode :
   (** These are attributes that apply to a declared component. *)
 
   relation elaborate : Absyn.Program => Program
+  relation elab_class: Absyn.Class => Class	
   relation build_mod : (Absyn.Modification option, bool) => Mod
   relation print_mod : Mod => ()
   relation print_element : Element => ()

modeq/interactive.rml

@@ -49,6 +49,8 @@ with "dump.rml"
 with "debug.rml"
 with "rtopts.rml"
 with "util.rml"
+with "parse.rml"
+with "prefix.rml"
 (** relation: evaluate
  ** This relation evaluates expressions feeded interactively to the compiler.
 **)
@@ -368,10 +370,12 @@ relation get_annotation_string: Absyn.Annotation => string =
 	let pstring = "record Placement Boolean visible=true; Transformation transformation; Transformation iconTransformation" &
 	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 &	
-        Parse.parsestring totstring => p &
-	Scode.elaborate p => p' &
+        Parser.parsestring totstring => p &
+	SCode.elaborate p => p' &
 	Inst.make_env_from_program(p',Absyn.IDENT("Placement")) => env  & 
-	inst_class(env,mod',Prefix.NOPRE,[],placementclass,[]) => (dae,cs,t,state) &
+	get_class_in_program("Placement",p) => placementc &
+	SCode.elab_class(placementc) => placementclass &
+	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