summaryrefslogtreecommitdiff
path: root/src/parser.mly
diff options
context:
space:
mode:
authorKathy Gray2013-08-01 15:15:17 +0100
committerKathy Gray2013-08-01 15:15:17 +0100
commit227367389122fb7e92cc359bb7e1d6aaba36ec69 (patch)
treeefd5d5d1092c19a9f3045e450dca0c512a591964 /src/parser.mly
parent663179dbfc247e22721fca1ab9caed35eb26c090 (diff)
More removal of ws from l2.ott, correction to parser, and adding finite-map as preliminary to some minor type checking (for environments)
Diffstat (limited to 'src/parser.mly')
-rw-r--r--src/parser.mly9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/parser.mly b/src/parser.mly
index c0ebc274..33879f87 100644
--- a/src/parser.mly
+++ b/src/parser.mly
@@ -583,12 +583,21 @@ shift_exp:
{ eloc (E_app_infix($1,Id_aux(Id($2), locn 2 2), $3)) }
| shift_exp LtLt plus_exp
{ eloc (E_app_infix($1,Id_aux(Id($2), locn 2 2), $3)) }
+ | shift_exp LtLtLt plus_exp
+ { eloc (E_app_infix($1,Id_aux(Id($2), locn 2 2), $3)) }
shift_right_atomic_exp:
| plus_right_atomic_exp
{ $1 }
| shift_exp GtGt plus_right_atomic_exp
{ eloc (E_app_infix($1,Id_aux(Id($2), locn 2 2), $3)) }
+ | shift_exp GtGtGt plus_right_atomic_exp
+ { eloc (E_app_infix($1,Id_aux(Id($2), locn 2 2), $3)) }
+ | shift_exp LtLt plus_right_atomic_exp
+ { eloc (E_app_infix($1,Id_aux(Id($2), locn 2 2), $3)) }
+ | shift_exp LtLtLt plus_right_atomic_exp
+ { eloc (E_app_infix($1,Id_aux(Id($2), locn 2 2), $3)) }
+
cons_exp:
| shift_exp