X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/1dd06e3cd2f4e8b23c398ac65ad09eff9d1c5a02..95f148cdfa509a961a5610ca274e29ba238561e3:/src/domtool.grm

diff --git a/src/domtool.grm b/src/domtool.grm
index 3bbc578..bd2726c 100644
--- a/src/domtool.grm
+++ b/src/domtool.grm
@@ -32,7 +32,8 @@ open Ast
  | 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 
@@ -64,6 +65,7 @@ open Ast
 
 %name Domtool
 
+%nonassoc THEN ELSE
 %right SEMI
 %nonassoc COLON
 %nonassoc IN
@@ -94,8 +96,7 @@ docOpt :                                   (NONE)
        | DOC                               (SOME DOC)
 
 expOpt :                                   (NONE)
-       | exp                               (SOME (ELocal (exp, (ESkip, (expleft, expright))),
-						  (expleft, expright)))
+       | exp                               (SOME exp)
 
 
 exp    : apps                              (apps)
@@ -126,7 +127,9 @@ 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))
@@ -138,6 +141,7 @@ term   : LPAREN exp RPAREN                 (exp)
        | 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))