Changeset 1726

Timestamp:

2005-04-25T09:27:18+02:00 (19 years ago)

Author:

petar

Message:

Added string separator relation in util. Added rule for printing x^{2 as x*x}

Location:

trunk/modeq

Files:

• dae.rml (modified) (1 diff)
• simcodegen.rml (modified) (2 diffs)
• util.rml (modified) (2 diffs)

trunk/modeq/dae.rml

@@ -139 +139 @@
   datatype Flow = FLOW | NON_FLOW 
 
-(* LS: Added for variables in functions *)
   datatype VarDirection = INPUT | OUTPUT | BIDIR
 
 (* LS: Removed VARVAL completely, and added Exp.Exp as an option to VAR *)
-  datatype Element = VAR of Exp.ComponentRef * 
-      VarKind * 
-      VarDirection * 
-      Type * 
-      Exp.Exp option * (* Binding expression e.g. for parameters*)
-      InstDims *
-      StartValue * (* value of start attribute *)
-      Flow * (* Flow of connector variable. Needed for 
-            unconnected flow variables *)
-      Absyn.Path list *(* The class the variable is instantiated from *)
-                        VariableAttributes option *
-                        Absyn.Comment option (* this contains the comment and annotation from Absyn *)
+  datatype Element = VAR of Exp.ComponentRef *  (* varible name *)
+      VarKind *   (* variable, constant, parameter, etc. *)
+      VarDirection *    (* input, output or bidir *)
+      Type *      (* one of the builtin types *)
+      Exp.Exp option *  (* Binding expression e.g. for parameters*)
+      InstDims *    (* dimension of original component *)
+      StartValue *    (* value of start attribute *)
+      Flow *      (* Flow of connector variable. Needed for 
+            unconnected flow variables *)
+      Absyn.Path list * (* class the variable is instantiated from *)
+                        VariableAttributes option *   (* attributes: min,max,quantity..*)
+                        Absyn.Comment option        (* comment and annotation from Absyn*)
 
 

trunk/modeq/simcodegen.rml

@@ -1040 +1040 @@
    print_exp2_str (Exp.BINARY(e1, op as Exp.SUB(ty), e2 as Exp.BINARY(e21, Exp.SUB(ty2), e22)),pri1) => s'''
 
-  rule  
-   Exp.binop_priority op => pri2 &
+  rule  (* x^2 => x*x *)
+   Exp.binop_priority op => pri2 &
+   Exp.print_leftpar_str (pri1,pri2) => (s1, pri3) &
+   print_exp2_str (e1,pri3) => s2 & 
+   Exp.print_rightpar_str (pri1,pri2) => s4 &
+   Util.string_append_list([s1,s2, "*",s2,s4]) => res 
+   ------------------------
+   print_exp2_str (Exp.BINARY(e1, (op as Exp.POW(_)), Exp.ICONST(2)),pri1) => res
+   
+  rule  (* x^2 => x*x *)
+   int_real(2) => two' &
+   real_eq(two,two) => true &
+   Exp.binop_priority op => pri2 &
+   Exp.print_leftpar_str (pri1,pri2) => (s1, pri3) &
+   print_exp2_str (e1,pri3) => s2 & 
+   Exp.print_rightpar_str (pri1,pri2) => s4 &
+   Util.string_append_list([s1,s2, "*",s2,s4]) => res 
+   ------------------------
+   print_exp2_str (Exp.BINARY(e1, (op as Exp.POW(_)), Exp.RCONST(two)),pri1) => res
+
+  rule  Exp.binop_priority op => pri2 &
    Exp.print_leftpar_str (pri1,pri2) => (s1, pri3) &
    print_exp2_str (e1,pri3) => s2 & 
@@ -1051 +1070 @@
          string_append(s'',s3) => s''' &
          string_append(s''',")") => res &
-       string_append (res, s4) => res'
+   string_append (res, s4) => res'
    ------------------------
    print_exp2_str (Exp.BINARY(e1, (op as Exp.POW(_)), e2),pri1) => res'

trunk/modeq/util.rml

@@ -185 +185 @@
   relation string_append_list : string list => string
   relation string_delimit_list : (string list, string) => string
+  relation string_delimit_list_2sep : (string list, string,string,int) => string
   relation string_delimit_list_no_empty : (string list, string) => string
   relation string_replace_char : (string, char, char) => string
@@ -1080 +1081 @@
   string_delimit_list(f::r,delim) => str
 end
+
+(** relation: string_delimit_list_2sep
+ ** author: PA
+ **
+ ** This relation is similar to string_delimit_list, i.e it inserts string delimiters between 
+ ** consecutive strings in a list. But it also count the lists and inserts a second string delimiter
+ ** when the counter is reached. This can be used when for instance outputting large lists of values
+ ** and a newline is needed after ten or so items.
+**)
+
+relation string_delimit_list_2sep : (string list, string,string,int) => string =
+
+  rule  string_delimit_list_2sep2(str,sep1,sep2,n,0) => res
+  ----------------------------
+  string_delimit_list_2sep(str,sep1,sep2,n) => res
+end
+
+
+(** relation: string_delimit_list_2sep2
+ ** author: PA
+ **
+ ** Helper relation to string_delimit_list_2sep
+ **)
+
+relation string_delimit_list_2sep2: (string list, string, string, int,int (* iterator*)) 
+    => string =
+
+  axiom string_delimit_list_2sep2([],_,_,_,_) => "" 
+  axiom string_delimit_list_2sep2([s],_,_,_,_) => s 
+
+  rule  (* special case for first element*)
+  string_delimit_list_2sep2(r,sep1,sep2,n,1) => str1 &
+  string_append_list([f,sep1,str1]) => str
+  ---------------------------
+  string_delimit_list_2sep2(f::r,sep1,sep2,n,0) => str
+
+  rule  (* insert second delimiter*)
+  int_mod(iter,n) => 0 &
+  iter + 1 => iter' &
+  string_delimit_list_2sep2(r,sep1,sep2,n,iter') => str1 &
+  string_append_list([f,sep1,sep2,str1]) => str
+  ---------------------------
+  string_delimit_list_2sep2(f::r,sep1,sep2,n,iter) => str
+
+  rule  (* not inserting second delimiter*)
+  iter + 1 => iter' &
+  string_delimit_list_2sep2(r,sep1,sep2,n,iter') => str1 &
+  string_append_list([f,sep1,str1]) => str
+  ---------------------------
+  string_delimit_list_2sep2(f::r,sep1,sep2,n,iter) => str
+  
+  rule  print "string_delimit_list_2sep2 failed\n"
+  -------------------------
+  string_delimit_list_2sep2(_,_,_,_,_) => fail
+end
+
 
 (** relation string_delimit_list_no_empty