summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. ERDI Gergo <gergo@erdi.hu>2014-11-20 18:21:30 +0800
committerDr. ERDI Gergo <gergo@erdi.hu>2014-11-20 18:21:30 +0800
commit3b81309c057fc216afa053d195aaa85ee3a1ba9e (patch)
tree2c119031f55c5505ea0b21d2a80c167413821962
parent8cbd25a49051171da7c73db57ebd87bb0296c2f7 (diff)
downloadhaskell-3b81309c057fc216afa053d195aaa85ee3a1ba9e.tar.gz
Update shift/reduce conflict number in parser
-rw-r--r--compiler/parser/Parser.y12
1 files changed, 12 insertions, 0 deletions
diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index b6db3a882b..6f6422fdbe 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -86,6 +86,18 @@ import TysWiredIn ( unitTyCon, unitDataCon, tupleTyCon, tupleCon, nilDataC
{-
-----------------------------------------------------------------------------
+20 Nov 2014
+
+Conflicts: 60 shift/reduce
+ 12 reduce/reduce
+
+-----------------------------------------------------------------------------
+25 June 2014
+
+Conflicts: 47 shift/reduce
+ 1 reduce/reduce
+
+-----------------------------------------------------------------------------
12 October 2012
Conflicts: 43 shift/reduce