diff --git a/src/parser.mly b/src/parser.mly index 280e4908837b2a27bf57f9ed0ca8446060774b1c..11ab1ed1eef93fb17b44056983644d3cfd0f5df6 100644 --- a/src/parser.mly +++ b/src/parser.mly @@ -966,7 +966,7 @@ sxEquation: TK_ASSERT sxExpression TK_SEMICOL } | sxLeft TK_EQ sxExpression TK_SEMICOL { - ( [] , [ {src = $2; it = {eq_left = $1; eq_right = $3} } ] ) + ( [] , [ {src = $2; it = ($1, $3) } ] ) } ; diff --git a/src/syntaxTreeCore.ml b/src/syntaxTreeCore.ml index 04dc3a90215c6081a959393e041494f4746429a1..4f4c22e79bbf3d672e64b0dcea913192bec568b4 100644 --- a/src/syntaxTreeCore.ml +++ b/src/syntaxTreeCore.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 07/02/2008 (at 11:27) by Erwan Jahier> *) +(** Time-stamp: <modified the 07/02/2008 (at 11:31) by Erwan Jahier> *) (** (Raw) Abstract syntax tree of source programs. *) @@ -84,10 +84,8 @@ and var_nature = | VarOutput | VarLocal -and eq_info = { - eq_left : left_part list ; - eq_right: val_exp -} +and eq_info = (left_part list * val_exp) + and left_part = | LeftVar of (Ident.t srcflagged) | LeftField of (left_part * (Ident.t srcflagged)) diff --git a/src/syntaxTreeDump.ml b/src/syntaxTreeDump.ml index 621b03f1b79e536ee13c5e61d70a314a8b6ba48f..f67ce6144cf8865e0f8748434bba4c65fc034f9d 100644 --- a/src/syntaxTreeDump.ml +++ b/src/syntaxTreeDump.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 07/02/2008 (at 11:25) by Erwan Jahier> *) +(** Time-stamp: <modified the 07/02/2008 (at 11:31) by Erwan Jahier> *) open Lxm @@ -350,7 +350,7 @@ and dump_assert_list (os: Format.formatter) (af: (val_exp srcflagged) list) = ( and dump_eq_list (os: Format.formatter) (eqfs: (eq_info srcflagged) list) = ( match eqfs with [] -> () - | {it={eq_left=lflst; eq_right=exp}; src=lxm} :: reste -> ( + | {it=(lflst,exp); src=lxm} :: reste -> ( Format.fprintf os "@\n%a = %a;%a" dump_left_part_list lflst dump_val_exp exp