Merge pull request purescript#323 from garyb/optimize-by-default

paf31 · paf31 · commit 130e8aecf561 · 2014-03-25T17:10:53.000-07:00
Optimize by default and use flags to disable
diff --git a/psc-make/Main.hs b/psc-make/Main.hs
@@ -91,9 +91,9 @@ inputFiles :: Term [FilePath]
 inputFiles = value $ posAny [] $ posInfo
      { posDoc = "The input .ps files" }
 
-tco :: Term Bool
-tco = value $ flag $ (optInfo [ "tco" ])
-     { optDoc = "Perform tail call optimizations" }
+noTco :: Term Bool
+noTco = value $ flag $ (optInfo [ "no-tco" ])
+     { optDoc = "Disable tail call optimizations" }
 
 performRuntimeTypeChecks :: Term Bool
 performRuntimeTypeChecks = value $ flag $ (optInfo [ "runtime-type-checks" ])
@@ -103,9 +103,9 @@ noPrelude :: Term Bool
 noPrelude = value $ flag $ (optInfo [ "no-prelude" ])
      { optDoc = "Omit the Prelude" }
 
-magicDo :: Term Bool
-magicDo = value $ flag $ (optInfo [ "magic-do" ])
-     { optDoc = "Overload the do keyword to generate efficient code specifically for the Eff monad." }
+noMagicDo :: Term Bool
+noMagicDo = value $ flag $ (optInfo [ "no-magic-do" ])
+     { optDoc = "Disable the optimization that overloads the do keyword to generate efficient code specifically for the Eff monad." }
 
 noOpts :: Term Bool
 noOpts = value $ flag $ (optInfo [ "no-opts" ])
@@ -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 <$> tco <*> performRuntimeTypeChecks <*> magicDo <*> pure Nothing <*> noOpts <*> browserNamespace <*> pure [] <*> pure []
+options = P.Options <$> 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
@@ -86,9 +86,9 @@ externsFile :: Term (Maybe FilePath)
 externsFile = value $ opt Nothing $ (optInfo [ "e", "externs" ])
      { optDoc = "The output .e.ps file" }
 
-tco :: Term Bool
-tco = value $ flag $ (optInfo [ "tco" ])
-     { optDoc = "Perform tail call optimizations" }
+noTco :: Term Bool
+noTco = value $ flag $ (optInfo [ "no-tco" ])
+     { optDoc = "Disable tail call optimizations" }
 
 performRuntimeTypeChecks :: Term Bool
 performRuntimeTypeChecks = value $ flag $ (optInfo [ "runtime-type-checks" ])
@@ -98,9 +98,9 @@ noPrelude :: Term Bool
 noPrelude = value $ flag $ (optInfo [ "no-prelude" ])
      { optDoc = "Omit the Prelude" }
 
-magicDo :: Term Bool
-magicDo = value $ flag $ (optInfo [ "magic-do" ])
-     { optDoc = "Overload the do keyword to generate efficient code specifically for the Eff monad." }
+noMagicDo :: Term Bool
+noMagicDo = value $ flag $ (optInfo [ "no-magic-do" ])
+     { optDoc = "Disable the optimization that overloads the do keyword to generate efficient code specifically for the Eff monad." }
 
 runMain :: Term (Maybe String)
 runMain = value $ defaultOpt (Just "Main") Nothing $ (optInfo [ "main" ])
@@ -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 <$> tco <*> performRuntimeTypeChecks <*> magicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules <*> codeGenModules
+options = P.Options <$> noTco <*> performRuntimeTypeChecks <*> noMagicDo <*> runMain <*> noOpts <*> browserNamespace <*> dceModules <*> codeGenModules
 
 stdInOrInputFiles :: FilePath -> Term (Maybe [FilePath])
 stdInOrInputFiles prelude = combine <$> useStdIn <*> (not <$> noPrelude) <*> inputFiles
diff --git a/src/Language/PureScript/Optimizer/MagicDo.hs b/src/Language/PureScript/Optimizer/MagicDo.hs
@@ -30,8 +30,8 @@ import Language.PureScript.Names
 import qualified Language.PureScript.Constants as C
 
 magicDo :: Options -> JS -> JS
-magicDo opts | optionsMagicDo opts = inlineST . magicDo'
-             | otherwise = id
+magicDo opts | optionsNoMagicDo opts = id
+             | otherwise = inlineST . magicDo'
 
 -- |
 -- Inline type class dictionaries for >>= and return for the Eff monad
diff --git a/src/Language/PureScript/Optimizer/TCO.hs b/src/Language/PureScript/Optimizer/TCO.hs
@@ -24,8 +24,8 @@ import Language.PureScript.CodeGen.JS.AST
 -- Eliminate tail calls
 --
 tco :: Options -> JS -> JS
-tco opts | optionsTco opts = tco'
-         | otherwise = id
+tco opts | optionsNoTco opts = id
+         | otherwise = tco'
 
 tco' :: JS -> JS
 tco' = everywhere (mkT convert)
diff --git a/src/Language/PureScript/Options.hs b/src/Language/PureScript/Options.hs
@@ -20,17 +20,17 @@ module Language.PureScript.Options where
 --
 data Options = Options {
     -- |
-    -- Perform tail-call elimination
+    -- Disable tail-call elimination
     --
-    optionsTco :: Bool
+    optionsNoTco :: Bool
     -- |
     -- Perform type checks at runtime
     --
   , optionsPerformRuntimeTypeChecks :: Bool
     -- |
-    -- Inline calls to ret and bind for the Eff monad
+    -- Disable inlining of calls to return and bind for the Eff monad
     --
-  , optionsMagicDo :: Bool
+  , optionsNoMagicDo :: Bool
     -- |
     -- When specified, checks the type of `main` in the module, and generate a call to run main
     -- after the module definitions.
