on master help sign in
Deprecate the `MavenProject` output option.
4de5a73Jan de Muijnck-Hughes
CHANGELOG.md+5
@@ -12,7 +12,12 @@
12* Remove deprecated options `--ideslave` and `--ideslave-socket`. These options
12* Remove deprecated options `--ideslave` and `--ideslave-socket`. These options
13 were replaced with `--ide-mode` and `--ide-mode-socket` in 0.9.17
13 were replaced with `--ide-mode` and `--ide-mode-socket` in 0.9.17
14
14
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+
15## Reflection changes
19## Reflection changes
20+
16* The implicit coercion from String to TTName was removed.
21* The implicit coercion from String to TTName was removed.
17
22
18* Decidable equality for TTName is available.
23* 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.
82 --testpkg IPKG Run tests for package
82 --testpkg IPKG Run tests for package
83 -S,--codegenonly Do no further compilation of code generator output
83 -S,--codegenonly Do no further compilation of code generator output
84 -c,--compileonly Compile to object files rather than an executable
84 -c,--compileonly Compile to object files rather than an executable
85− --mvn Create a maven project (for Java codegen)
86 --codegen TARGET Select code generator: C, Javascript, Node and
85 --codegen TARGET Select code generator: C, Javascript, Node and
87 bytecode are bundled with Idris
86 bytecode are bundled with Idris
88 --cg-opt ARG Arguments to pass to code generator
87 --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
64 let cout = headers incs ++ debug dbg ++ h ++ wrappers ++ cc ++
64 let cout = headers incs ++ debug dbg ++ h ++ wrappers ++ cc ++
65 (if (exec == Executable) then mprog else hi)
65 (if (exec == Executable) then mprog else hi)
66 case exec of
66 case exec of
67− MavenProject -> putStrLn ("FAILURE: output type not supported")
68 Raw -> writeSource out cout
67 Raw -> writeSource out cout
69 _ -> do
68 _ -> do
70 (tmpn, tmph) <- tempfile ".c"
69 (tmpn, tmph) <- tempfile ".c"
src/IRTS/CodegenCommon.hs+2−2
@@ -5,7 +5,7 @@ import IRTS.Simplified
5import IRTS.Defunctionalise
5import IRTS.Defunctionalise
6
6
7data DbgLevel = NONE | DEBUG | TRACE deriving Eq
7data 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)
9
9
10-- Everything which might be needed in a code generator - a CG can choose which
10-- Everything which might be needed in a code generator - a CG can choose which
11-- level of Decls to generate code from (simplified, defunctionalised or merely
11-- level of Decls to generate code from (simplified, defunctionalised or merely
@@ -26,6 +26,6 @@ data CodegenInfo = CodegenInfo { outputFile :: String,
26 liftDecls :: [(Name, LDecl)],
26 liftDecls :: [(Name, LDecl)],
27 interfaces :: Bool,
27 interfaces :: Bool,
28 exportDecls :: [ExportIFace]
28 exportDecls :: [ExportIFace]
29− }
29+ }
30
30
31type CodeGenerator = CodegenInfo -> IO ()
31type CodeGenerator = CodegenInfo -> IO ()
src/Idris/CmdOptions.hs−1
@@ -142,7 +142,6 @@ parseFlags = many $
142
142
143 <|> flag' (OutputTy Raw) (short 'S' <> long "codegenonly" <> help "Do no further compilation of code generator output")
143 <|> flag' (OutputTy Raw) (short 'S' <> long "codegenonly" <> help "Do no further compilation of code generator output")
144 <|> flag' (OutputTy Object) (short 'c' <> long "compileonly" <> help "Compile to object files rather than an executable")
144 <|> 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)")
146
145
147 <|> (DumpDefun <$> strOption (long "dumpdefuns"))
146 <|> (DumpDefun <$> strOption (long "dumpdefuns"))
148 <|> (DumpCases <$> strOption (long "dumpcases"))
147 <|> (DumpCases <$> strOption (long "dumpcases"))
src/Idris/DeepSeq.hs+2−3
@@ -258,10 +258,9 @@ instance NFData IdrisColour where
258 rnf (IdrisColour _ x2 x3 x4 x5) = rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` rnf x5 `seq` ()
258 rnf (IdrisColour _ x2 x3 x4 x5) = rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` rnf x5 `seq` ()
259
259
260instance NFData OutputType where
260instance NFData OutputType where
261− rnf Raw = ()
261+ rnf Raw = ()
262− rnf Object = ()
262+ rnf Object = ()
263 rnf Executable = ()
263 rnf Executable = ()
264− rnf MavenProject = ()
265
264
266instance NFData IBCWrite where
265instance NFData IBCWrite where
267 rnf (IBCFix fixDecl) = rnf fixDecl `seq` ()
266 rnf (IBCFix fixDecl) = rnf fixDecl `seq` ()