Fixed model editor interface bug, still need to clean up.

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

Author: Peter Aronsson

modeq/ceval.rml

@@ -709,7 +709,7 @@ relation ceval_function: (Env.Env, Absyn.Path, Values.Value list, bool (*impl*)
 	Print.get_string => s & print s & print "\n" &
 	DAE.dae_to_record_value(funcname,dae,impl) => value  
 	----------------------
-	ceval_function(env,funcname,vallst,impl as false) => value
+	ceval_function(env,funcname,vallst,impl) => value
 
   rule	Debug.fprint("failtrace", "ceval_function: Don't know what to do. impl was always false before:")
 	& Absyn.path_string funcname => s

modeq/inst.rml

@@ -2520,8 +2520,9 @@ relation inst_array : (Env.Env,
 	inst_array(env,ci_state as ClassInf.FUNCTION(_),mod,pre,csets,n,(cl,attr),i,DIMEXP(_,_),dims,idxs,inst_dims,impl)
 	  => ([dae],[],ty)*)
 
-  rule	inst_var2(env,ci_state,mod,pre,csets,n,cl,attr,dims,i::idxs,inst_dims,impl)
-	  => (dae,csets,ty)
+  rule	print "DIMEXP in inst_array\n" &
+	inst_var2(env,ci_state,mod,pre,csets,n,cl,attr,dims,i::idxs,inst_dims,impl)
+	  => (dae,csets,ty) 
 	-----------------
 	inst_array(env,ci_state,mod,pre,csets,n,(cl,attr),i,DIMEXP(_,_),dims,idxs,inst_dims,impl)
 	  => (dae,csets,ty)
@@ -2531,7 +2532,7 @@ relation inst_array : (Env.Env,
 	inst_array(env,ci_state,mod,pre,csets,n,(cl,attr),i,DIMINT(stop),dims,idxs,inst_dims,impl)
 	  => ([], csets, (Types.T_NOTYPE,NONE))
 
-  rule	(* Modifiers of arrays that are functioncall, eg. Real x[:]=foo(...) *)
+  (*rule	(* Modifiers of arrays that are functioncall, eg. Real x[:]=foo(...) *)
 	(* Should only generate -one- functioncall *)
 	Mod.mod_equation(mod) => SOME(Types.TYPED(e,p)) &
 	Exp.contain_functioncall(e) => true &
@@ -2547,9 +2548,13 @@ relation inst_array : (Env.Env,
 	Util.list_flatten([dae1,dae2,[dae3]]) => dae
 	-----------------------------
 	inst_array(env,ci_state,mod,pre,csets,n,(cl,attr),i,DIMINT(stop),dims,idxs,inst_dims,impl)
-          => (dae,csets',ty)
+          => (dae,csets',ty)*)
 
   rule	Mod.lookup_idx_modification(mod,i) => mod' &
+	Mod.print_mod_str mod' => str &
+        Debug.fprint("failtrace", "inst array, mod' =") & 
+	Debug.fprint("failtrace", str) & 
+	Debug.fprint("failtrace", "\n") &
 	inst_var2(env,ci_state,mod',pre,csets,n,cl,attr,dims,i::idxs,inst_dims,impl)
 	  => (dae1,csets',ty) &
 	int_add(i,1) => i' &
@@ -2739,7 +2744,7 @@ relation elab_arraydim_decl : (Env.Env, Absyn.ComponentRef, Absyn.ArrayDim, bool
 	Ceval.ceval(env,e,impl,st,NONE) => (Values.INTEGER(i),_) &
  	elab_arraydim_decl(env,cref,ds,impl,st) => l
 	-------------------------------------------
-	elab_arraydim_decl(env,cref,Absyn.SUBSCRIPT(d)::ds,impl as false,st) => SOME(DIMINT(i))::l
+	elab_arraydim_decl(env,cref,Absyn.SUBSCRIPT(d)::ds,impl (* as false*),st) => SOME(DIMINT(i))::l
 
   rule	Debug.fprintln("insttr", "elab_arraydim_decl6") &
 	Static.elab_exp(env, d,impl,st) => (e,Types.PROP((Types.T_INTEGER(_),_),cnst),_) &

modeq/interactive.rml

@@ -3613,7 +3613,7 @@ relation get_annotation_string: (string,Absyn.Annotation) => string =
 	SCode.elab_class(placementc) => placementclass &
 	Mod.elab_mod (env,Prefix.NOPRE,mod',true) => mod'' &	
 	Inst.inst_class(env, mod'', Prefix.NOPRE, [], placementclass,
-			[], true,Inst.TOP_CALL) 
+			[], false,Inst.TOP_CALL) 
 	  => (dae, _, cs, t, state) &
 	(* Put bindings of variables as expressions inside variable elements of the dae instead of equations *)
 	Inst.init_vars_modelica_output dae => dae' &

modeq/lookup.rml

@@ -1046,6 +1046,10 @@ relation build_record_constructor_varlst : (SCode.Class,Env.Env) => Types.Var li
 	build_record_constructor_varlst (cl as SCode.CLASS(_,_,_,_,SCode.PARTS(elts,_,_,_,_,_)),env) 
 	(* Add the return type of the record constructor *)
 	    => Types.VAR("result",Types.ATTR(false,SCode.RW,SCode.VAR,Absyn.OUTPUT),false,ty,Types.UNBOUND)::inputvarlst
+
+  rule	Debug.fprint("failtrace","build_record_constructor_varlst failed\n")
+	-----------------------
+	build_record_constructor_varlst(_,_) => fail
 end
 
 (** relation: build_varlst_from_elts

modeq/mod.rml

@@ -146,6 +146,7 @@ module Mod:
   relation mod_equation : Types.Mod => Types.EqMod option
 
   relation print_mod : Types.Mod => ()
+  relation print_mod_str : Types.Mod => string 
 
 end
 
@@ -683,9 +684,13 @@ relation lookup_idx_modification: (Types.Mod, int) => Types.Mod =
 	-----------------------------------
 	lookup_idx_modification(Types.MOD(f,subs,eq),idx) => mod'''
 
-  rule	Print.print_buf "# Mod.lookup_idx_modification(" &
-	print_mod mod & Print.print_buf "," & int_string idx => s & Print.print_buf s &
-	Print.print_buf ") failed\n"
+  rule	Debug.fprint("failtrace","-lookup_idx_modification(") &
+	print_mod_str mod => str &
+	Debug.fprint("failtrace",str) &
+	Debug.fprint("failtrace",",") &
+	int_string idx => s & 
+	Debug.fprint("failtrace",s) &
+	Debug.fprint("failtrace",") failed\n") 
 	--------------------
 	lookup_idx_modification(mod,idx) => fail
 

modeq/types.rml

@@ -519,24 +519,24 @@ relation subtype : (Type, Type) => bool =
 	subtype((T_ARRAY(_,t1),_),(T_ARRAY(DIM(NONE),t2),_)) => true
 
   rule  subtype (t1,t2) => true
-	    -----------------------
-	    subtype((T_ARRAY(DIM(NONE),t1),_),(T_ARRAY(_,t2),_)) => true
+	-----------------------
+	subtype((T_ARRAY(DIM(NONE),t1),_),(T_ARRAY(_,t2),_)) => true
 
   rule  i1 = i2 &
- 	    subtype (t1,t2) => true
-	    ---------------------------------------------------------
-	    subtype((T_ARRAY(DIM(SOME(i1)),t1),_),(T_ARRAY(DIM(SOME(i2)),t2),_)) => true
-	    
+ 	subtype (t1,t2) => true
+	---------------------------------------------------------
+	subtype((T_ARRAY(DIM(SOME(i1)),t1),_),(T_ARRAY(DIM(SOME(i2)),t2),_)) => true
+	
   rule	subtype_varlist(els1, els2) => true
-	    -----------------------------------
-	    subtype((T_COMPLEX(st1,els1),_), (T_COMPLEX(st2,els2),_)) => true
+	-----------------------------------
+	subtype((T_COMPLEX(st1,els1),_), (T_COMPLEX(st2,els2),_)) => true
 
-	    (* PR. Check of tuples, similar to complex. Just that
+	(* PR. Check of tuples, similar to complex. Just that
 	     identifier name do not have to be checked. Only types are
-	     checked. *)
+	 checked. *)
   rule	subtype_typelist(type_list1,type_list2) => true
 	-----------------------------------
-	    subtype((T_TUPLE(type_list1),_), (T_TUPLE(type_list2),_)) => true
+	subtype((T_TUPLE(type_list1),_), (T_TUPLE(type_list2),_)) => true
 
   axiom subtype(t1,t2) => false