comparison src/lacweb.lex @ 236:f5732dc1316c

More aggregate functions
author Adam Chlipala <adamc@hcoop.net>
date Thu, 28 Aug 2008 12:56:08 -0400
parents 0608a0cfd32a
children cc193f680193
comparison
equal deleted inserted replaced
235:0608a0cfd32a 236:f5732dc1316c
322 <INITIAL> "AND" => (Tokens.CAND (pos yypos, pos yypos + size yytext)); 322 <INITIAL> "AND" => (Tokens.CAND (pos yypos, pos yypos + size yytext));
323 <INITIAL> "OR" => (Tokens.OR (pos yypos, pos yypos + size yytext)); 323 <INITIAL> "OR" => (Tokens.OR (pos yypos, pos yypos + size yytext));
324 <INITIAL> "NOT" => (Tokens.NOT (pos yypos, pos yypos + size yytext)); 324 <INITIAL> "NOT" => (Tokens.NOT (pos yypos, pos yypos + size yytext));
325 325
326 <INITIAL> "COUNT" => (Tokens.COUNT (pos yypos, pos yypos + size yytext)); 326 <INITIAL> "COUNT" => (Tokens.COUNT (pos yypos, pos yypos + size yytext));
327 <INITIAL> "AVG" => (Tokens.AVG (pos yypos, pos yypos + size yytext));
328 <INITIAL> "SUM" => (Tokens.SUM (pos yypos, pos yypos + size yytext));
329 <INITIAL> "MIN" => (Tokens.MIN (pos yypos, pos yypos + size yytext));
330 <INITIAL> "MAX" => (Tokens.MAX (pos yypos, pos yypos + size yytext));
327 331
328 <INITIAL> {id} => (Tokens.SYMBOL (yytext, pos yypos, pos yypos + size yytext)); 332 <INITIAL> {id} => (Tokens.SYMBOL (yytext, pos yypos, pos yypos + size yytext));
329 <INITIAL> {cid} => (Tokens.CSYMBOL (yytext, pos yypos, pos yypos + size yytext)); 333 <INITIAL> {cid} => (Tokens.CSYMBOL (yytext, pos yypos, pos yypos + size yytext));
330 334
331 <INITIAL> {intconst} => (case Int64.fromString yytext of 335 <INITIAL> {intconst} => (case Int64.fromString yytext of