comparison src/lacweb.grm @ 84:e86370850c30

Disjointness assumptions
author Adam Chlipala <adamc@hcoop.net>
date Tue, 01 Jul 2008 12:10:46 -0400
parents 0a1baddd8ab2
children 1f85890c9846
comparison
equal deleted inserted replaced
83:0a1baddd8ab2 84:e86370850c30
41 | LPAREN | RPAREN | LBRACK | RBRACK | LBRACE | RBRACE 41 | LPAREN | RPAREN | LBRACK | RBRACK | LBRACE | RBRACE
42 | EQ | COMMA | COLON | DCOLON | TCOLON | DOT | HASH | UNDER | UNDERUNDER 42 | EQ | COMMA | COLON | DCOLON | TCOLON | DOT | HASH | UNDER | UNDERUNDER
43 | CON | LTYPE | VAL | FOLD | UNIT | KUNIT 43 | CON | LTYPE | VAL | FOLD | UNIT | KUNIT
44 | TYPE | NAME 44 | TYPE | NAME
45 | ARROW | LARROW | DARROW 45 | ARROW | LARROW | DARROW
46 | FN | PLUSPLUS | DOLLAR 46 | FN | PLUSPLUS | DOLLAR | TWIDDLE
47 | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | INCLUDE | OPEN 47 | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | INCLUDE | OPEN
48 48
49 %nonterm 49 %nonterm
50 file of decl list 50 file of decl list
51 | decls of decl list 51 | decls of decl list
91 %nonassoc COLON 91 %nonassoc COLON
92 %nonassoc DCOLON TCOLON 92 %nonassoc DCOLON TCOLON
93 %right COMMA 93 %right COMMA
94 %right ARROW LARROW 94 %right ARROW LARROW
95 %right PLUSPLUS 95 %right PLUSPLUS
96 %nonassoc TWIDDLE
96 %nonassoc DOLLAR 97 %nonassoc DOLLAR
97 %left DOT 98 %left DOT
98 99
99 %% 100 %%
100 101
192 193
193 | cexp PLUSPLUS cexp (CConcat (cexp1, cexp2), s (cexp1left, cexp1right)) 194 | cexp PLUSPLUS cexp (CConcat (cexp1, cexp2), s (cexp1left, cexp1right))
194 195
195 | FN SYMBOL DARROW cexp (CAbs (SYMBOL, NONE, cexp), s (FNleft, cexpright)) 196 | FN SYMBOL DARROW cexp (CAbs (SYMBOL, NONE, cexp), s (FNleft, cexpright))
196 | FN SYMBOL DCOLON kind DARROW cexp (CAbs (SYMBOL, SOME kind, cexp), s (FNleft, cexpright)) 197 | FN SYMBOL DCOLON kind DARROW cexp (CAbs (SYMBOL, SOME kind, cexp), s (FNleft, cexpright))
198 | cterm TWIDDLE cterm DARROW cexp(CDisjoint (cterm1, cterm2, cexp), s (cterm1left, cexpright))
197 199
198 | LPAREN cexp RPAREN DCOLON kind (CAnnot (cexp, kind), s (LPARENleft, kindright)) 200 | LPAREN cexp RPAREN DCOLON kind (CAnnot (cexp, kind), s (LPARENleft, kindright))
199 201
200 | UNDER DCOLON kind (CWild kind, s (UNDERleft, UNDERright)) 202 | UNDER DCOLON kind (CWild kind, s (UNDERleft, UNDERright))
201 203