diff --git a/src/X86.ml b/src/X86.ml index 233d17bb9..18d9b4f7e 100644 --- a/src/X86.ml +++ b/src/X86.ml @@ -542,7 +542,7 @@ let compile cmd env imports code = | FAIL ((line, col), value) -> let v, env = if value then env#peek, env else env#pop in let s, env = env#string cmd#get_infile in - env, [Push (L (box col)); Push (L (box line)); Push (M ("$" ^ s)); Push v; Call "Bmatch_failure"; Binop ("+", L (3 * word_size), esp)] + env, [Push (L (box col)); Push (L (box line)); Push (M ("$" ^ s)); Push v; Call "Bmatch_failure"; Binop ("+", L (4 * word_size), esp)] | i -> invalid_arg (Printf.sprintf "invalid SM insn: %s\n" (GT.show(insn) i)) diff --git a/src/version.ml b/src/version.ml index ea69867c6..7c82e5147 100644 --- a/src/version.ml +++ b/src/version.ml @@ -1 +1 @@ -let version = "Version 1.00, 53b2efc3b, Fri Dec 11 01:22:25 2020 +0300" +let version = "Version 1.00, 19252991a, Thu Dec 24 02:54:54 2020 +0300" diff --git a/stdlib/Fun.lama b/stdlib/Fun.lama index 01bb24525..25fb7352c 100644 --- a/stdlib/Fun.lama +++ b/stdlib/Fun.lama @@ -9,7 +9,7 @@ public fun id (x) { x } -public infixl $ after := (f, x) { +public infixr $ after := (f, x) { f (x) } diff --git a/stdlib/regression/test10.lama b/stdlib/regression/test10.lama index 325bc7dc8..9aaec8361 100644 --- a/stdlib/regression/test10.lama +++ b/stdlib/regression/test10.lama @@ -4,10 +4,10 @@ import Fun; fun many (a) { memo ( - fun (k) { + eta ( empty @ lift({}) - | many (a) |> fun (as) {a @ fun (x) {as +++ singleton (x)}} $ k - } + | many (a) |> fun (as) {a @ fun (x) {as +++ singleton (x)}} + ) ) }