give if-then-else expression a precedence

butterunderflow · Aug 23, 2024 · 4786d3b · 4786d3b
1 parent 84580ac
commit 4786d3b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/lib/syntax/parser.mly b/lib/syntax/parser.mly
@@ -234,7 +234,7 @@ expr:
        { make_node (ELet (x, e1, e2)) $startpos $endpos }
     | LET REC binds=separated_nonempty_list(AND, function_bind) IN body=expr %prec over_TOP
        { make_node (ELetrec (binds, body)) $startpos $endpos }
-    | IF e0=expr THEN e1=expr ELSE e2=expr
+    | IF e0=expr THEN e1=expr ELSE e2=expr %prec over_TOP
        { make_node (EIf (e0, e1, e2)) $startpos $endpos }
     | tu=tuple_expr 
        { tu }

diff --git a/tests/regular/parse_test.ml b/tests/regular/parse_test.ml
@@ -1280,6 +1280,38 @@ let result = print_int (sum 4)
            ((Mul ((TTuple ((TCons additive ()) (TCons additive ())))))
              (Div ((TTuple ((TCons additive ()) (TCons additive ())))))))
          (TDAdt atom () ((Var ((TCons string ()))))))))
+    |}];
+
+  print_parsed_program {|
+let x = if true then 2 else 1 
+
+let x = 1
+     |};
+  [%expect
+    {|
+    ((TopLet x
+       ((desc
+          (EIf
+            ((desc (EConst (CBool true)))
+              (start_loc ((pos_fname "") (pos_lnum 2) (pos_bol 1) (pos_cnum 12)))
+              (end_loc ((pos_fname "") (pos_lnum 2) (pos_bol 1) (pos_cnum 16)))
+              (attrs ()))
+            ((desc (EConst (CInt 2)))
+              (start_loc ((pos_fname "") (pos_lnum 2) (pos_bol 1) (pos_cnum 22)))
+              (end_loc ((pos_fname "") (pos_lnum 2) (pos_bol 1) (pos_cnum 23)))
+              (attrs ()))
+            ((desc (EConst (CInt 1)))
+              (start_loc ((pos_fname "") (pos_lnum 2) (pos_bol 1) (pos_cnum 29)))
+              (end_loc ((pos_fname "") (pos_lnum 2) (pos_bol 1) (pos_cnum 30)))
+              (attrs ()))))
+         (start_loc ((pos_fname "") (pos_lnum 2) (pos_bol 1) (pos_cnum 9)))
+         (end_loc ((pos_fname "") (pos_lnum 2) (pos_bol 1) (pos_cnum 30)))
+         (attrs ())))
+      (TopLet x
+        ((desc (EConst (CInt 1)))
+          (start_loc ((pos_fname "") (pos_lnum 4) (pos_bol 33) (pos_cnum 41)))
+          (end_loc ((pos_fname "") (pos_lnum 4) (pos_bol 33) (pos_cnum 42)))
+          (attrs ()))))
     |}]
 
 let%expect_test "Test: path parsing" =