diff --git a/src/licDump.ml b/src/licDump.ml index 42800983d2819229b326e633cf7275839c5e1815..79f86fe8821dbcee491ec8d59fadd94c20ab0d94 100644 --- a/src/licDump.ml +++ b/src/licDump.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 25/02/2009 (at 16:09) by Erwan Jahier> *) +(** Time-stamp: <modified the 25/02/2009 (at 16:33) by Erwan Jahier> *) open Printf open Lxm @@ -285,6 +285,10 @@ and (string_of_by_pos_op_eff: Eff.by_pos_op srcflagged -> Eff.val_exp list -> st in let str = match posop.it,vel with + | Predef (Predef.NOT_n,_), [ve1] -> + ((op2string Predef.NOT_n) ^ " " ^ + (if is_a_tuple ve1 then (tuple_par [ve1]) else sov ve1)) + | Predef (Predef.DIESE_n,_), [ve1] -> if !Global.lv4 then sov ve1 (* lv4 does no accept to apply # on One var only! *) @@ -329,6 +333,7 @@ and (string_of_by_pos_op_eff: Eff.by_pos_op srcflagged -> Eff.val_exp list -> st | ("Lustre","uminus"), [] -> " -" ^ sov (hd vel) | ("Lustre","iuminus"), [] -> " -" ^ sov (hd vel) | ("Lustre","ruminus"), [] -> " -" ^ sov (hd vel) + | ("Lustre","not"), [] -> " not " ^ sov (hd vel) | ("Lustre","lt"), [] -> sov (hd vel) ^ " < " ^ sov (hd (tl vel)) | ("Lustre","lte"), [] -> sov (hd vel) ^ " <= " ^ sov (hd (tl vel)) diff --git a/src/predef.ml b/src/predef.ml index 8c05c8d78ff32884e5954c5a2a998228c3fc494b..00086d0d2ac058607585ff072f212573e0ed97c3 100644 --- a/src/predef.ml +++ b/src/predef.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 10/12/2008 (at 17:49) by Erwan Jahier> *) +(** Time-stamp: <modified the 25/02/2009 (at 16:38) by Erwan Jahier> *) (* XXX shoud not type int, real, and bool be handled there ? *) @@ -75,7 +75,7 @@ let op2string = function | FALSE_n -> "false" | ICONST_n id -> Ident.to_string id | RCONST_n id -> Ident.to_string id - | NOT_n -> "not " + | NOT_n -> "not" | REAL2INT_n -> "real2int" | INT2REAL_n -> "int2real" | AND_n -> "and" @@ -115,7 +115,7 @@ let op2string = function | BoolRed -> "boolred" let op2string_long = function - | EQ_n -> "equal" + | EQ_n -> "eq" | NEQ_n -> "diff" | IMPL_n -> "impl" | LT_n -> "lt" diff --git a/src/test/test.res.exp b/src/test/test.res.exp index b16439791a695ba7dc292a56405189e08ad83cbc..0ee37a600565178b80bc3463144d7c37b8c0025a 100644 --- a/src/test/test.res.exp +++ b/src/test/test.res.exp @@ -11634,7 +11634,7 @@ tel -- end of node alias::aliasGivenNode node alias::aliasPredefNot(i:bool) returns (o:bool); let - o = Lustre::not (i); + o = Lustre::not(i); tel -- end of node alias::aliasPredefNot node alias::alias(a:bool) returns (b:bool; c:int); @@ -17619,12 +17619,12 @@ node mapiter::n_node_alias( returns ( o:A_bool_2); let - o = Lustre::map<<Lustre::equal, 2>>(i1, i2); + o = Lustre::map<<Lustre::eq, 2>>(i1, i2); tel -- end of node mapiter::n_node_alias node mapiter::map_egal(i1:A_bool_2; i2:A_bool_2) returns (o:A_bool_2); let - o = Lustre::map<<Lustre::equal, 2>>(i1, i2); + o = Lustre::map<<Lustre::eq, 2>>(i1, i2); tel -- end of node mapiter::map_egal