comparison src/urweb.grm @ 467:3f1b9231a37b

Inserted a NULL value
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 Nov 2008 15:37:38 -0500
parents d34834af4512
children 7cb418e9714f
comparison
equal deleted inserted replaced
466:1626dcba13ee 467:3f1b9231a37b
212 | UNION | INTERSECT | EXCEPT 212 | UNION | INTERSECT | EXCEPT
213 | LIMIT | OFFSET | ALL 213 | LIMIT | OFFSET | ALL
214 | TRUE | FALSE | CAND | OR | NOT 214 | TRUE | FALSE | CAND | OR | NOT
215 | COUNT | AVG | SUM | MIN | MAX 215 | COUNT | AVG | SUM | MIN | MAX
216 | ASC | DESC 216 | ASC | DESC
217 | INSERT | INTO | VALUES | UPDATE | SET | DELETE 217 | INSERT | INTO | VALUES | UPDATE | SET | DELETE | NULL
218 | CURRENT_TIMESTAMP 218 | CURRENT_TIMESTAMP
219 | NE | LT | LE | GT | GE 219 | NE | LT | LE | GT | GE
220 220
221 %nonterm 221 %nonterm
222 file of decl list 222 file of decl list
1249 1249
1250 | LBRACE eexp RBRACE (sql_inject (#1 eexp, 1250 | LBRACE eexp RBRACE (sql_inject (#1 eexp,
1251 s (LBRACEleft, RBRACEright))) 1251 s (LBRACEleft, RBRACEright)))
1252 | LPAREN sqlexp RPAREN (sqlexp) 1252 | LPAREN sqlexp RPAREN (sqlexp)
1253 1253
1254 | NULL (sql_inject ((EVar (["Basis"], "None", Infer),
1255 s (NULLleft, NULLright))))
1256
1254 | COUNT LPAREN STAR RPAREN (let 1257 | COUNT LPAREN STAR RPAREN (let
1255 val loc = s (COUNTleft, RPARENright) 1258 val loc = s (COUNTleft, RPARENright)
1256 in 1259 in
1257 (EApp ((EVar (["Basis"], "sql_count", Infer), loc), 1260 (EApp ((EVar (["Basis"], "sql_count", Infer), loc),
1258 (ERecord [], loc)), loc) 1261 (ERecord [], loc)), loc)