diff options
| author | Andreas Källberg <anka.213@gmail.com> | 2020-09-05 21:11:12 +0200 |
|---|---|---|
| committer | Andreas Källberg <anka.213@gmail.com> | 2020-09-05 21:11:12 +0200 |
| commit | 56f94da772566a1960d889c14c420ee832038365 (patch) | |
| tree | 86737b1039dfa03b3fb289cdb309b80a5f35f759 /src/compiler/GF/Infra | |
| parent | 57ce76dbc121ee554675b9ee6136441ec0bb5710 (diff) | |
| parent | bca0691cb028fe33ae1b77e71752d4e937490ff1 (diff) | |
Merge remote-tracking branch 'origin/master' into fix-newer-cabal
Diffstat (limited to 'src/compiler/GF/Infra')
| -rw-r--r-- | src/compiler/GF/Infra/Option.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs index 11a4dd8ec..6b7ff0cad 100644 --- a/src/compiler/GF/Infra/Option.hs +++ b/src/compiler/GF/Infra/Option.hs @@ -132,7 +132,7 @@ data CFGTransform = CFGNoLR deriving (Show,Eq,Ord) data HaskellOption = HaskellNoPrefix | HaskellGADT | HaskellLexical - | HaskellConcrete | HaskellVariants + | HaskellConcrete | HaskellVariants | HaskellData deriving (Show,Eq,Ord) data Warning = WarnMissingLincat @@ -531,7 +531,8 @@ haskellOptionNames = ("gadt", HaskellGADT), ("lexical", HaskellLexical), ("concrete", HaskellConcrete), - ("variants", HaskellVariants)] + ("variants", HaskellVariants), + ("data", HaskellData)] -- | This is for bacward compatibility. Since GHC 6.12 we -- started using the native Unicode support in GHC but it |