[verbosity flag removed from Main, but added as an option to SCR
martin.hofmann@uni-bamberg.de**20090714023018] hunk ./src/Data/GlobalConfig.hs 21
+    , scr_verbose    :: Bool
hunk ./src/Data/GlobalConfig.hs 27
+    , scr_preds      :: [Name]
hunk ./src/Data/GlobalConfig.hs 33
-defaultSCR = SCR False False False False NOTICE (-1) Linear [] []
+defaultSCR = SCR False False False False False NOTICE (-1) Linear [] [] []
hunk ./src/Main.hs 18
- { optVerbose     :: Bool
- , optNoBanner    :: Bool
+ { optNoBanner    :: Bool
hunk ./src/Main.hs 25
- { optVerbose     = False
- , optNoBanner    = False
+ { optNoBanner    = False
hunk ./src/Main.hs 33
- [ Option ['v']      ["verbose"]
-     (NoArg (\ opts -> opts { optVerbose = True }))
-     "Chatty output on stdout"
- , Option ['V']      ["version"]
+ [ Option ['v']      ["version"]
hunk ./src/Main.hs 55
-    header = "Usage: igor [OPTION...] [CMD1 , CMD2 , ...]"
+    header = "Usage: igor [OPTION...] [CMD1 \\; CMD2 \\; ...]"
hunk ./src/Main.hs 60
-    let state = UI.defaultState{ UI.verbose=optVerbose opts
-                               , UI.noBanner=optNoBanner opts}
+    let noBanner = optNoBanner opts
hunk ./src/Main.hs 69
-              if e then UI.runBatch state batch
+              if e then UI.runBatch noBanner batch
hunk ./src/Main.hs 73
-              then UI.runCmdLine state cmd
-              else UI.runInteractive state
+              then UI.runCmdLine noBanner cmd
+              else UI.runInteractive
hunk ./src/SynthesisEngine.hs 40
-    logstate = mkLogState (scr_verbosity conf) (scr_debug conf) (scr_dumpLog conf)
+    logstate = mkLogState (scr_verbosity conf) (scr_verbose conf) (scr_dumpLog conf)
hunk ./src/UI/UIStarter.hs 53
-    { noBanner  :: Bool
-    , verbose   :: Bool
+    { verbose   :: Bool
hunk ./src/UI/UIStarter.hs 80
-    { noBanner  = False
-    , verbose   = False
+    { verbose   = False
hunk ./src/UI/UIStarter.hs 105
-runInteractive :: EnvState -> IO ()
-runInteractive state = do
+runInteractive :: IO ()
+runInteractive = do
hunk ./src/UI/UIStarter.hs 108
-    readEvalPrintLoop (genRepl state)
+    readEvalPrintLoop (genRepl defaultState)
hunk ./src/UI/UIStarter.hs 110
-runBatch :: EnvState -> FilePath -> IO ()
-runBatch state file = do
-    when (not.noBanner $ state) $ sayHello False
+runBatch :: Bool -> FilePath -> IO ()
+runBatch noBanner file = do
+    when (not noBanner) $ sayHello False
hunk ./src/UI/UIStarter.hs 114
-    (q,state') <- loadBatch state file
+    (q,state') <- loadBatch defaultState file
hunk ./src/UI/UIStarter.hs 120
-runCmdLine :: EnvState -> [String] -> IO ()
-runCmdLine state cmd = do
-    when (not.noBanner $ state) $ sayHello False
-    eval state (unwords cmd) >>= exit.snd
+runCmdLine :: Bool -> [String] -> IO ()
+runCmdLine noBanner cmd = do
+    when (not noBanner) $ sayHello False
+    eval defaultState (unwords cmd) >>= exit.snd
hunk ./src/UI/UIStarter.hs 259
-    newConfig = SCR (debug s) (simplify s)(enhanced s)(dumpLog s)(verbosity s)(maxLoops s) (cmpRecArg s) tgts bgks
+    newConfig = SCR (debug s)(simplify s)(enhanced s)(dumpLog s)(verbose s)(verbosity s)(maxLoops s) (cmpRecArg s) tgts bgks
hunk ./src/UI/UIStarter.hs 390
-    , (":test [<i>] <tgts> [with <bgks>] on \"cmd\"",
+    , (":test [<i>] <tgts> [with <bgks>] on \"expr\"",