git.iko.soy/Idris-dev
on master help sign in
Merge pull request #3086 from jfdm/deprecate-project-output

Fixes #3075 Deprecate the `MavenProject` output option.

commit33a08b90084b25cb6e41a847903d9e87ac82bfbc authorJan de Muijnck-Hughes <jfdm@users.noreply.github.com> dateFri 1 Apr 2016, 11:44 (11 years ago) parent546d22c4de5a73
6 files changed+9−8
compare with master
unifiedsplit
CHANGELOG.md+5 man/idris.1−1 src/IRTS/CodegenC.hs−1 src/IRTS/CodegenCommon.hs+2−2 src/Idris/CmdOptions.hs−1 src/Idris/DeepSeq.hs+2−3
CHANGELOG.md+5
@@ -12,7 +12,12 @@
1212* Remove deprecated options `--ideslave` and `--ideslave-socket`. These options
1313 were replaced with `--ide-mode` and `--ide-mode-socket` in 0.9.17
1414
15+* The code generator output type `MavenProject` was specific to the
16+ Java codegen and has now been deprecated, together with the
17+ corresponding `--mvn` option.
18+
1519## Reflection changes
20+
1621* The implicit coercion from String to TTName was removed.
1722
1823* Decidable equality for TTName is available.
man/idris.1−1
@@ -82,7 +82,6 @@ should not necessarily be seen as production ready nor for industrial use.
8282 --testpkg IPKG Run tests for package
8383 -S,--codegenonly Do no further compilation of code generator output
8484 -c,--compileonly Compile to object files rather than an executable
85− --mvn Create a maven project (for Java codegen)
8685 --codegen TARGET Select code generator: C, Javascript, Node and
8786 bytecode are bundled with Idris
8887 --cg-opt ARG Arguments to pass to code generator
src/IRTS/CodegenC.hs−1
@@ -64,7 +64,6 @@ codegenC' defs out exec incs objs libs flags exports iface dbg
6464 let cout = headers incs ++ debug dbg ++ h ++ wrappers ++ cc ++
6565 (if (exec == Executable) then mprog else hi)
6666 case exec of
67− MavenProject -> putStrLn ("FAILURE: output type not supported")
6867 Raw -> writeSource out cout
6968 _ -> do
7069 (tmpn, tmph) <- tempfile ".c"
src/IRTS/CodegenCommon.hs+2−2
@@ -5,7 +5,7 @@ import IRTS.Simplified
55import IRTS.Defunctionalise
66
77data DbgLevel = NONE | DEBUG | TRACE deriving Eq
8−data OutputType = Raw | Object | Executable | MavenProject deriving (Eq, Show)
8+data OutputType = Raw | Object | Executable deriving (Eq, Show)
99
1010-- Everything which might be needed in a code generator - a CG can choose which
1111-- level of Decls to generate code from (simplified, defunctionalised or merely
@@ -26,6 +26,6 @@ data CodegenInfo = CodegenInfo { outputFile :: String,
2626 liftDecls :: [(Name, LDecl)],
2727 interfaces :: Bool,
2828 exportDecls :: [ExportIFace]
29− }
29+ }
3030
3131type CodeGenerator = CodegenInfo -> IO ()
src/Idris/CmdOptions.hs−1
@@ -142,7 +142,6 @@ parseFlags = many $
142142
143143 <|> flag' (OutputTy Raw) (short 'S' <> long "codegenonly" <> help "Do no further compilation of code generator output")
144144 <|> flag' (OutputTy Object) (short 'c' <> long "compileonly" <> help "Compile to object files rather than an executable")
145− <|> flag' (OutputTy MavenProject) (long "mvn" <> help "Create a maven project (for Java codegen)")
146145
147146 <|> (DumpDefun <$> strOption (long "dumpdefuns"))
148147 <|> (DumpCases <$> strOption (long "dumpcases"))
src/Idris/DeepSeq.hs+2−3
@@ -258,10 +258,9 @@ instance NFData IdrisColour where
258258 rnf (IdrisColour _ x2 x3 x4 x5) = rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` rnf x5 `seq` ()
259259
260260instance NFData OutputType where
261− rnf Raw = ()
262− rnf Object = ()
261+ rnf Raw = ()
262+ rnf Object = ()
263263 rnf Executable = ()
264− rnf MavenProject = ()
265264
266265instance NFData IBCWrite where
267266 rnf (IBCFix fixDecl) = rnf fixDecl `seq` ()