From 94171908c07a7f85ff991f14867c6bc5e7f93258 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Thu, 12 Nov 2009 21:11:51 +0000
Subject: before the optimizations OptParametrize and OptValues were applied
 twice. in addition the values optimization is now always applied because it
 become very cheep

---
 src/GF/Infra/Option.hs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/GF/Infra')

diff --git a/src/GF/Infra/Option.hs b/src/GF/Infra/Option.hs
index 2963da609..dc15d1929 100644
--- a/src/GF/Infra/Option.hs
+++ b/src/GF/Infra/Option.hs
@@ -109,7 +109,7 @@ data SISRFormat =
   | SISR_1_0
  deriving (Show,Eq,Ord)
 
-data Optimization = OptStem | OptCSE | OptExpand | OptParametrize | OptValues
+data Optimization = OptStem | OptCSE | OptExpand | OptParametrize
   deriving (Show,Eq,Ord)
 
 data CFGTransform = CFGNoLR 
@@ -268,7 +268,7 @@ defaultFlags = Flags {
       optResName         = Nothing,
       optPreprocessors   = [],
       optEncoding        = ISO_8859_1,
-      optOptimizations   = Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize,OptValues],
+      optOptimizations   = Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize],
       optCFGTransforms   = Set.fromList [CFGRemoveCycles, CFGBottomUpFilter, 
                                          CFGTopDownFilter, CFGMergeIdentical],
       optLibraryPath     = [],
@@ -474,12 +474,15 @@ instance Read OutputFormat where
 
 optimizationPackages :: [(String, Set Optimization)]
 optimizationPackages = 
-    [("all_subs",    Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize,OptValues]), -- deprecated
-     ("all",         Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize,OptValues]),
-     ("values",      Set.fromList [OptStem,OptCSE,OptExpand,OptValues]),
+    [("all",         Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize]),
+     ("values",      Set.fromList [OptStem,OptCSE,OptExpand]),
+     ("noexpand",    Set.fromList [OptStem,OptCSE]),
+     
+     -- deprecated
+     ("all_subs",    Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize]),
      ("parametrize", Set.fromList [OptStem,OptCSE,OptExpand,OptParametrize]),
-     ("none",        Set.fromList [OptStem,OptCSE,OptExpand]),
-     ("noexpand",    Set.fromList [OptStem,OptCSE])]
+     ("none",        Set.fromList [OptStem,OptCSE,OptExpand])
+    ]
 
 cfgTransformNames :: [(String, CFGTransform)]
 cfgTransformNames = 
-- 
cgit v1.2.3