dda41af · Idris-dev · git.iko.soy

src/IRTS/Compiler.hs+1−1

compare with master

unifiedsplit

@@ -136,7 +136,7 @@ generate codegen mainmod ir

136 Via "c" -> codegenC ir

137 -- Any external code generator

138 Via cg -> do let cmd = "idris-" ++ cg

139− args = [mainmod, "-o", outputFile ir]

139+ args = [mainmod, "-o", outputFile ir] ++ compilerFlags ir

140 exit <- rawSystem cmd args

141 when (exit /= ExitSuccess) $

142 putStrLn ("FAILURE: " ++ show cmd ++ " " ++ show args)

src/Idris/AbsSyntaxTree.hs+1

@@ -472,6 +472,7 @@ data Opt = Filename String

472 | DumpDefun String

473 | DumpCases String

474 | UseCodegen Codegen

475+ | CodegenArgs String

475 | OutputTy OutputType

476 | OutputTy OutputType

476 | Extension LanguageExt

477 | Extension LanguageExt

477 | InterpretScript String

478 | InterpretScript String

src/Idris/CmdOptions.hs+1

@@ -127,6 +127,7 @@ parseFlags = many $

127 <|> (DumpDefun <$> strOption (long "dumpdefuns"))

128 <|> (DumpCases <$> strOption (long "dumpcases"))

129 <|> ((\s -> UseCodegen $ parseCodegen s) <$> strOption (long "codegen" <> metavar "TARGET" <> help "Select code generator: C, Javascript, Node and bytecode are bundled with Idris"))

130+ <|> (CodegenArgs <$> strOption (long "cg-opt" <> metavar "ARG" <> help "Arguments to pass to code generator"))

130 <|> (EvalExpr <$> strOption (long "eval" <> short 'e' <> metavar "EXPR" <> help "Evaluate an expression without loading the REPL"))

131 <|> (EvalExpr <$> strOption (long "eval" <> short 'e' <> metavar "EXPR" <> help "Evaluate an expression without loading the REPL"))

131 <|> flag' (InterpretScript "Main.main") (long "execute" <> help "Execute as idris")

132 <|> flag' (InterpretScript "Main.main") (long "execute" <> help "Execute as idris")

132 <|> (InterpretScript <$> strOption (long "exec" <> metavar "EXPR" <> help "Execute as idris"))

133 <|> (InterpretScript <$> strOption (long "exec" <> metavar "EXPR" <> help "Execute as idris"))

src/Idris/REPL.hs+6

@@ -1601,6 +1601,8 @@ idrisMain opts =

1601 let cgn = case opt getCodegen opts of

1602 [] -> Via "c"

1603 xs -> last xs

1604+ let cgFlags = opt getCodegenArgs opts

1605+

1604 -- Now set/unset specifically chosen optimisations

1606 -- Now set/unset specifically chosen optimisations

1605 sequence_ (opt getOptimisation opts)

1607 sequence_ (opt getOptimisation opts)

1606 script <- case opt getExecScript opts of

1608 script <- case opt getExecScript opts of

@@ -1625,6 +1627,7 @@ idrisMain opts =

1625 setOutputTy outty

1627 setOutputTy outty

1626 setNoBanner nobanner

1628 setNoBanner nobanner

1627 setCodegen cgn

1629 setCodegen cgn

1630+ mapM_ (addFlag cgn) cgFlags

1628 mapM_ makeOption opts

1631 mapM_ makeOption opts

1629 -- if we have the --bytecode flag, drop into the bytecode assembler

1632 -- if we have the --bytecode flag, drop into the bytecode assembler

1630 case bcs of

1633 case bcs of

@@ -1839,6 +1842,9 @@ getCodegen :: Opt -> Maybe Codegen

1839getCodegen (UseCodegen x) = Just x

1842getCodegen (UseCodegen x) = Just x

1840getCodegen _ = Nothing

1843getCodegen _ = Nothing

1841

1844

1845+getCodegenArgs :: Opt -> Maybe String

1846+getCodegenArgs (CodegenArgs args) = Just args

1847+getCodegenArgs _ = Nothing

1842

1848

1843getConsoleWidth :: Opt -> Maybe ConsoleWidth

1849getConsoleWidth :: Opt -> Maybe ConsoleWidth

1844getConsoleWidth (UseConsoleWidth x) = Just x

1850getConsoleWidth (UseConsoleWidth x) = Just x