summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjorn <bjorn@bringert.net>2008-05-30 15:20:09 +0000
committerbjorn <bjorn@bringert.net>2008-05-30 15:20:09 +0000
commit54ebdab1f730ef7b0d5de9faefbfaac6b7f3bd4b (patch)
treee7d76cc84dd084a8151c5539178530ebfbd986c4
parent7f90087ab9c77ac2e2a57d53b8a985feb45d43f2 (diff)
Change setOptimization to produce Options, not a function over Options.
-rw-r--r--src-3.0/GF/Infra/Option.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src-3.0/GF/Infra/Option.hs b/src-3.0/GF/Infra/Option.hs
index b9fb7370f..3b390e98e 100644
--- a/src-3.0/GF/Infra/Option.hs
+++ b/src-3.0/GF/Infra/Option.hs
@@ -200,11 +200,11 @@ flag f (Options o) = f (o defaultFlags)
moduleFlag :: (ModuleFlags -> a) -> Options -> a
moduleFlag f = flag (f . optModuleFlags)
-onFlags :: (Flags -> Flags) -> Options -> Options
-onFlags f opts = addOptions opts (Options f)
+modifyFlags :: (Flags -> Flags) -> Options
+modifyFlags = Options
-onModuleFlags :: (ModuleFlags -> ModuleFlags) -> Options -> Options
-onModuleFlags f opts = addOptions opts (moduleOptions (ModuleOptions f))
+modifyModuleFlags :: (ModuleFlags -> ModuleFlags) -> Options
+modifyModuleFlags = moduleOptions . ModuleOptions
{-
@@ -469,8 +469,8 @@ dump opts d = moduleFlag ((d `elem`) . optDump) opts
-- * Convenience functions for setting options
--
-setOptimization :: Optimization -> Bool -> Options -> Options
-setOptimization o b = onModuleFlags (setOptimization' o b)
+setOptimization :: Optimization -> Bool -> Options
+setOptimization o b = modifyModuleFlags (setOptimization' o b)
setOptimization' :: Optimization -> Bool -> ModuleFlags -> ModuleFlags
setOptimization' o b f = f { optOptimizations = g (optOptimizations f)}