[changed default option handling and default options, Conf.hs is now the only place for defaults
martin.hofmann@uni-bamberg.de**20100326124126] hunk ./src/Igor2/Config.hs 50
-    , scr_maxTiers   = 1
+    , scr_maxTiers   = 0
hunk ./src/Igor2/UI/Help.hs 78
-                                \(probably) partial result (in debug mode \
-                                \only) [default 20]"))) <$$>
+                                \(probably) partial result [default (-1)")))<$$>
hunk ./src/Igor2/UI/Help.hs 81
-                                \not yet exhausted continue until N-best \
-                                \solution has been fount. (probably) partial \
-                                \result (in debug mode only) \
-                                \[default 1]"))) <$$>
+                                \not yet exhausted tr< to finish hypotheses \ 
+                                \with same rating. If N>1 also the N-best \
+                                \solutions res returned, which may be partial \
+                                \result.) \
+                                \[default (-1)]"))) <$$>
hunk ./src/Igor2/UI/UIStarter.hs 1
-
hunk ./src/Igor2/UI/UIStarter.hs 53
-    { verbose   :: Bool
-    , simplify  :: Bool
-    , debug     :: Bool
-    , dumpLog   :: Bool
-    , enhanced  :: Bool
+    { config :: SCR
hunk ./src/Igor2/UI/UIStarter.hs 55
-    , verbosity :: Priority
hunk ./src/Igor2/UI/UIStarter.hs 56
-    , maxLoops  :: Integer
-    , maxTiers  :: Integer
-    , cmpRecArg :: RecArgComp
hunk ./src/Igor2/UI/UIStarter.hs 58
-    , ctxtFile  :: String
hunk ./src/Igor2/UI/UIStarter.hs 61
+             
+ctxFile = scr_ctxFile . config
+debug  = scr_debug . config
+simplify = scr_simplify . config
+enhanced = scr_enhanced . config
+dumpLog = scr_dumpLog . config
+verbose = scr_verbose . config
+verbosity = scr_verbosity . config
+maxLoops = scr_maxLoops . config
+maxTiers = scr_maxTiers . config
+cmpRecArg = scr_cmpRecArg . config
+
hunk ./src/Igor2/UI/UIStarter.hs 85
-    { verbose   = False
-    , simplify  = False
-    , debug     = False
-    , dumpLog   = False
-    , enhanced  = False
+    { config = defaultSCR
hunk ./src/Igor2/UI/UIStarter.hs 87
-    , verbosity = DEBUG
hunk ./src/Igor2/UI/UIStarter.hs 88
-    , maxLoops  = 20
-    , maxTiers  = 1
-    , cmpRecArg = AWise
hunk ./src/Igor2/UI/UIStarter.hs 90
-    , ctxtFile  = ""
hunk ./src/Igor2/UI/UIStarter.hs 215
-                  putDoc (text "File loaded in" <+> d) >> return (False,s{context=ctx, ctxtFile=p})
+                  putDoc (text "File loaded in" <+> d) >> 
+                  return (False,s{context=ctx, config=(config s){scr_ctxFile=p}})
hunk ./src/Igor2/UI/UIStarter.hs 235
-    test e d i = ( do r <- (interprete (ctxtFile s) $ prepare (d !! (i-1)) e) 
+    test e d i = ( do r <- (interprete (ctxFile s) $ prepare (d !! (i-1)) e) 
hunk ./src/Igor2/UI/UIStarter.hs 255
-            (res,t) <- time (startSynthesis (spec_ctx $  context s) newConfig ts bs)
-            let s' = either (const s) ((modifyHistory s (tgts,bgks)).snd) (fst $ res) 
-            printResult s' newConfig t res
-            return (False, s')
-    where
-    newConfig = (setDebug . debug $ s) . 
-                (setSimplify . simplify $  s) .
-                (setEnhanced . enhanced $ s) . 
-                (setEnhanced . enhanced $ s) . 
-                (setDumpLog . dumpLog $ s) .
-                (setVerbose . verbose $ s) .
-                (setVerbosity . verbosity $ s) .
-                (setMaxLoops . maxLoops $ s) .
-                (setMaxTiers . maxTiers $ s) .
-                (setCmpRecArg . cmpRecArg $ s) .
-                (setTargets tgts) .
-                (setBackground bgks) .
-                (addPredicates []) .
-                (setCtxFile . ctxtFile $ s)
-                $ defaultSCR
+          (res,t) <- time (startSynthesis (spec_ctx $ context s)(config s) ts bs)
+          let s' = either (const s)((modifyHistory s (tgts,bgks)).snd)(fst $ res) 
+          printResult s' (config s) t res
+          return (False, s')
hunk ./src/Igor2/UI/UIStarter.hs 413
-            debug,   \ v s -> s { debug  = v })
+            debug,     \ v s -> s{ config=(config s){scr_debug = v }})
hunk ./src/Igor2/UI/UIStarter.hs 415
-            verbose, \ v s -> s { verbose  = v })
+            verbose,   \ v s -> s{ config=(config s){scr_verbose = v }})
hunk ./src/Igor2/UI/UIStarter.hs 417
-            dumpLog, \ v s -> s { dumpLog  = v })
+            dumpLog,   \ v s -> s{ config=(config s){scr_dumpLog  = v }})
hunk ./src/Igor2/UI/UIStarter.hs 419
-            simplify, \ v s -> s { simplify  = v })
+            simplify,  \ v s -> s{ config=(config s){scr_simplify  = v }})
hunk ./src/Igor2/UI/UIStarter.hs 421
-            enhanced, \ v s -> s { enhanced  = v })
+            enhanced,  \ v s -> s{ config=(config s){scr_enhanced  = v }})
hunk ./src/Igor2/UI/UIStarter.hs 423
-            typeCheck, \ v s -> s { typeCheck  = v })
+            typeCheck, \ v s -> s{ typeCheck  = v })
hunk ./src/Igor2/UI/UIStarter.hs 429
-            colWidth,  \ v s -> s { colWidth = v}),
+            colWidth,  \ v s -> s{ colWidth = v}),
hunk ./src/Igor2/UI/UIStarter.hs 431
-            maxLoops,  \ v s -> s { maxLoops = v}),
+            maxLoops,  \ v s -> s{ config=(config s){scr_maxLoops = v}}),
hunk ./src/Igor2/UI/UIStarter.hs 433
-            maxTiers,  \ v s -> s { maxTiers = v}),
+            maxTiers,  \ v s -> s{ config=(config s){ scr_maxTiers = v}}),
hunk ./src/Igor2/UI/UIStarter.hs 435
-            verb2Int.verbosity,  \ v s -> s { verbosity = int2Verb v})
+            verb2Int.verbosity,  \ v s -> s{ config=(config s){scr_verbosity = int2Verb v}})
hunk ./src/Igor2/UI/UIStarter.hs 440
-    [ ("dumpDir",          "Directory log files are dumped to",
-            dumpDir,  \ v s -> s { dumpDir = v}),
-      ("recArgCmp",        "How to compare recursive arguments to ensure termination",
-            show.cmpRecArg,  \ v s -> s { cmpRecArg = read v})
+    [ ("dumpDir", "Directory log files are dumped to",
+            dumpDir,  \ v s -> s{ dumpDir = v}),
+      ("recArgCmp", "How to compare recursive arguments to ensure termination",
+            show.cmpRecArg,  \ v s -> s{ config=(config s){scr_cmpRecArg = read v}})