[various, code cosmetics, import fixes, helper funs
martin.hofmann@uni-bamberg.de**20090406150547] hunk ./src/Logging/Logger.hs 179
+noLog :: (Monad m)=> LM a -> m a
+noLog m =  
+    case fst (runLM m) of 
+        Left s  -> fail s
+        Right a -> return a        
hunk ./src/Syntax/Types.hs 1
-
+{-# OPTIONS_GHC -fglasgow-exts -XTemplateHaskell #-}
+module Syntax.Types where
+
+import Language.Haskell.TH (Type(..))
+
+data TyTagged a = a ::: Type
+
+
+class Tagged a where
+    tytag :: a -> TyTagged a
+    
+    
hunk ./src/Syntax/Unifier.hs 6
-    Unifieable(mgu, applyMgu,matches, matchesLs, equal, equalLs, subsumes, subsumesLs)
+    Unifieable(mgu, applyMgu, apply, matches, matchesLs, equal, equalLs, subsumes, subsumesLs)
hunk ./src/Syntax/Unifier.hs 15
-import Syntax.Class (unfoldAppE, subtermOf, Term)
+import Syntax.Terms (unfoldAppE, subtermOf, Term)
hunk ./src/Syntax/Unifier.hs 39
-        
+    apply = unLM . applyMgu        
hunk ./src/UI/REPLoop.hs 23
+                    addHistory line
hunk ./src/UI/REPLoop.hs 28
-                        addHistory line
hunk ./src/UI/UIStarter.hs 14
+import Logging hiding (integer)
hunk ./src/UI/UIStarter.hs 149
-getSettings s = unlines $ 
-    [ "" , "Current settings" ] ++
-    [ "    " ++ (if getter s then "+" else "-") ++ name 
-             ++ replicate (20 - length name) ' ' ++ descr |
-                    (name, descr, getter, _setter) <- flags ] ++
-    [""] ++
-    ["    " ++ name ++ replicate (10 - length name) ' ' ++  " = " 
-             ++ show (getter s) ++ replicate (15 - length name) ' ' ++ descr |
-                    (name,descr,getter,_setter) <- options] ++
-    ["    " ++ (show (context s))] 
+getSettings s = show $ 
+    text  "Current settings" <$>
+    (indent 2 $ vcat [ fill 25 (text $ (if getter s then "+" else "-") ++ name) <> text descr|
+                    (name, descr, getter, _setter) <- flags ] <$>
+                vcat [ fill 25 ((fill 15 (text name) <> text " = ") <> text (show (getter s))) <> text descr |
+                    (name,descr,getter,_setter) <- options] <$>
+                if verbose s then  pretty (context s) else text "" ) 