Fix small bugs in fldiff and the fexpr parser/printer (ocaml-flambda#…

…1187)
xclerc · Mar 9, 2023 · 6edf34f · 6edf34f
1 parent cc8d97a
commit 6edf34f
Show file tree

Hide file tree

Showing 7 changed files with 2,163 additions and 1,982 deletions.
diff --git a/middle_end/flambda2/parser/flambda_lex.ml b/middle_end/flambda2/parser/flambda_lex.ml
diff --git a/middle_end/flambda2/parser/flambda_lex.mll b/middle_end/flambda2/parser/flambda_lex.mll
@@ -65,6 +65,7 @@ let keyword_table =
     "inlining_state", KWD_INLINING_STATE;
     "int32", KWD_INT32;
     "int64", KWD_INT64;
+    "land", KWD_LAND;
     "let", KWD_LET;
     "lsl", KWD_LSL;
     "lsr", KWD_LSR;
@@ -187,8 +188,9 @@ let oct_literal =
   '0' ['o' 'O'] ['0'-'7'] ['0'-'7' '_']*
 let bin_literal =
   '0' ['b' 'B'] ['0'-'1'] ['0'-'1' '_']*
+let sign = ['-']
 let int_literal =
-  decimal_literal | hex_literal | oct_literal | bin_literal
+  sign? (decimal_literal | hex_literal | oct_literal | bin_literal)
 let float_literal =
   ['0'-'9'] ['0'-'9' '_']*
   ('.' ['0'-'9' '_']* )?
@@ -243,6 +245,7 @@ rule token = parse
   | "%"  { PERCENT }
   | "<"  { LESS }
   | ">"  { GREATER }
+  | "<>" { LESSGREATER }
   | "<=" { LESSEQUAL }
   | ">=" { GREATEREQUAL }
   | "?"  { QMARK }

diff --git a/middle_end/flambda2/parser/flambda_parser.ml b/middle_end/flambda2/parser/flambda_parser.ml
diff --git a/middle_end/flambda2/parser/flambda_parser.mli b/middle_end/flambda2/parser/flambda_parser.mli
@@ -60,6 +60,7 @@ type token =
   | MINUS
   | LPAREN
   | LESSMINUS
+  | LESSGREATER
   | LESSEQUALDOT
   | LESSEQUAL
   | LESSDOT

diff --git a/middle_end/flambda2/parser/flambda_parser.mly b/middle_end/flambda2/parser/flambda_parser.mly
@@ -80,6 +80,7 @@ let make_boxed_const_int (i, m) : static_data =
 %token LESSEQUAL [@symbol "<="]
 %token LESSEQUALDOT [@symbol "<=."]
 %token LESSMINUS [@symbol "<-"]
+%token LESSGREATER [@symbol "<>"]
 %token LPAREN [@symbol "("]
 %token MINUS    [@symbol "-"]
 %token MINUSDOT [@symbol "-."]
@@ -306,9 +307,10 @@ code:
     MINUSGREATER; ret_cont = continuation_id;
     exn_cont = exn_continuation_id;
     ret_arity = return_arity;
-    is_tupled = boption(KWD_TUPLED);
     EQUAL; body = expr;
-    { let recursive, inline, id, newer_version_of, code_size = header in
+    { let recursive, inline, id, newer_version_of, code_size, is_tupled =
+        header
+      in
       { id; newer_version_of; param_arity = None; ret_arity; recursive; inline;
         params_and_body = { params; closure_var; region_var; depth_var;
                             ret_cont; exn_cont; body };
@@ -321,8 +323,9 @@ code_header:
     inline = option(inline);
     KWD_SIZE LPAREN; code_size = code_size; RPAREN;
     newer_version_of = option(newer_version_of);
+    is_tupled = boption(KWD_TUPLED);
     id = code_id;
-    { recursive, inline, id, newer_version_of, code_size }
+    { recursive, inline, id, newer_version_of, code_size, is_tupled }
 ;
 
 newer_version_of:
@@ -463,6 +466,7 @@ binary_float_arith_op:
 int_comp:
   | LESS { fun s -> Yielding_bool (Lt s) }
   | GREATER { fun s -> Yielding_bool (Gt s) }
+  | LESSGREATER { fun s -> Yielding_bool Neq }
   | LESSEQUAL { fun s -> Yielding_bool (Le s) }
   | GREATEREQUAL { fun s -> Yielding_bool (Ge s) }
   | QMARK { fun s -> Yielding_int_like_compare_functions s }

diff --git a/middle_end/flambda2/parser/print_fexpr.ml b/middle_end/flambda2/parser/print_fexpr.ml
@@ -758,7 +758,7 @@ and code_binding ppf
     inline code_size cs
     (pp_option ~space:Before (pp_like "newer_version_of(%a)" code_id))
     newer_version_of
-    (fun ppf is_tupled -> if is_tupled then Format.fprintf ppf "tupled@ ")
+    (fun ppf is_tupled -> if is_tupled then Format.fprintf ppf "@ tupled@ ")
     is_tupled code_id id;
   let { params; closure_var; region_var; depth_var; ret_cont; exn_cont; body } =
     params_and_body

diff --git a/middle_end/flambda2/tests/tools/fldiff.ml b/middle_end/flambda2/tests/tools/fldiff.ml
@@ -6,6 +6,10 @@ let _ =
     let file2 = Sys.argv.(2) in
     let unit1 = Test_utils.parse_flambda file1 in
     let unit2 = Test_utils.parse_flambda file2 in
+    let modname1 =
+      Parse_flambda.make_compilation_unit ~filename:file1 ~extension:".fl" ()
+    in
+    Compilation_unit.set_current (Some modname1);
     Format.printf "%a@."
       (Compare.Comparison.print Flambda_unit.print)
       (Compare.flambda_units unit1 unit2)