| COLON | CARET | BANG | AND
| LPAREN | RPAREN | LBRACK | RBRACK | LBRACE | RBRACE
| EQ | COMMA | BSLASH | BSLASHBSLASH | SEMI | LET | IN | BEGIN | END
- | ROOT
+ | IF | THEN | ELSE
+ | ROOT | SKIP
| EXTERN | TYPE | VAL | WITH | WHERE | CONTEXT
%nonterm
%name Domtool
+%nonassoc THEN ELSE
%right SEMI
%nonassoc COLON
%nonassoc IN
| DOC (SOME DOC)
expOpt : (NONE)
- | exp (SOME (ELocal (exp, (ESkip, (expleft, expright))),
- (expleft, expright)))
+ | exp (SOME exp)
exp : apps (apps)
(ESeq ls, (exp1left, exp2right))
end)
| exp SEMI (exp)
- | SYMBOL LARROW CSYMBOL SEMI exp (EGet (SYMBOL, CSYMBOL, exp), (SYMBOLleft, expright))
+ | SYMBOL LARROW CSYMBOL SEMI exp (EGet (SYMBOL, NONE, CSYMBOL, exp), (SYMBOLleft, expright))
+ | SYMBOL COLON typ LARROW CSYMBOL SEMI exp (EGet (SYMBOL, SOME typ, CSYMBOL, exp), (SYMBOLleft, expright))
+ | IF exp THEN exp ELSE exp END (EIf (exp1, exp2, exp3), (IFleft, ENDright))
apps : term (term)
| apps term (EApp (apps, term), (appsleft, termright))
| LBRACK elist RBRACK (EList elist, (LBRACKleft, RBRACKright))
| LET exp IN exp END (ELocal (exp1, exp2), (LETleft, ENDright))
| SYMBOL (EVar SYMBOL, (SYMBOLleft, SYMBOLright))
+ | SKIP (ESkip, (SKIPleft, SKIPright))
sets : CSYMBOL EQ apps SEMIopt ([(ESet (CSYMBOL, apps), (CSYMBOLleft, appsright))])
| CSYMBOL EQ apps SEMI sets ((ESet (CSYMBOL, apps), (CSYMBOLleft, appsright))