diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-06-08 20:39:35 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-06-08 20:39:35 +0000 |
| commit | 1a660e030bd3aaaa34adfea77d72856cdb48479e (patch) | |
| tree | 28d1d62a98c79f305e1f02ab4f8e523cd8108a3c | |
| parent | 4e8e0ed5c8d927e732c449bdee8117255dc2b1bc (diff) | |
| download | haskell-1a660e030bd3aaaa34adfea77d72856cdb48479e.tar.gz | |
Put "%expect 0" directives in the .y files
With the exception of GHC's main Parser.y(.pp), which has 2
reduce/reduce conflicts
| -rw-r--r-- | compiler/cmm/CmmParse.y | 2 | ||||
| -rw-r--r-- | compiler/main/ParsePkgConf.y | 2 | ||||
| -rw-r--r-- | compiler/parser/HaddockParse.y | 2 | ||||
| -rw-r--r-- | compiler/parser/ParserCore.y | 1 | ||||
| -rw-r--r-- | utils/ext-core/Parser.y | 1 | ||||
| -rw-r--r-- | utils/genprimopcode/Parser.y | 1 | ||||
| -rw-r--r-- | utils/hpc/HpcParser.y | 1 |
7 files changed, 10 insertions, 0 deletions
diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index 3469efedbc..2c7ffe2845 100644 --- 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 1e24ab4017..6028af89ce 100644 --- 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 8a46bea82a..c0f64d45ad 100644 --- 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 be16c36f5e..bf959468fe 100644 --- 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 add3ef0b46..67db7bc523 100644 --- 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 7ebe2a8ae3..9bf20c2dd7 100644 --- 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 cf1d156c6e..b99e3246cf 100644 --- a/utils/hpc/HpcParser.y +++ b/utils/hpc/HpcParser.y @@ -12,6 +12,7 @@ import HpcLexer } %name parser +%expect 0 %tokentype { Token } %token |