From 1ecb4f63e9765962aab570bf043cb65c22df1e45 Mon Sep 17 00:00:00 2001 From: bjorn Date: Wed, 15 Oct 2008 11:38:34 +0000 Subject: Added OPTIONS class to make options handling somewhat nicer. Next, I will merge Flags and ModuleFlags. --- src/GF/Compile/Optimize.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/GF/Compile/Optimize.hs') diff --git a/src/GF/Compile/Optimize.hs b/src/GF/Compile/Optimize.hs index 83cbeb57a..ca3e6ec3e 100644 --- a/src/GF/Compile/Optimize.hs +++ b/src/GF/Compile/Optimize.hs @@ -58,8 +58,8 @@ optimizeModule opts mse@(ms,eenv) mo@(_,mi) = case mi of return (mo2,eenv) _ -> evalModule oopts mse mo where - oopts = addOptions opts (moduleOptions (flagsModule mo)) - optim = moduleFlag optOptimizations oopts + oopts = opts `addOptions` toOptions (flagsModule mo) + optim = flag optOptimizations oopts evalModule :: Options -> ([(Ident,SourceModInfo)],EEnv) -> (Ident,SourceModInfo) -> Err ((Ident,SourceModInfo),EEnv) @@ -102,7 +102,7 @@ evalResInfo oopts gr (c,info) = case info of where comp = if optres then computeConcrete gr else computeConcreteRec gr eIn cat = errIn ("Error optimizing" +++ cat +++ prt c +++ ":") - optim = moduleFlag optOptimizations oopts + optim = flag optOptimizations oopts optres = OptExpand `Set.member` optim -- cgit v1.2.3