From bec9d06fae68919f3c41bbd854720ef2dc88f74d Mon Sep 17 00:00:00 2001 From: bjorn Date: Fri, 30 May 2008 15:20:09 +0000 Subject: [PATCH] Change setOptimization to produce Options, not a function over Options. --- src-3.0/GF/Infra/Option.hs | 12 ++++++------ 1 file 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)}