removing ghc and ghci options.

This commit is contained in:
Kazu Yamamoto 2010-04-28 23:28:33 +09:00
parent 5e21c71b1e
commit fb7f0c9802
3 changed files with 1 additions and 17 deletions

View File

@ -25,23 +25,14 @@ usage = "ghc-mod version 0.4.0\n"
defaultOptions :: Options
defaultOptions = Options { convert = toPlain
, ghc = "ghc"
, ghci = "ghci"
, ghcPkg = "ghc-pkg"
, outDir = outputDir
, outFile = outputFile
}
argspec :: [OptDescr (Options -> Options)]
argspec = [ Option "l" ["tolisp"]
(NoArg (\opts -> opts { convert = toLisp }))
"print as a list of Lisp"
, Option "g" ["ghc"]
(ReqArg (\str opts -> opts { ghc = str }) "ghc")
"GHC path"
, Option "i" ["ghci"]
(ReqArg (\str opts -> opts { ghci = str }) "ghci")
"ghci path"
, Option "p" ["ghc-pkg"]
(ReqArg (\str opts -> opts { ghcPkg = str }) "ghc-pkg")
"ghc-pkg path"

View File

@ -2,11 +2,8 @@ module Param where
data Options = Options {
convert :: [String] -> String
, ghc :: FilePath
, ghci :: FilePath
, ghcPkg :: FilePath
, outDir :: FilePath
, outFile :: FilePath
}
outputDir :: String

View File

@ -59,13 +59,9 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defvar ghc-module-command "ghc-mod")
(defvar ghc-ghc-command (ghc-which "ghc"))
(defvar ghc-ghci-command (ghc-which "ghci"))
(defvar ghc-ghc-pkg-command (ghc-which "ghc-pkg"))
(defun ghc-module-command-args ()
(list "-g" ghc-ghc-command
"-i" ghc-ghci-command
"-p" ghc-ghc-pkg-command))
(list "-p" ghc-ghc-pkg-command))
(provide 'ghc-func)