summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-06-02 15:43:18 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-06-02 15:43:18 -0400
commit1fd04be40e1f4885753a269b898d1bd11d24672d (patch)
tree21f39be7fbc2225c46cc3c4c36d1aae274d1382f
parente103ad374e8cb7ea52e27c517fca761b9810028a (diff)
Tweak -- precedence; use right env for final exhaustiveness errors
-rw-r--r--src/elaborate.sml2
-rw-r--r--src/urweb.grm3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/elaborate.sml b/src/elaborate.sml
index 87c1eb27..64b690ef 100644
--- a/src/elaborate.sml
+++ b/src/elaborate.sml
@@ -3975,7 +3975,7 @@ fun elabFile basis topStr topSgn env file =
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)))
diff --git a/src/urweb.grm b/src/urweb.grm
index 8cdf8063..1bb5da58 100644
--- a/src/urweb.grm
+++ b/src/urweb.grm
@@ -375,7 +375,8 @@ fun patType loc (p : pat) =
%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