Mercurial > urweb

diff src/urweb.grm @ 445:dfc8c991abd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace 'with' with '++'
author Adam Chlipala <adamc@hcoop.net>
date Fri, 31 Oct 2008 09:30:22 -0400
parents c5335613f31e
children 86c063fedc4d
line wrap: on
line diff
--- a/src/urweb.grm	Thu Oct 30 17:07:34 2008 -0400
+++ b/src/urweb.grm	Fri Oct 31 09:30:22 2008 -0400
@@ -198,7 +198,7 @@
  | TYPE | NAME
  | ARROW | LARROW | DARROW | STAR | SEMI
  | FN | PLUSPLUS | MINUSMINUS | DOLLAR | TWIDDLE
- | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | WITH | SQL
+ | STRUCTURE | SIGNATURE | STRUCT | SIG | END | FUNCTOR | WHERE | EXTERN | SQL
  | INCLUDE | OPEN | CONSTRAINT | CONSTRAINTS | EXPORT | TABLE | SEQUENCE
  | CASE | IF | THEN | ELSE
 
@@ -344,7 +344,6 @@
 %right CAND
 %nonassoc EQ NE LT LE GT GE
 %right ARROW
-%left WITH
 %right PLUSPLUS MINUSMINUS
 %left PLUS MINUS
 %left STAR DIVIDE MOD
@@ -699,7 +698,7 @@
        | eexp GT eexp                   (native_op ("gt", eexp1, eexp2, s (eexp1left, eexp2right)))
        | eexp GE eexp                   (native_op ("ge", eexp1, eexp2, s (eexp1left, eexp2right)))
 
-       | eexp WITH cterm EQ eexp        (EWith (eexp1, cterm, eexp2), s (eexp1left, eexp2right))
+       | eexp PLUSPLUS eexp             (EConcat (eexp1, eexp2), s (eexp1left, eexp2right))
 
 bind   : SYMBOL LARROW eapps            (SYMBOL, NONE, eapps)
        | UNIT LARROW eapps              (let