st/lama_byterun
1
0
Fork 0
mirror of https://github.com/ProgramSnail/Lama.git synced 2025-12-06 06:48:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Ostap::expr interface to comply the spec

Browse source
This commit is contained in:
Dmitry Boulytchev 2020-10-04 17:58:26 +03:00
parent 52281261c4
commit 0c38e4b1df
8 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/version.ml
View file

@ -1 +1 @@
let version = "Version 1.00, 2f640fdc6, Wed Sep 23 01:39:38 2020 +0300"
let version = "Version 1.00, 52281261c, Wed Sep 30 21:21:57 2020 +0300"

2
stdlib/Ostap.lama
View file

@ -316,7 +316,7 @@ public fun expr (ops, opnd) {
esac
}
inner (ops)
inner (ops) (id)
}
initOstap ()

2
stdlib/regression/test11.lama
View file

@ -6,7 +6,7 @@ local a = token ("a"),
sub = [token ("-"), fun (l, _, r) {Sub (l, r)}],
mul = [token ("*"), fun (l, _, r) {Mul (l, r)}],
div = [token ("/"), fun (l, _, r) {Div (l, r)}],
exp = expr ({[Left, {add, sub}], [Left, {mul, div}]}, a) (id);
exp = expr ({[Left, {add, sub}], [Left, {mul, div}]}, a);
printf ("%s\n", parseString (exp |> bypass (eof), "a").string);
printf ("%s\n", parseString (exp |> bypass (eof), "a+a").string);

2
stdlib/regression/test12.lama
View file

@ -13,7 +13,7 @@ local a = token ("a"),
sub = [token ("-"), fun (l, _, r) {Sub (l, r)}],
mul = [token ("*"), fun (l, _, r) {Mul (l, r)}],
div = [token ("/"), fun (l, _, r) {Div (l, r)}],
exp = expr ({[Left, {add, sub}], [Left, {mul, div}]}, a) (id),
exp = expr ({[Left, {add, sub}], [Left, {mul, div}]}, a),
i;
printf ("%s\n", parseString (exp |> bypass (eof), gen (5)).string)

2
stdlib/regression/test13.lama
View file

@ -6,7 +6,7 @@ local a = token ("a"),
sub = [token ("-"), fun (l, _, r) {Sub (l, r)}],
mul = [token ("*"), fun (l, _, r) {Mul (l, r)}],
div = [token ("/"), fun (l, _, r) {Div (l, r)}],
exp = expr ({[Right, {add, sub}], [Left, {mul, div}]}, a) (id);
exp = expr ({[Right, {add, sub}], [Left, {mul, div}]}, a);
printf ("%s\n", parseString (exp |> bypass (eof), "a+a-a").string);
printf ("%s\n", parseString (exp |> bypass (eof), "a*a/a*a").string);

2
stdlib/regression/test14.lama
View file

@ -8,7 +8,7 @@ local a = token ("a"),
sub = [token ("-"), fun (l, _, r) {Sub (l, r)}],
mul = [token ("*"), fun (l, _, r) {Mul (l, r)}],
div = [token ("/"), fun (l, _, r) {Div (l, r)}],
exp = expr ({[Nona, singleton (eq)], [Right, {add, sub}], [Left, {mul, div}]}, a) (id);
exp = expr ({[Nona, singleton (eq)], [Right, {add, sub}], [Left, {mul, div}]}, a);
printf ("%s\n", parseString (exp |> bypass (eof), "a+a-a").string);
printf ("%s\n", parseString (exp |> bypass (eof), "a*a/a*a").string);

2
stdlib/regression/test15.lama
View file

@ -8,7 +8,7 @@ local a = token ("a"),
sub = [token ("-"), fun (l, _, r) {Sub (l, r)}],
mul = [token ("*"), fun (l, _, r) {Mul (l, r)}],
div = [token ("/"), fun (l, _, r) {Div (l, r)}],
exp = expr ({[Nona, singleton (eq)], [Right, {add, sub}], [Left, {mul, div}]}, a) (id);
exp = expr ({[Nona, singleton (eq)], [Right, {add, sub}], [Left, {mul, div}]}, a);
printf ("%s\n", parseString (exp |> bypass (eof), "a=a").string);
printf ("%s\n", parseString (exp |> bypass (eof), "a*a=a*a").string);

2
stdlib/regression/test16.lama
View file

@ -8,7 +8,7 @@ local a = token ("a") @ lift(fun (a) {if a then "a" else "b" fi}),
sub = [token ("-"), fun (l, _, r) {fun (a) {Sub (l (a), r (a))}}],
mul = [token ("*"), fun (l, _, r) {fun (a) {Mul (l (a), r (a))}}],
div = [token ("/"), fun (l, _, r) {fun (a) {Div (l (a), r (a))}}],
exp = expr ({[Nona, singleton (eq)], [Right, {add, sub}], [Left, {mul, div}]}, a) (id);
exp = expr ({[Nona, singleton (eq)], [Right, {add, sub}], [Left, {mul, div}]}, a);
fun unpack (x, y) {
case x of