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-07-02 19:18:43 +0800
commitca085703370b4559b5d5d8eeb5475d113ca55fa0 (patch)
tree1cbfa200799f306dfcd54fab9798f13e76ddfbd1
parent7ef8dd532674cc046c4df80c4768756be736172f (diff)
downloadhaskell-ca085703370b4559b5d5d8eeb5475d113ca55fa0.tar.gz
Update baseline shift/reduce conflict number
-rw-r--r--compiler/parser/Parser.y.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 27d6c3839f..68f7e5bd58 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -55,6 +55,12 @@ import Control.Monad ( mplus )
{-
-----------------------------------------------------------------------------
+25 June 2014
+
+Conflicts: 47 shift/reduce
+ 1 reduce/reduce
+
+-----------------------------------------------------------------------------
12 October 2012
Conflicts: 43 shift/reduce