projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
79eedc7
)
[project @ 2005-03-09 17:51:03 by simonpj]
author
simonpj
<unknown>
Wed, 9 Mar 2005 17:51:03 +0000
(17:51 +0000)
committer
simonpj
<unknown>
Wed, 9 Mar 2005 17:51:03 +0000
(17:51 +0000)
Comments
ghc/compiler/parser/Parser.y.pp
patch
|
blob
|
history
diff --git
a/ghc/compiler/parser/Parser.y.pp
b/ghc/compiler/parser/Parser.y.pp
index
4fa738a
..
1096c5c
100644
(file)
--- a/
ghc/compiler/parser/Parser.y.pp
+++ b/
ghc/compiler/parser/Parser.y.pp
@@
-46,7
+46,7
@@
import GLAEXTS
{-
-----------------------------------------------------------------------------
-Conflicts: 34 shift/reduce (1.15)
+Conflicts: 36 shift/reduce (1.25)
10 for abiguity in 'if x then y else z + 1' [State 178]
(shift parses as 'if x then y else (z + 1)', as per longest-parse rule)