Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
d2f11ea8
Commit
d2f11ea8
authored
Nov 30, 2010
by
benl
Browse files
Rename -XPArr to -XParallelArrays
parent
7cd02e3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
compiler/main/DynFlags.hs
View file @
d2f11ea8
...
...
@@ -304,7 +304,7 @@ data ExtensionFlag
|
Opt_ForeignFunctionInterface
|
Opt_UnliftedFFITypes
|
Opt_GHCForeignImportPrim
|
Opt_P
Arr
-- Syntactic support for parallel arrays
|
Opt_P
arallelArrays
-- Syntactic support for parallel arrays
|
Opt_Arrows
-- Arrow-notation syntax
|
Opt_TemplateHaskell
|
Opt_QuasiQuotes
...
...
@@ -1519,8 +1519,10 @@ fLangFlags = [
deprecatedForExtension
"ImplicitParams"
),
(
"scoped-type-variables"
,
Opt_ScopedTypeVariables
,
deprecatedForExtension
"ScopedTypeVariables"
),
(
"parr"
,
Opt_PArr
,
deprecatedForExtension
"PArr"
),
(
"parr"
,
Opt_ParallelArrays
,
deprecatedForExtension
"ParallelArrays"
),
(
"PArr"
,
Opt_ParallelArrays
,
deprecatedForExtension
"ParallelArrays"
),
(
"allow-overlapping-instances"
,
Opt_OverlappingInstances
,
deprecatedForExtension
"OverlappingInstances"
),
(
"allow-undecidable-instances"
,
Opt_UndecidableInstances
,
...
...
@@ -1572,7 +1574,7 @@ xFlags = [
deprecatedForExtension
"DoRec"
),
(
"DoRec"
,
Opt_DoRec
,
nop
),
(
"Arrows"
,
Opt_Arrows
,
nop
),
(
"P
Arr"
,
Opt_PArr
,
nop
),
(
"P
arallelArrays"
,
Opt_ParallelArrays
,
nop
),
(
"TemplateHaskell"
,
Opt_TemplateHaskell
,
checkTemplateHaskellOk
),
(
"QuasiQuotes"
,
Opt_QuasiQuotes
,
nop
),
(
"Generics"
,
Opt_Generics
,
nop
),
...
...
compiler/parser/Lexer.x
View file @
d2f11ea8
...
...
@@ -510,8 +510,8 @@ data Token
| ITvocurly
| ITvccurly
| ITobrack
| ITopabrack -- [:, for parallel arrays with -XPar
r
| ITcpabrack -- :], for parallel arrays with -XPar
r
| ITopabrack -- [:, for parallel arrays with -XPar
allelArrays
| ITcpabrack -- :], for parallel arrays with -XPar
allelArrays
| ITcbrack
| IToparen
| ITcparen
...
...
@@ -1724,7 +1724,7 @@ setAlrExpectingOCurly :: Maybe ALRLayout -> P ()
setAlrExpectingOCurly b = P $ \s -> POk (s {alr_expecting_ocurly = b}) ()
-- for reasons of efficiency, flags indicating language extensions (eg,
-- -fglasgow-exts or -XPar
r
) are represented by a bitmap stored in an unboxed
-- -fglasgow-exts or -XPar
allelArrays
) are represented by a bitmap stored in an unboxed
-- integer
genericsBit :: Int
...
...
@@ -1851,12 +1851,12 @@ mkPState flags buf loc =
where
bitmap = genericsBit `setBitIf` xopt Opt_Generics flags
.|. ffiBit `setBitIf` xopt Opt_ForeignFunctionInterface flags
.|. parrBit `setBitIf` xopt Opt_P
Arr
flags
.|. arrowsBit `setBitIf` xopt Opt_Arrows flags
.|. parrBit `setBitIf` xopt Opt_P
arallelArrays
flags
.|. arrowsBit `setBitIf` xopt Opt_Arrows
flags
.|. thBit `setBitIf` xopt Opt_TemplateHaskell flags
.|. qqBit `setBitIf` xopt Opt_QuasiQuotes flags
.|. ipBit `setBitIf` xopt Opt_ImplicitParams flags
.|. explicitForallBit `setBitIf` xopt Opt_ExplicitForAll flags
.|. qqBit `setBitIf` xopt Opt_QuasiQuotes
flags
.|. ipBit `setBitIf` xopt Opt_ImplicitParams
flags
.|. explicitForallBit `setBitIf` xopt Opt_ExplicitForAll
flags
.|. bangPatBit `setBitIf` xopt Opt_BangPatterns flags
.|. tyFamBit `setBitIf` xopt Opt_TypeFamilies flags
.|. haddockBit `setBitIf` dopt Opt_Haddock flags
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment