comparison src/urweb.grm @ 1797:bb942416bf1c

Remove 'class' declaration; now use 'con' instead
author Adam Chlipala <adam@chlipala.net>
date Sun, 29 Jul 2012 12:27:13 -0400
parents 818d4097e2ed
children be0c4e2e488a
comparison
equal deleted inserted replaced
1796:0de0daab5fbb 1797:bb942416bf1c
600 | SEQUENCE SYMBOL ([(DSequence SYMBOL, s (SEQUENCEleft, SYMBOLright))]) 600 | SEQUENCE SYMBOL ([(DSequence SYMBOL, s (SEQUENCEleft, SYMBOLright))])
601 | VIEW SYMBOL EQ query ([(DView (SYMBOL, query), 601 | VIEW SYMBOL EQ query ([(DView (SYMBOL, query),
602 s (VIEWleft, queryright))]) 602 s (VIEWleft, queryright))])
603 | VIEW SYMBOL EQ LBRACE eexp RBRACE ([(DView (SYMBOL, eexp), 603 | VIEW SYMBOL EQ LBRACE eexp RBRACE ([(DView (SYMBOL, eexp),
604 s (VIEWleft, RBRACEright))]) 604 s (VIEWleft, RBRACEright))])
605 | CLASS SYMBOL EQ cexp (let
606 val loc = s (CLASSleft, cexpright)
607 in
608 [(DClass (SYMBOL, (KWild, loc), cexp), loc)]
609 end)
610 | CLASS SYMBOL DCOLON kind EQ cexp ([(DClass (SYMBOL, kind, cexp), s (CLASSleft, cexpright))])
611 | CLASS SYMBOL SYMBOL EQ cexp (let
612 val loc = s (CLASSleft, cexpright)
613 val k = (KWild, loc)
614 val c = (CAbs (SYMBOL2, SOME k, cexp), loc)
615 in
616 [(DClass (SYMBOL1, k, c), s (CLASSleft, cexpright))]
617 end)
618 | CLASS SYMBOL LPAREN SYMBOL DCOLON kind RPAREN EQ cexp (let
619 val loc = s (CLASSleft, cexpright)
620 val c = (CAbs (SYMBOL2, SOME kind, cexp), loc)
621 in
622 [(DClass (SYMBOL1, kind, c), s (CLASSleft, cexpright))]
623 end)
624 | COOKIE SYMBOL COLON cexp ([(DCookie (SYMBOL, cexp), s (COOKIEleft, cexpright))]) 605 | COOKIE SYMBOL COLON cexp ([(DCookie (SYMBOL, cexp), s (COOKIEleft, cexpright))])
625 | STYLE SYMBOL ([(DStyle SYMBOL, s (STYLEleft, SYMBOLright))]) 606 | STYLE SYMBOL ([(DStyle SYMBOL, s (STYLEleft, SYMBOLright))])
626 | TASK eapps EQ eexp ([(DTask (eapps, eexp), s (TASKleft, eexpright))]) 607 | TASK eapps EQ eexp ([(DTask (eapps, eexp), s (TASKleft, eexpright))])
627 | POLICY eexp ([(DPolicy eexp, s (POLICYleft, eexpright))]) 608 | POLICY eexp ([(DPolicy eexp, s (POLICYleft, eexpright))])
628 609