Mercurial > urweb

comparison src/urweb.grm @ 1071:26197c957ad6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better record summary error messages; more tweaking SQL usability
author Adam Chlipala <adamc@hcoop.net>
date Sun, 13 Dec 2009 11:28:47 -0500
parents e933297c4e24
children b2311dfb3158
comparison
equal deleted inserted replaced
1070:e933297c4e24 1071:26197c957ad6
197 | DATATYPE | OF 197 | DATATYPE | OF
198 | TYPE | NAME 198 | TYPE | NAME
199 | ARROW | LARROW | DARROW | STAR | SEMI | KARROW | DKARROW | BANG 199 | ARROW | LARROW | DARROW | STAR | SEMI | KARROW | DKARROW | BANG
200 | FN | PLUSPLUS | MINUSMINUS | MINUSMINUSMINUS | DOLLAR | TWIDDLE | CARET 200 | FN | PLUSPLUS | MINUSMINUS | MINUSMINUSMINUS | DOLLAR | TWIDDLE | CARET
201 | LET | IN 201 | LET | IN
202 | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | SQL 202 | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | SQL | SELECT1
203 | INCLUDE | OPEN | CONSTRAINT | CONSTRAINTS | EXPORT | TABLE | SEQUENCE | VIEW 203 | INCLUDE | OPEN | CONSTRAINT | CONSTRAINTS | EXPORT | TABLE | SEQUENCE | VIEW
204 | COOKIE | STYLE 204 | COOKIE | STYLE
205 | CASE | IF | THEN | ELSE | ANDALSO | ORELSE 205 | CASE | IF | THEN | ELSE | ANDALSO | ORELSE
206 206
207 | XML_BEGIN of string | XML_END | XML_BEGIN_END of string 207 | XML_BEGIN of string | XML_END | XML_BEGIN_END of string
1168 1168
1169 | LPAREN query RPAREN (query) 1169 | LPAREN query RPAREN (query)
1170 | LPAREN CWHERE sqlexp RPAREN (sqlexp) 1170 | LPAREN CWHERE sqlexp RPAREN (sqlexp)
1171 | LPAREN SQL sqlexp RPAREN (sqlexp) 1171 | LPAREN SQL sqlexp RPAREN (sqlexp)
1172 | LPAREN FROM tables RPAREN (#2 tables) 1172 | LPAREN FROM tables RPAREN (#2 tables)
1173 | LPAREN SELECT1 query1 RPAREN (query1)
1173 1174
1174 | LPAREN INSERT INTO texp LPAREN fields RPAREN VALUES LPAREN sqlexps RPAREN RPAREN 1175 | LPAREN INSERT INTO texp LPAREN fields RPAREN VALUES LPAREN sqlexps RPAREN RPAREN
1175 (let 1176 (let
1176 val loc = s (LPAREN1left, RPAREN3right) 1177 val loc = s (LPAREN1left, RPAREN3right)
1177 1178
1538 (#1 fitem @ #1 tables, 1539 (#1 fitem @ #1 tables,
1539 (EApp (e, #2 tables), loc)) 1540 (EApp (e, #2 tables), loc))
1540 end) 1541 end)
1541 1542
1542 fitem : table' ([#1 table'], #2 table') 1543 fitem : table' ([#1 table'], #2 table')
1544 | LBRACE LBRACE eexp RBRACE RBRACE ([], eexp)
1543 | fitem JOIN fitem ON sqlexp (let 1545 | fitem JOIN fitem ON sqlexp (let
1544 val loc = s (fitem1left, sqlexpright) 1546 val loc = s (fitem1left, sqlexpright)
1545 1547
1546 val e = (EVar (["Basis"], "sql_inner_join", Infer), loc) 1548 val e = (EVar (["Basis"], "sql_inner_join", Infer), loc)
1547 val e = (EApp (e, #2 fitem1), loc) 1549 val e = (EApp (e, #2 fitem1), loc)