5f5f290 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Include Prelude in make mode

5f5f290Phil Freeman13 years ago

psc/Main.hs+4−5

@@ -165,12 +165,11 @@ options :: Term P.Options

165options = P.Options <$> tco <*> performRuntimeTypeChecks <*> magicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules <*> codeGenModules

166

167stdInOrInputFiles :: FilePath -> Term (Maybe [FilePath])

168−stdInOrInputFiles prelude = combine <$> useStdIn <*> (not <$> noPrelude) <*> inputFiles <*> make

168+stdInOrInputFiles prelude = combine <$> useStdIn <*> (not <$> noPrelude) <*> inputFiles

169 where

170− combine _ _ input True = Just input

171− combine False True input _ = Just (prelude : input)

170+ combine False True input = Just (prelude : input)

172− combine False False input _ = Just input

171+ combine False False input = Just input

173− combine True _ _ _ = Nothing

172+ combine True _ _ = Nothing

174

173

175term :: FilePath -> Term (IO ())

174term :: FilePath -> Term (IO ())

176term prelude = compile <$> make <*> options <*> stdInOrInputFiles prelude <*> outputFile <*> externsFile

175term prelude = compile <$> make <*> options <*> stdInOrInputFiles prelude <*> outputFile <*> externsFile