From 0b24415469d7aa146bce7d2d2c73fc6143b2aeec Mon Sep 17 00:00:00 2001 From: hallgren Date: Fri, 9 Sep 2011 16:17:33 +0000 Subject: [PATCH] Don't make noexpand the default with -fcclazy This reverts the previous change. Not preprocessing opers turns out to make a difference in what needs to be mentioned in restricted inheritance/imports. --- src/compiler/GF/Infra/Option.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/compiler/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs index e121abfb6..27594f57f 100644 --- a/src/compiler/GF/Infra/Option.hs +++ b/src/compiler/GF/Infra/Option.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} module GF.Infra.Option ( -- * Option types @@ -269,11 +268,11 @@ defaultFlags = Flags { optResName = Nothing, optPreprocessors = [], optEncoding = "latin1", -#ifdef CC_LAZY - optOptimizations = Set.fromList [OptStem,OptCSE], -#else +-- #ifdef CC_LAZY +-- optOptimizations = Set.fromList [OptStem,OptCSE], +-- #else optOptimizations = Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize], -#endif +-- #endif optOptimizePGF = False, optMkIndexPGF = False, optCFGTransforms = Set.fromList [CFGRemoveCycles, CFGBottomUpFilter,