Get parentheses in vaguely the right places

Author: wintersteiger

imlformat/iml-prettier.ts

@@ -1,7 +1,29 @@
+
 import { expect, test } from '@jest/globals';
 
 import { format } from "../imlformat.format";
 
+test("constants", () => {
+  format(`
+let a = 1
+let b = (- 1)
+let c = 1.0
+let d = (- 1.0)
+let e = "abc"
+`).then(x =>
+    expect(x).toEqual(`\
+let a = 1
+
+let b = -1
+
+let c = 1.0
+
+let d = -1.0
+
+let e = "abc"`))
+})
+
+
 test("function", () => {
   format(`
 let
@@ -21,7 +43,7 @@ theorem
    = ((f  x   ) >
     x)
 `).then(x =>
-    expect(x).toEqual(`theorem f_gt x = (f x) > x`))
+    expect(x).toEqual(`theorem f_gt x = f x > x`))
 })
 
 test("eval", () => {
@@ -64,4 +86,9 @@ test("directive", () => {
    "def";;
 `).then(x =>
     expect(x).toEqual(`#somedirective "def";;`))
+})
+
+test("operator precedence", () => {
+  format(`let f x y = ((x - 1) * (y + 1)) + 1`)
+    .then(x => expect(x).toEqual(`let f x y = (x - 1) * (y + 1) + 1`))
 })

imlformat/iml2json.bc.js

@@ -0,0 +1,39 @@
+import { expect, test } from '@jest/globals';
+
+import { format } from "../imlformat.format";
+
+test("decomp 1", () => {
+  format(`
+let g x =
+  if x > 22 then 9
+  else 100 + x
+
+let f x =
+  if x > 99 then
+    100
+  else if x < 70 && x > 23
+  then 89 + x
+  else if x > 20
+  then g x + 20
+  else if x > -2 then
+    103
+  else 99
+[@@decomp top ()]
+`).then(x =>
+    expect(x).toEqual(`\
+let g x = if x > 22 then 9 else 100 + x
+
+let f x =
+  if
+    x > 99
+  then
+    100
+  else
+    if
+      x < 70 && x > 23
+    then
+      89 + x
+    else
+      if x > 20 then g x + 20 else if x > -2 then 103 else 99
+[@@decomp top ()]`))
+})

imlformat/test/basic.test.ts

@@ -3,6 +3,11 @@ let
   x = (x +
   1)
 
+let z = - 1
+let q = - 1.0
+
+let l = 1 :: []
+
 let
  g y =
           (y *.
@@ -21,6 +26,8 @@ instance (fun x
   > 0)
   )
 
+let f x = if x = 2 then 3 else if x = 4 then 5 else 6
+
 eval
    (f 0);;
 
@@ -63,6 +70,10 @@ g
 =
   42
 
+let f x =
+  let y = x + 1 in
+  y - 1
+
 
 (* Comment A. *)
 

imlformat/test/decomp.test.ts

@@ -0,0 +1,8 @@
+import { expect, test } from '@jest/globals';
+
+import { format } from "../imlformat.format";
+
+test("Example from OCaml", () => {
+  format(`3 + 3 mod 2, 3 + (3 mod 2), (3 + 3) mod 2`).then(x =>
+    expect(x).toEqual(`(3 + 3 mod 2, 3 + 3 mod 2, (3 + 3) mod 2)`))
+})

imlformat/test/demo.iml

@@ -13,8 +13,12 @@ theorem
     && f
       y  > y
     && f  z > z
-    [@@timeout 3600]
-  [@@disable f] [@@by [%expand "f"] @> auto]
+    [@@timeout
+      3600 ]
+  [@@disable   f ] [@@by
+  [%expand "f"]
+      @>
+   auto]
   [@@by
     some
       other
@@ -25,7 +29,7 @@ theorem
 let f x = x + 1
 
 theorem thm1 x (y : int) z =
-  ((f x) > x) && (((f y) > y) && ((f z) > z))
+  f x > x && f y > y && f z > z
 [@@timeout 3600]
 [@@disable f]
 [@@by [%expand "f"] @> auto]