summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. ERDI Gergo <gergo@erdi.hu>2014-07-02 19:18:43 +0800
committerDr. ERDI Gergo <gergo@erdi.hu>2014-11-08 16:50:58 +0800
commitf08b36aed4903b558d8e0f583713f3103ae2912e (patch)
tree1b22b85fae87241f443a37bd7e7f3c78ecd17826
parent18e8882c2b57ce208dc4206a155a6683bf04cb92 (diff)
downloadhaskell-f08b36aed4903b558d8e0f583713f3103ae2912e.tar.gz
Update baseline shift/reduce conflict number
-rw-r--r--compiler/parser/Parser.y6
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 2e1b777bb3..1123375300 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -86,6 +86,12 @@ import TysWiredIn ( unitTyCon, unitDataCon, tupleTyCon, tupleCon, nilDataC
{-
-----------------------------------------------------------------------------
+25 June 2014
+
+Conflicts: 47 shift/reduce
+ 1 reduce/reduce
+
+-----------------------------------------------------------------------------
12 October 2012
Conflicts: 43 shift/reduce