[commit: ghc] wip/T8584: Update shift/reduce conflict number in parser (3b81309)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T8584
Link       : http://ghc.haskell.org/trac/ghc/changeset/3b81309c057fc216afa053d195aaa85ee3a1ba9e/ghc

>---------------------------------------------------------------

commit 3b81309c057fc216afa053d195aaa85ee3a1ba9e
Author: Dr. ERDI Gergo <gergo at erdi.hu>
Date:   Thu Nov 20 18:21:30 2014 +0800

    Update shift/reduce conflict number in parser


>---------------------------------------------------------------

3b81309c057fc216afa053d195aaa85ee3a1ba9e
 compiler/parser/Parser.y | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index b6db3a8..6f6422f 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