changeset 837:ccf22c2c77b2

Tweak -- precedence; use right env for final exhaustiveness errors
author Adam Chlipala <adamc@hcoop.net>
date Tue, 02 Jun 2009 15:43:18 -0400
parents 4083d0dff94c
children 5154a047c6bc
files src/elaborate.sml src/urweb.grm
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/elaborate.sml	Tue Jun 02 13:55:10 2009 -0400
+++ b/src/elaborate.sml	Tue Jun 02 15:43:18 2009 -0400
@@ -3975,7 +3975,7 @@
         if ErrorMsg.anyErrors () then
             ()
         else
-            app (fn all as (_, _, _, loc) =>
+            app (fn all as (env, _, _, loc) =>
                     case exhaustive all of
                         NONE => ()
                       | SOME p => expError env (Inexhaustive (loc, p)))
--- a/src/urweb.grm	Tue Jun 02 13:55:10 2009 -0400
+++ b/src/urweb.grm	Tue Jun 02 15:43:18 2009 -0400
@@ -375,7 +375,8 @@
 %right CAND
 %nonassoc EQ NE LT LE GT GE IS
 %right ARROW
-%right CARET PLUSPLUS MINUSMINUS MINUSMINUSMINUS
+%right CARET PLUSPLUS
+%left MINUSMINUS MINUSMINUSMINUS
 %left PLUS MINUS
 %left STAR DIVIDE MOD
 %left NOT