Put "%expect 0" directives in the .y files

With the exception of GHC's main Parser.y(.pp), which has 2
reduce/reduce conflicts

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 3469efe..2c7ffe2 100644 (file)
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -63,6 +63,8 @@ import System.Exit
 #include "HsVersions.h"
 }
 
+%expect 0
+
 %token
        ':'     { L _ (CmmT_SpecChar ':') }
        ';'     { L _ (CmmT_SpecChar ';') }

diff --git a/compiler/main/ParsePkgConf.y b/compiler/main/ParsePkgConf.y
index 1e24ab4..6028af8 100644 (file)
--- a/compiler/main/ParsePkgConf.y
+++ b/compiler/main/ParsePkgConf.y
@@ -24,6 +24,8 @@ import Panic
 
 }
 
+%expect 0
+
 %token
  '{'           { L _ ITocurly }
  '}'           { L _ ITccurly }

diff --git a/compiler/parser/HaddockParse.y b/compiler/parser/HaddockParse.y
index 8a46bea..c0f64d4 100644 (file)
--- a/compiler/parser/HaddockParse.y
+++ b/compiler/parser/HaddockParse.y
@@ -17,6 +17,8 @@ import HsSyn
 import RdrName
 }
 
+%expect 0
+
 %tokentype { Token }
 
 %token '/'     { TokSpecial '/' }

diff --git a/compiler/parser/ParserCore.y b/compiler/parser/ParserCore.y
index be16c36..bf95946 100644 (file)
--- a/compiler/parser/ParserCore.y
+++ b/compiler/parser/ParserCore.y
@@ -37,6 +37,7 @@ import Unique
 }
 
 %name parseCore
+%expect 0
 %tokentype { Token }
 
 %token

diff --git a/utils/ext-core/Parser.y b/utils/ext-core/Parser.y
index add3ef0..67db7bc 100644 (file)
--- a/utils/ext-core/Parser.y
+++ b/utils/ext-core/Parser.y
@@ -8,6 +8,7 @@ import Lex
 }
 
 %name parse
+%expect 0
 %tokentype { Token }
 
 %token

diff --git a/utils/genprimopcode/Parser.y b/utils/genprimopcode/Parser.y
index 7ebe2a8..9bf20c2 100644 (file)
--- a/utils/genprimopcode/Parser.y
+++ b/utils/genprimopcode/Parser.y
@@ -16,6 +16,7 @@ import Syntax
 }
 
 %name      parsex
+%expect    0
 %tokentype { Token }
 %monad     { ParserM }
 %lexer     { lex_tok } { TEOF }

diff --git a/utils/hpc/HpcParser.y b/utils/hpc/HpcParser.y
index cf1d156..b99e324 100644 (file)
--- a/utils/hpc/HpcParser.y
+++ b/utils/hpc/HpcParser.y
@@ -12,6 +12,7 @@ import HpcLexer
 }
 
 %name parser
+%expect 0
 %tokentype { Token }
 
 %token