comparison src/urweb.grm @ 471:20fab0e96217

Tree demo working (and other assorted regressions fixed)
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 Nov 2008 19:43:48 -0500
parents 7cb418e9714f
children 04b91c33ef54
comparison
equal deleted inserted replaced
470:7cb418e9714f 471:20fab0e96217
1234 in 1234 in
1235 (ECApp (e, (CName CSYMBOL, loc)), loc) 1235 (ECApp (e, (CName CSYMBOL, loc)), loc)
1236 end 1236 end
1237 end) 1237 end)
1238 1238
1239 | LBRACE LBRACK eexp RBRACK RBRACE (eexp) 1239 | LBRACE eexp RBRACE (eexp)
1240 1240
1241 | sqlexp EQ sqlexp (sql_compare ("eq", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right))) 1241 | sqlexp EQ sqlexp (sql_compare ("eq", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right)))
1242 | sqlexp NE sqlexp (sql_compare ("ne", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right))) 1242 | sqlexp NE sqlexp (sql_compare ("ne", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right)))
1243 | sqlexp LT sqlexp (sql_compare ("lt", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right))) 1243 | sqlexp LT sqlexp (sql_compare ("lt", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right)))
1244 | sqlexp LE sqlexp (sql_compare ("le", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right))) 1244 | sqlexp LE sqlexp (sql_compare ("le", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right)))
1254 in 1254 in
1255 (EApp ((EVar (["Basis"], "sql_is_null", Infer), loc), 1255 (EApp ((EVar (["Basis"], "sql_is_null", Infer), loc),
1256 sqlexp), loc) 1256 sqlexp), loc)
1257 end) 1257 end)
1258 1258
1259 | LBRACE eexp RBRACE (sql_inject (#1 eexp, 1259 | LBRACE LBRACK eexp RBRACK RBRACE (sql_inject (#1 eexp,
1260 s (LBRACEleft, RBRACEright))) 1260 s (LBRACEleft, RBRACEright)))
1261 | LPAREN sqlexp RPAREN (sqlexp) 1261 | LPAREN sqlexp RPAREN (sqlexp)
1262 1262
1263 | NULL (sql_inject ((EVar (["Basis"], "None", Infer), 1263 | NULL (sql_inject ((EVar (["Basis"], "None", Infer),
1264 s (NULLleft, NULLright)))) 1264 s (NULLleft, NULLright))))
1265 1265