Mercurial > urweb

diff src/urweb.grm @ 471:20fab0e96217

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/urweb.grm	Thu Nov 06 18:49:38 2008 -0500
+++ b/src/urweb.grm	Thu Nov 06 19:43:48 2008 -0500
@@ -1236,7 +1236,7 @@
                                                   end
                                           end)
 
-       | LBRACE LBRACK eexp RBRACK RBRACE       (eexp)
+       | LBRACE eexp RBRACE             (eexp)
 
        | sqlexp EQ sqlexp               (sql_compare ("eq", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right)))
        | sqlexp NE sqlexp               (sql_compare ("ne", sqlexp1, sqlexp2, s (sqlexp1left, sqlexp2right)))
@@ -1256,8 +1256,8 @@
                                                     sqlexp), loc)
                                          end)
 
-       | LBRACE eexp RBRACE             (sql_inject (#1 eexp,
-                                                     s (LBRACEleft, RBRACEright)))
+       | LBRACE LBRACK eexp RBRACK RBRACE  (sql_inject (#1 eexp,
+                                                        s (LBRACEleft, RBRACEright)))
        | LPAREN sqlexp RPAREN           (sqlexp)
 
        | NULL                           (sql_inject ((EVar (["Basis"], "None", Infer),