diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2009-12-13 11:28:47 -0500 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2009-12-13 11:28:47 -0500 |
| commit | 46d562fc3d06a5ef8b17e90c7a4dfd0547757294 (patch) | |
| tree | 9f62f93b72fdb9bde85a08f36a3250c160353c54 /src/urweb.grm | |
| parent | e376aee8f22ca46b5536803fc3d80e31f79da6ff (diff) | |
Better record summary error messages; more tweaking SQL usability
Diffstat (limited to 'src/urweb.grm')
| -rw-r--r-- | src/urweb.grm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/urweb.grm b/src/urweb.grm index da40945a..87a8547d 100644 --- a/src/urweb.grm +++ b/src/urweb.grm @@ -199,7 +199,7 @@ fun patType loc (p : pat) = | ARROW | LARROW | DARROW | STAR | SEMI | KARROW | DKARROW | BANG | FN | PLUSPLUS | MINUSMINUS | MINUSMINUSMINUS | DOLLAR | TWIDDLE | CARET | LET | IN - | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | SQL + | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | SQL | SELECT1 | INCLUDE | OPEN | CONSTRAINT | CONSTRAINTS | EXPORT | TABLE | SEQUENCE | VIEW | COOKIE | STYLE | CASE | IF | THEN | ELSE | ANDALSO | ORELSE @@ -1170,6 +1170,7 @@ eterm : LPAREN eexp RPAREN (#1 eexp, s (LPARENleft, RPARENright)) | LPAREN CWHERE sqlexp RPAREN (sqlexp) | LPAREN SQL sqlexp RPAREN (sqlexp) | LPAREN FROM tables RPAREN (#2 tables) + | LPAREN SELECT1 query1 RPAREN (query1) | LPAREN INSERT INTO texp LPAREN fields RPAREN VALUES LPAREN sqlexps RPAREN RPAREN (let @@ -1540,6 +1541,7 @@ tables : fitem (fitem) end) fitem : table' ([#1 table'], #2 table') + | LBRACE LBRACE eexp RBRACE RBRACE ([], eexp) | fitem JOIN fitem ON sqlexp (let val loc = s (fitem1left, sqlexpright) |