Commit 948f2a3e authored by Malcolm.Wallace's avatar Malcolm.Wallace
Browse files

Fix various mispellings of nhc98.

parent 213417e6
......@@ -682,7 +682,7 @@ binfoFieldDescrs =
options (\path binfo -> binfo{options=path})
, optsField "hugs-options" Hugs
options (\path binfo -> binfo{options=path})
, optsField "nhc-options" NHC
, optsField "nhc98-options" NHC
options (\path binfo -> binfo{options=path})
, optsField "jhc-options" JHC
options (\path binfo -> binfo{options=path})
......
......@@ -72,7 +72,7 @@ configure verbosity hcPath _hcPkgPath conf = do
let comp = Compiler {
compilerFlavor = NHC,
compilerId = error "TODO: nhc compilerId", --PackageIdentifier "nhc" version
compilerId = error "TODO: nhc98 compilerId", --PackageIdentifier "nhc98" version
compilerExtensions = nhcLanguageExtensions
}
return (comp, conf')
......
......@@ -491,7 +491,7 @@ ghcPkgProgram = (simpleProgram "ghc-pkg") {
}
nhcProgram :: Program
nhcProgram = simpleProgram "nhc"
nhcProgram = simpleProgram "nhc98"
hmakeProgram :: Program
hmakeProgram = (simpleProgram "hmake") {
......
......@@ -466,7 +466,7 @@ configureCmd progConf = Cmd {
cmdDescription = programFlagsDescription progConf,
cmdOptions = \showOrParseArgs -> [cmd_help, cmd_verbose,
Option "g" ["ghc"] (NoArg GhcFlag) "compile with GHC",
Option "" ["nhc"] (NoArg NhcFlag) "compile with NHC",
Option "" ["nhc98"] (NoArg NhcFlag) "compile with NHC",
Option "" ["jhc"] (NoArg JhcFlag) "compile with JHC",
Option "" ["hugs"] (NoArg HugsFlag) "compile with hugs",
Option "w" ["with-compiler"] (reqPathArg WithCompiler)
......@@ -972,9 +972,9 @@ hunitTests :: [Test]
hunitTests = []
-- The test cases kinda have to be rewritten from the ground up... :/
--hunitTests =
-- let m = [("ghc", GHC), ("nhc", NHC), ("hugs", Hugs)]
-- let m = [("ghc", GHC), ("nhc98", NHC), ("hugs", Hugs)]
-- (flags, commands', unkFlags, ers)
-- = getOpt Permute options ["configure", "foobar", "--prefix=/foo", "--ghc", "--nhc", "--hugs", "--with-compiler=/comp", "--unknown1", "--unknown2", "--install-prefix=/foo", "--user", "--global"]
-- = getOpt Permute options ["configure", "foobar", "--prefix=/foo", "--ghc", "--nhc98", "--hugs", "--with-compiler=/comp", "--unknown1", "--unknown2", "--install-prefix=/foo", "--user", "--global"]
-- in [TestLabel "very basic option parsing" $ TestList [
-- "getOpt flags" ~: "failed" ~:
-- [Prefix "/foo", GhcFlag, NhcFlag, HugsFlag,
......
Markdown is supported
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