Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make the precendence order of &,^,| higher than the comparison operators in Pancake #1006

Merged
merged 5 commits into from
Jul 29, 2024
Merged

Make the precendence order of &,^,| higher than the comparison operators in Pancake #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b7cf43
Made precendence order of &,^,| higher than the comparison operators
DoomishGuy Jun 28, 2024
2ed083c
Merge branch 'CakeML:master' into pan_prec_fix
DoomishGuy Jul 12, 2024
b501ffc
Merge branch 'CakeML:master' into pan_prec_fix
DoomishGuy Jul 22, 2024
7cb5e14
Actually commit the proof fix
DoomishGuy Jul 23, 2024
4de46d2
Merge branch 'CakeML:master' into pan_prec_fix
DoomishGuy Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions pancake/parser/panConcreteExamplesScript.sml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ val treeEx2_and_a_half = check_success $ parse_pancake ex2_and_a_half;

(** We also have a selection of boolean operators and
a ‘return’ statement. NOTE: all Pancake functions should end with a return statement.*)

val ex3 = ‘
fun boolfun() {
if b & (a ^ c) & d { return true; }
Expand All @@ -100,6 +101,20 @@ val ex3 = ‘

val treeEx3 = check_success $ parse_pancake ex3;

(** Bool operators have higher precedence than comparators, so z is always 1*)
val ex3_and_a_half = ‘
fun cmps () {
var x = 2;
var y = 3;
var z = (x & y != 0);
z = ((x & y) != 0);
z = (y & x != 0);
z = ((y & x) != 0);
}’;

val treeEx3_and_a_half = check_success $ parse_pancake ex3_and_a_half;


(** Loops: standard looping construct. *)

val ex4 = ‘
Expand Down
28 changes: 14 additions & 14 deletions pancake/parser/panPEGScript.sml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,16 @@ Definition pancake_peg_def[nocompute]:
rpt (seql [consume_tok BoolOrT; mknt EBoolAndNT] I)
FLAT]
(mksubtree ExpNT));
(INL EBoolAndNT, seql [mknt EOrNT;
rpt (seql [consume_tok BoolAndT; mknt EOrNT] I)
FLAT]
(mksubtree EBoolAndNT));
(INL EBoolAndNT, seql [mknt EEqNT;
rpt (seql [consume_tok BoolAndT; mknt EEqNT] I)
FLAT]
(mksubtree EBoolAndNT));
(INL EEqNT, seql [mknt ECmpNT;
try (seql [mknt EqOpsNT; mknt ECmpNT] I)]
(mksubtree EEqNT));
(INL ECmpNT, seql [mknt EOrNT;
try (seql [mknt CmpOpsNT; mknt EOrNT] I)]
(mksubtree ECmpNT));
(INL EOrNT, seql [mknt EXorNT;
rpt (seql [keep_tok OrT; mknt EXorNT] I)
FLAT]
Expand All @@ -239,16 +245,10 @@ Definition pancake_peg_def[nocompute]:
rpt (seql [keep_tok XorT; mknt EAndNT] I)
FLAT]
(mksubtree EXorNT));
(INL EAndNT, seql [mknt EEqNT;
rpt (seql [keep_tok AndT; mknt EEqNT] I)
(INL EAndNT, seql [mknt EShiftNT;
rpt (seql [keep_tok AndT; mknt EShiftNT] I)
FLAT]
(mksubtree EAndNT));
(INL EEqNT, seql [mknt ECmpNT;
try (seql [mknt EqOpsNT; mknt ECmpNT] I)]
(mksubtree EEqNT));
(INL ECmpNT, seql [mknt EShiftNT;
try (seql [mknt CmpOpsNT; mknt EShiftNT] I)]
(mksubtree ECmpNT));
(INL EShiftNT, seql [mknt EAddNT;
rpt (seql [mknt ShiftOpsNT; keep_nat] I)
FLAT]
Expand Down Expand Up @@ -624,8 +624,8 @@ val topo_nts = [“MulOpsNT”, “AddOpsNT”, “ShiftOpsNT”, “CmpOpsNT”
“EqOpsNT”, “ShapeNT”,
“ShapeCombNT”, “NotNT”, “LabelNT”, “FLabelNT”, “LoadByteNT”,
“LoadNT”, “StructNT”,
“EBaseNT”, “EMulNT”, “EAddNT”, “EShiftNT”, “ECmpNT”,
“EEqNT”, “EAndNT”, “EXorNT”, “EOrNT”, “EBoolAndNT”,
“EBaseNT”, “EMulNT”, “EAddNT”, “EShiftNT”, “EAndNT”, “EXorNT”, “EOrNT”,
“ECmpNT”, “EEqNT”, “EBoolAndNT”,
“ExpNT”, “ArgListNT”, “ReturnNT”,
“RaiseNT”, “ExtCallNT”,
“HandleNT”, “RetNT”, “RetCallNT”, “CallNT”,
Expand Down