comparison src/urweb.grm @ 1254:935a981f4380

Merge
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 May 2010 13:57:01 -0400
parents c316ca3c9ec6
children e8d68fd8ed4b
comparison
equal deleted inserted replaced
1198:b52929351402 1254:935a981f4380
200 | ARROW | LARROW | DARROW | STAR | SEMI | KARROW | DKARROW | BANG 200 | ARROW | LARROW | DARROW | STAR | SEMI | KARROW | DKARROW | BANG
201 | FN | PLUSPLUS | MINUSMINUS | MINUSMINUSMINUS | DOLLAR | TWIDDLE | CARET 201 | FN | PLUSPLUS | MINUSMINUS | MINUSMINUSMINUS | DOLLAR | TWIDDLE | CARET
202 | LET | IN 202 | LET | IN
203 | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | SQL | SELECT1 203 | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | SQL | SELECT1
204 | INCLUDE | OPEN | CONSTRAINT | CONSTRAINTS | EXPORT | TABLE | SEQUENCE | VIEW 204 | INCLUDE | OPEN | CONSTRAINT | CONSTRAINTS | EXPORT | TABLE | SEQUENCE | VIEW
205 | COOKIE | STYLE | TASK 205 | COOKIE | STYLE | TASK | POLICY
206 | CASE | IF | THEN | ELSE | ANDALSO | ORELSE 206 | CASE | IF | THEN | ELSE | ANDALSO | ORELSE
207 207
208 | XML_BEGIN of string | XML_END | XML_BEGIN_END of string 208 | XML_BEGIN of string | XML_END | XML_BEGIN_END of string
209 | NOTAGS of string 209 | NOTAGS of string
210 | BEGIN_TAG of string | END_TAG of string 210 | BEGIN_TAG of string | END_TAG of string
479 [(DClass (SYMBOL1, kind, c), s (CLASSleft, cexpright))] 479 [(DClass (SYMBOL1, kind, c), s (CLASSleft, cexpright))]
480 end) 480 end)
481 | COOKIE SYMBOL COLON cexp ([(DCookie (SYMBOL, cexp), s (COOKIEleft, cexpright))]) 481 | COOKIE SYMBOL COLON cexp ([(DCookie (SYMBOL, cexp), s (COOKIEleft, cexpright))])
482 | STYLE SYMBOL ([(DStyle SYMBOL, s (STYLEleft, SYMBOLright))]) 482 | STYLE SYMBOL ([(DStyle SYMBOL, s (STYLEleft, SYMBOLright))])
483 | TASK eapps EQ eexp ([(DTask (eapps, eexp), s (TASKleft, eexpright))]) 483 | TASK eapps EQ eexp ([(DTask (eapps, eexp), s (TASKleft, eexpright))])
484 | POLICY eexp ([(DPolicy eexp, s (POLICYleft, eexpright))])
484 485
485 dtype : SYMBOL dargs EQ barOpt dcons (SYMBOL, dargs, dcons) 486 dtype : SYMBOL dargs EQ barOpt dcons (SYMBOL, dargs, dcons)
486 487
487 dtypes : dtype ([dtype]) 488 dtypes : dtype ([dtype])
488 | dtype AND dtypes (dtype :: dtypes) 489 | dtype AND dtypes (dtype :: dtypes)