Disable prelude auto-import with --no-prelude

garyb · garyb · commit aa8a269b4c3c · 2014-03-26T00:28:36.000Z
diff --git a/psc-make/Main.hs b/psc-make/Main.hs
@@ -116,7 +116,7 @@ browserNamespace = value $ opt "PS" $ (optInfo [ "browser-namespace" ])
      { optDoc = "Specify the namespace that PureScript modules will be exported to when running in the browser." }
 
 options :: Term P.Options
-options = P.Options <$> noTco <*> performRuntimeTypeChecks <*> noMagicDo <*> pure Nothing <*> noOpts <*> browserNamespace <*> pure [] <*> pure []
+options = P.Options <$> noPrelude <*> noTco <*> performRuntimeTypeChecks <*> noMagicDo <*> pure Nothing <*> noOpts <*> browserNamespace <*> pure [] <*> pure []
 
 inputFilesAndPrelude :: FilePath -> Term [FilePath]
 inputFilesAndPrelude prelude = combine <$> (not <$> noPrelude) <*> inputFiles
diff --git a/psc/Main.hs b/psc/Main.hs
@@ -123,7 +123,7 @@ codeGenModules = value $ optAll [] $ (optInfo [ "codegen" ])
      { optDoc = "A list of modules for which Javascript and externs should be generated. This argument can be used multiple times." }
 
 options :: Term P.Options
-options = P.Options <$> noTco <*> performRuntimeTypeChecks <*> noMagicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules <*> codeGenModules
+options = P.Options <$> noPrelude <*> noTco <*> performRuntimeTypeChecks <*> noMagicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules <*> codeGenModules
 
 stdInOrInputFiles :: FilePath -> Term (Maybe [FilePath])
 stdInOrInputFiles prelude = combine <$> useStdIn <*> (not <$> noPrelude) <*> inputFiles
diff --git a/psci/Main.hs b/psci/Main.hs
@@ -194,7 +194,7 @@ completion = completeWord Nothing " \t\n\r" findCompletions
 -- | Compilation options.
 --
 options :: P.Options
-options = P.Options True False True (Just "Main") True "PS" [] []
+options = P.Options False True False True (Just "Main") True "PS" [] []
 
 -- |
 -- Makes a volatile module to execute the current expression.
diff --git a/src/Language/PureScript.hs b/src/Language/PureScript.hs
@@ -69,7 +69,7 @@ compile = compile' initEnvironment
 
 compile' :: Environment -> Options -> [Module] -> Either String (String, String, Environment)
 compile' env opts ms = do
-  (sorted, _) <- sortModules (map importPrelude ms)
+  (sorted, _) <- sortModules $ if optionsNoPrelude opts then ms else (map importPrelude ms)
   desugared <- desugar sorted
   (elaborated, env') <- runCheck' env $ forM desugared $ typeCheckModule mainModuleIdent
   regrouped <- createBindingGroupsModule . collapseBindingGroupsModule $ elaborated
@@ -164,7 +164,7 @@ make :: (Functor m, Monad m, MonadMake m) => Options -> [(FilePath, Module)] ->
 make opts ms = do
   let filePathMap = M.fromList (map (\(fp, Module mn _ _) -> (mn, fp)) ms)
 
-  (sorted, graph) <- liftError $ sortModules (map (importPrelude . snd) ms)
+  (sorted, graph) <- liftError $ sortModules $ if optionsNoPrelude opts then map snd ms else (map (importPrelude . snd) ms)
 
   toRebuild <- foldM (\s (Module moduleName' _ _) -> do
     let filePath = toFileName moduleName'
diff --git a/src/Language/PureScript/Options.hs b/src/Language/PureScript/Options.hs
@@ -19,10 +19,14 @@ module Language.PureScript.Options where
 -- The data type of compiler options
 --
 data Options = Options {
+    -- |
+    -- Disable inclusion of the built in Prelude
+    --
+    optionsNoPrelude :: Bool
     -- |
     -- Disable tail-call elimination
     --
-    optionsNoTco :: Bool
+  , optionsNoTco :: Bool
     -- |
     -- Perform type checks at runtime
     --
@@ -59,4 +63,4 @@ data Options = Options {
 -- Default compiler options
 --
 defaultOptions :: Options
-defaultOptions = Options False False False Nothing False "PS" [] []
+defaultOptions = Options False False False False Nothing False "PS" [] []
