Commit d2f11ea8 authored by benl's avatar benl
Browse files

Rename -XPArr to -XParallelArrays

parent 7cd02e3e
...@@ -304,7 +304,7 @@ data ExtensionFlag ...@@ -304,7 +304,7 @@ data ExtensionFlag
| Opt_ForeignFunctionInterface | Opt_ForeignFunctionInterface
| Opt_UnliftedFFITypes | Opt_UnliftedFFITypes
| Opt_GHCForeignImportPrim | Opt_GHCForeignImportPrim
| Opt_PArr -- Syntactic support for parallel arrays | Opt_ParallelArrays -- Syntactic support for parallel arrays
| Opt_Arrows -- Arrow-notation syntax | Opt_Arrows -- Arrow-notation syntax
| Opt_TemplateHaskell | Opt_TemplateHaskell
| Opt_QuasiQuotes | Opt_QuasiQuotes
...@@ -1519,8 +1519,10 @@ fLangFlags = [ ...@@ -1519,8 +1519,10 @@ fLangFlags = [
deprecatedForExtension "ImplicitParams" ), deprecatedForExtension "ImplicitParams" ),
( "scoped-type-variables", Opt_ScopedTypeVariables, ( "scoped-type-variables", Opt_ScopedTypeVariables,
deprecatedForExtension "ScopedTypeVariables" ), deprecatedForExtension "ScopedTypeVariables" ),
( "parr", Opt_PArr, ( "parr", Opt_ParallelArrays,
deprecatedForExtension "PArr" ), deprecatedForExtension "ParallelArrays" ),
( "PArr", Opt_ParallelArrays,
deprecatedForExtension "ParallelArrays" ),
( "allow-overlapping-instances", Opt_OverlappingInstances, ( "allow-overlapping-instances", Opt_OverlappingInstances,
deprecatedForExtension "OverlappingInstances" ), deprecatedForExtension "OverlappingInstances" ),
( "allow-undecidable-instances", Opt_UndecidableInstances, ( "allow-undecidable-instances", Opt_UndecidableInstances,
...@@ -1572,7 +1574,7 @@ xFlags = [ ...@@ -1572,7 +1574,7 @@ xFlags = [
deprecatedForExtension "DoRec"), deprecatedForExtension "DoRec"),
( "DoRec", Opt_DoRec, nop ), ( "DoRec", Opt_DoRec, nop ),
( "Arrows", Opt_Arrows, nop ), ( "Arrows", Opt_Arrows, nop ),
( "PArr", Opt_PArr, nop ), ( "ParallelArrays", Opt_ParallelArrays, nop ),
( "TemplateHaskell", Opt_TemplateHaskell, checkTemplateHaskellOk ), ( "TemplateHaskell", Opt_TemplateHaskell, checkTemplateHaskellOk ),
( "QuasiQuotes", Opt_QuasiQuotes, nop ), ( "QuasiQuotes", Opt_QuasiQuotes, nop ),
( "Generics", Opt_Generics, nop ), ( "Generics", Opt_Generics, nop ),
......
...@@ -510,8 +510,8 @@ data Token ...@@ -510,8 +510,8 @@ data Token
| ITvocurly | ITvocurly
| ITvccurly | ITvccurly
| ITobrack | ITobrack
| ITopabrack -- [:, for parallel arrays with -XParr | ITopabrack -- [:, for parallel arrays with -XParallelArrays
| ITcpabrack -- :], for parallel arrays with -XParr | ITcpabrack -- :], for parallel arrays with -XParallelArrays
| ITcbrack | ITcbrack
| IToparen | IToparen
| ITcparen | ITcparen
...@@ -1724,7 +1724,7 @@ setAlrExpectingOCurly :: Maybe ALRLayout -> P () ...@@ -1724,7 +1724,7 @@ setAlrExpectingOCurly :: Maybe ALRLayout -> P ()
setAlrExpectingOCurly b = P $ \s -> POk (s {alr_expecting_ocurly = b}) () setAlrExpectingOCurly b = P $ \s -> POk (s {alr_expecting_ocurly = b}) ()
-- for reasons of efficiency, flags indicating language extensions (eg, -- for reasons of efficiency, flags indicating language extensions (eg,
-- -fglasgow-exts or -XParr) are represented by a bitmap stored in an unboxed -- -fglasgow-exts or -XParallelArrays) are represented by a bitmap stored in an unboxed
-- integer -- integer
genericsBit :: Int genericsBit :: Int
...@@ -1851,12 +1851,12 @@ mkPState flags buf loc = ...@@ -1851,12 +1851,12 @@ mkPState flags buf loc =
where where
bitmap = genericsBit `setBitIf` xopt Opt_Generics flags bitmap = genericsBit `setBitIf` xopt Opt_Generics flags
.|. ffiBit `setBitIf` xopt Opt_ForeignFunctionInterface flags .|. ffiBit `setBitIf` xopt Opt_ForeignFunctionInterface flags
.|. parrBit `setBitIf` xopt Opt_PArr flags .|. parrBit `setBitIf` xopt Opt_ParallelArrays flags
.|. arrowsBit `setBitIf` xopt Opt_Arrows flags .|. arrowsBit `setBitIf` xopt Opt_Arrows flags
.|. thBit `setBitIf` xopt Opt_TemplateHaskell flags .|. thBit `setBitIf` xopt Opt_TemplateHaskell flags
.|. qqBit `setBitIf` xopt Opt_QuasiQuotes flags .|. qqBit `setBitIf` xopt Opt_QuasiQuotes flags
.|. ipBit `setBitIf` xopt Opt_ImplicitParams flags .|. ipBit `setBitIf` xopt Opt_ImplicitParams flags
.|. explicitForallBit `setBitIf` xopt Opt_ExplicitForAll flags .|. explicitForallBit `setBitIf` xopt Opt_ExplicitForAll flags
.|. bangPatBit `setBitIf` xopt Opt_BangPatterns flags .|. bangPatBit `setBitIf` xopt Opt_BangPatterns flags
.|. tyFamBit `setBitIf` xopt Opt_TypeFamilies flags .|. tyFamBit `setBitIf` xopt Opt_TypeFamilies flags
.|. haddockBit `setBitIf` dopt Opt_Haddock flags .|. haddockBit `setBitIf` dopt Opt_Haddock flags
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment