Skip to content
GitLab
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
d9d1dd9e
Commit
d9d1dd9e
authored
Jul 24, 2015
by
Andrey Mokhov
Browse files
Rename ask* to get* to avoid mixing up oracles with expressions.
parent
179d1cd8
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Settings/GhcM.hs
View file @
d9d1dd9e
...
...
@@ -19,9 +19,9 @@ ghcMArgs = do
stage
<-
asks
getStage
builder
(
GhcM
stage
)
?
do
pkg
<-
asks
getPackage
cppArgs
<-
ask
PkgDataList
CppArgs
hsArgs
<-
ask
PkgDataList
HsArgs
hsSrcs
<-
ask
HsSources
cppArgs
<-
get
PkgDataList
CppArgs
hsArgs
<-
get
PkgDataList
HsArgs
hsSrcs
<-
get
HsSources
ways
<-
fromDiffExpr
Settings
.
Ways
.
ways
let
buildPath
=
targetPath
stage
pkg
-/-
"build"
mconcat
...
...
@@ -41,9 +41,9 @@ packageGhcArgs :: Args
packageGhcArgs
=
do
stage
<-
asks
getStage
supportsPackageKey
<-
lift
.
flag
$
SupportsPackageKey
pkgKey
<-
ask
PkgData
PackageKey
pkgDepKeys
<-
ask
PkgDataList
DepKeys
pkgDeps
<-
ask
PkgDataList
Deps
pkgKey
<-
get
PkgData
PackageKey
pkgDepKeys
<-
get
PkgDataList
DepKeys
pkgDeps
<-
get
PkgDataList
Deps
mconcat
[
arg
"-hide-all-packages"
,
arg
"-no-user-package-db"
...
...
@@ -59,8 +59,8 @@ includeGhcArgs :: Args
includeGhcArgs
=
do
stage
<-
asks
getStage
pkg
<-
asks
getPackage
srcDirs
<-
ask
PkgDataList
SrcDirs
includeDirs
<-
ask
PkgDataList
IncludeDirs
srcDirs
<-
get
PkgDataList
SrcDirs
includeDirs
<-
get
PkgDataList
IncludeDirs
let
buildPath
=
targetPath
stage
pkg
-/-
"build"
autogenPath
=
buildPath
-/-
"autogen"
mconcat
...
...
@@ -74,18 +74,18 @@ includeGhcArgs = do
,
arg
"-optP-include"
-- TODO: Shall we also add -cpp?
,
arg
$
"-optP"
++
autogenPath
-/-
"cabal_macros.h"
]
ask
HsSources
::
Expr
[
FilePath
]
ask
HsSources
=
do
get
HsSources
::
Expr
[
FilePath
]
get
HsSources
=
do
stage
<-
asks
getStage
pkg
<-
asks
getPackage
srcDirs
<-
ask
PkgDataList
SrcDirs
srcDirs
<-
get
PkgDataList
SrcDirs
let
autogenPath
=
targetPath
stage
pkg
-/-
"build/autogen"
dirs
=
autogenPath
:
map
(
pkgPath
pkg
-/-
)
srcDirs
ask
ModuleFiles
dirs
[
".hs"
,
".lhs"
]
get
ModuleFiles
dirs
[
".hs"
,
".lhs"
]
ask
ModuleFiles
::
[
FilePath
]
->
[
String
]
->
Expr
[
FilePath
]
ask
ModuleFiles
directories
suffixes
=
do
modules
<-
ask
PkgDataList
Modules
get
ModuleFiles
::
[
FilePath
]
->
[
String
]
->
Expr
[
FilePath
]
get
ModuleFiles
directories
suffixes
=
do
modules
<-
get
PkgDataList
Modules
let
modPaths
=
map
(
replaceEq
'.'
pathSeparator
)
modules
files
<-
lift
$
forM
[
dir
-/-
modPath
++
suffix
|
dir
<-
directories
...
...
src/Settings/Util.hs
View file @
d9d1dd9e
...
...
@@ -2,7 +2,7 @@ module Settings.Util (
-- Primitive settings elements
arg
,
argM
,
argSetting
,
argSettingList
,
ask
PkgData
,
ask
PkgDataList
,
get
PkgData
,
get
PkgDataList
,
appendCcArgs
,
needBuilder
-- argBuilderPath, argStagedBuilderPath,
...
...
@@ -34,15 +34,15 @@ argSetting = argM . setting
argSettingList
::
SettingList
->
Args
argSettingList
=
appendM
.
settingList
ask
PkgData
::
(
FilePath
->
PackageData
)
->
Expr
String
ask
PkgData
key
=
do
get
PkgData
::
(
FilePath
->
PackageData
)
->
Expr
String
get
PkgData
key
=
do
stage
<-
asks
getStage
pkg
<-
asks
getPackage
let
path
=
targetPath
stage
pkg
lift
.
pkgData
.
key
$
path
ask
PkgDataList
::
(
FilePath
->
PackageDataList
)
->
Expr
[
String
]
ask
PkgDataList
key
=
do
get
PkgDataList
::
(
FilePath
->
PackageDataList
)
->
Expr
[
String
]
get
PkgDataList
key
=
do
stage
<-
asks
getStage
pkg
<-
asks
getPackage
let
path
=
targetPath
stage
pkg
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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