diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-08-09 16:48:32 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-08-09 16:48:32 -0400 |
| commit | 3e59b823392701f538f972d689d04b0182696e51 (patch) | |
| tree | 5a4f935084c734ee1634b76abe5d2d5f1abf8bcc /src/lacweb.grm | |
| parent | e699687ba2ff0cc2c7c185c4d99669f77093473b (diff) | |
Lists all the way through
Diffstat (limited to 'src/lacweb.grm')
| -rw-r--r-- | src/lacweb.grm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lacweb.grm b/src/lacweb.grm index 7fb7b020..a206182b 100644 --- a/src/lacweb.grm +++ b/src/lacweb.grm @@ -308,8 +308,8 @@ cterm : LPAREN cexp RPAREN (#1 cexp, s (LPARENleft, RPARENright)) | FOLD (CFold, s (FOLDleft, FOLDright)) | UNIT (CUnit, s (UNITleft, UNITright)) -ctuple : cterm STAR cterm ([cterm1, cterm2]) - | cterm STAR ctuple (cterm :: ctuple) +ctuple : capps STAR capps ([capps1, capps2]) + | capps STAR ctuple (capps :: ctuple) rcon : ([]) | ident EQ cexp ([(ident, cexp)]) @@ -341,9 +341,7 @@ eexp : eapps (eapps) (EAbs ("_", SOME (TRecord (CRecord [], loc), loc), eexp), loc) end) - | LPAREN etuple RPAREN COLON cexp(case etuple of - [eexp] => (EAnnot (eexp, cexp), s (LPARENleft, cexpright)) - | _ => raise Fail "Multiple arguments to expression type annotation") + | eexp COLON cexp (EAnnot (eexp, cexp), s (eexpleft, cexpright)) | eexp MINUSMINUS cexp (ECut (eexp, cexp), s (eexpleft, cexpright)) | CASE eexp OF barOpt branch branchs (ECase (eexp, branch :: branchs), s (CASEleft, branchsright)) | IF eexp THEN eexp ELSE eexp (let |