[code cosmetics
martin.hofmann@uni-bamberg.de**20090402065125] hunk ./src/ExpEvaluator.hs 1
-{-# OPTIONS_GHC -fglasgow-exts -fth   #-}
+{-# OPTIONS_GHC -fglasgow-exts -XTemplateHaskell   #-}
hunk ./src/ExpEvaluator.hs 6
-import Language.Haskell.Interpreter.GHC
+import Language.Haskell.Interpreter
hunk ./src/ExpEvaluator.hs 12
-import Control.Exception ( catchDyn )
+import Control.Monad.Error ( catchError )
hunk ./src/UI/REPLoop.hs 5
-module UI.REPLoop(REPL(..), repl) where
+module UI.REPLoop(REPL(..), readEvalPrintLoop) where
hunk ./src/UI/REPLoop.hs 15
-repl :: REPL s -> IO ()
-repl p = do
+readEvalPrintLoop :: REPL s -> IO ()
+readEvalPrintLoop p = do
hunk ./src/UI/REPLoop.hs 35
+
+
hunk ./src/UI/UIStarter.hs 16
-version = "version 0.5.0"
+version = "v0.5.0"
hunk ./src/UI/UIStarter.hs 21
+
hunk ./src/UI/UIStarter.hs 34
-usage :: IO ()
-usage = putStrLn "Usage: igorII [path/to/batch/file]"
-
-genRepl :: EnvState -> REPL EnvState
-genRepl state = REPL {
-    repl_init = return (prompt,state),
-    repl_eval = eval,
-    repl_exit = exit
-    }
hunk ./src/UI/UIStarter.hs 35
+--------------------------------------------------------------------------------
hunk ./src/UI/UIStarter.hs 49
+
+genRepl :: EnvState -> REPL EnvState
+genRepl state = REPL {
+    repl_init = return (prompt,state),
+    repl_eval = eval,
+    repl_exit = exit
+    }
+
hunk ./src/UI/UIStarter.hs 61
-    putStrLn $ "Type ':help' to get help."
-    repl (genRepl state)
+    putStrLn $ "Type :h to get help."
+    readEvalPrintLoop (genRepl state)
hunk ./src/UI/UIStarter.hs 67
-    putStrLn $ "Starting IgorII in batch mode with file: " ++ file
+    putStrLn $ "Running IgorII in batch mode with file: " ++ file
hunk ./src/UI/UIStarter.hs 69
-    putStrLn $ "Batch processing finished."
+    putStrLn $ "...batch processing finished."
hunk ./src/UI/UIStarter.hs 72
-      else repl (genRepl state')
+      else readEvalPrintLoop (genRepl state')
hunk ./src/UI/UIStarter.hs 88
+--------------------------------------------------------------------------------
+-- 
hunk ./src/UI/UIStarter.hs 114
-    putStrLn $ "Welcome to IgorII " ++ version ++ "."
+    putStrLn $ "Welcome to IgorII. "
hunk ./src/UI/UIStarter.hs 118
-\.___                     .___.___                \n\
-\|   | ____   _____ ._____|   |   |    .__        \n\
-\|   |/ __ \\ /  __ \\|  __ \\   |   |  __|  |___ \n\ 
-\|   / /_/  X  /_/  )  | \\/   |   | /__    __/   \n\
-\|___\\___  / \\_____/|__|  |___|___|    |__|     \n\
-\   /_____/                                       \n\
-\"
+\.___                   ._._             \n\            
+\|   | ____  ___________| | |  ._       \n\
+\|   |/ __ \\/  _ \\_  __ \\ | | _| |__ \n\ 
+\|   / /_/  ) <_> )  | \\/ | |/_   _/   \n\
+\|___\\___  /\\____/|__|  |_|_|  |_|    \n\
+\   /_____/                  " ++ version ++ "\n"   
hunk ./src/UI/UIStarter.hs 136
+usage :: IO ()
+usage = putStrLn "Usage: igorII [path/to/batch/file]"
+
hunk ./src/UI/UIStarter.hs 142
-    [ "    " ++ (if gett s then "+" else "-") ++ name ++ replicate (20 - length name) ' ' ++ descr |
-                              (name, descr, gett, _set) <- flags ] ++
+    [ "    " ++ (if getter s then "+" else "-") ++ name 
+             ++ replicate (20 - length name) ' ' ++ descr |
+                    (name, descr, getter, _setter) <- flags ] ++
hunk ./src/UI/UIStarter.hs 148
-                              (name,descr,getter,_setter) <- options]
+                    (name,descr,getter,_setter) <- options]
hunk ./src/UI/UIStarter.hs 204
-    
+   
hunk ./src/UI/UIStarter.hs 207
-    [ ("maxHypos",          "maximal number of hypotheses", maxHypos,  \ v s -> s { maxHypos = v})
-    ] 
+    [ ("maxHypos",          "maximal number of hypotheses",  maxHypos,  \ v s -> s { maxHypos = v})
+    ]