From 684dc290563769d456b6f1c772673d64307ab072 Mon Sep 17 00:00:00 2001 From: Vladislav Zavialov Date: Thu, 9 May 2019 11:01:17 +0300 Subject: Restore the --coerce option in 'happy' configuration happy-1.19.10 has been released with a fix for --coerce in the presence of higher rank types. This should result in about 10% performance improvement in the parser. --- hadrian/hadrian.cabal | 2 +- hadrian/src/Settings/Builders/Happy.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'hadrian') diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal index fdcba15b8d..e895334bae 100644 --- a/hadrian/hadrian.cabal +++ b/hadrian/hadrian.cabal @@ -132,7 +132,7 @@ executable hadrian , transformers >= 0.4 && < 0.6 , unordered-containers >= 0.2.1 && < 0.3 build-tools: alex >= 3.1 - , happy >= 1.19.4 + , happy >= 1.19.10 ghc-options: -Wall -Wincomplete-record-updates -Wredundant-constraints diff --git a/hadrian/src/Settings/Builders/Happy.hs b/hadrian/src/Settings/Builders/Happy.hs index edb520cdf3..5ffb2614cc 100644 --- a/hadrian/src/Settings/Builders/Happy.hs +++ b/hadrian/src/Settings/Builders/Happy.hs @@ -3,7 +3,7 @@ module Settings.Builders.Happy (happyBuilderArgs) where import Settings.Builders.Common happyBuilderArgs :: Args -happyBuilderArgs = builder Happy ? mconcat [ arg "-ag" -- TODO (int-index): restore the -c option when happy/pull/134 is merged. +happyBuilderArgs = builder Happy ? mconcat [ arg "-agc" , arg "--strict" , arg =<< getInput , arg "-o", arg =<< getOutput ] -- cgit v1.2.1