Dependency ordering

[clinton/domtool2.git] / src / domtool.grm

diff --git a/src/domtool.grm b/src/domtool.grm
index 17ad3c1..e7ce9ea 100644 (file)
--- a/src/domtool.grm
+++ b/src/domtool.grm
@@ -33,7 +33,7 @@ open Ast
  | LPAREN | RPAREN | LBRACK | RBRACK | LBRACE | RBRACE
  | EQ | COMMA | BSLASH | SEMI | LET | IN | END
  | ROOT
- | EXTERN | TYPE | VAL | WITH | WHERE
+ | EXTERN | TYPE | VAL | WITH | WHERE | CONTEXT
 
 %nonterm 
    file of file
@@ -76,17 +76,18 @@ open Ast
 
 %%
 
-file   : decls expOpt                      (decls, expOpt)
+file   : docOpt decls expOpt               (docOpt, decls, expOpt)
 
 decls  :                                   ([])
-       | decl SEMI decls                   (decl :: decls)
+       | decl decls                        (decl :: decls)
 
-decl   : decl' docOpt                      (decl', docOpt, (decl'left, docOptright))
+decl   : decl' SEMI docOpt                 (decl', docOpt, (decl'left, docOptright))
 
 decl'  : EXTERN TYPE SYMBOL                (DExternType SYMBOL)
        | EXTERN VAL SYMBOL COLON typ       (DExternVal (SYMBOL, typ))
        | VAL SYMBOL EQ exp                 (DVal (SYMBOL, NONE, exp))
        | VAL SYMBOL COLON typ EQ exp       (DVal (SYMBOL, SOME typ, exp))
+       | CONTEXT CSYMBOL                   (DContext CSYMBOL)
 
 docOpt :                                   (NONE)
        | DOC                               (SOME DOC)