[completely reorganised the module structure
martin.hofmann@uni-bamberg.de**20091127143429] adddir ./src/Igor2
move ./src/Logging ./src/Igor2/Logging
move ./src/Logging.hs ./src/Igor2/Logging.hs
move ./src/RuleDevelopment ./src/Igor2/RuleDevelopment
move ./src/RuleDevelopment.hs ./src/Igor2/RuleDevelopment.hs
adddir ./src/Igor2/Data
move ./src/Data/CallDependencies.hs ./src/Igor2/Data/CallDependencies.hs
move ./src/Data/GlobalConfig.hs ./src/Igor2/Config.hs
move ./src/Data/HypoSpace.hs ./src/Igor2/Data/HypoSpace.hs
move ./src/Data/Hypotheses.hs ./src/Igor2/Data/Hypotheses.hs
move ./src/Data/IOData.hs ./src/Igor2/Data/IOData.hs
move ./src/Data/IgorMonad.hs ./src/Igor2/Data/IgorMonad.hs
move ./src/Data/Rules.hs ./src/Igor2/Data/Rules.hs
move ./src/Rating/Rateable.hs ./src/Igor2/Data/Rateable.hs
move ./src/SynthesisEngine.hs ./src/Igor2/SynthesisEngine.hs
move ./src/UI ./src/Igor2/UI
rmdir ./src/Rating
hunk ./igor2.cabal 9
-build-depends: MonadCatchIO-mtl >= 0.2, ansi-terminal >=0.5.0,
-               ansi-wl-pprint >=0.5, array -any, base >=4.0, bimap >=0.2,
-               bytestring >=0.9, containers >=0.2, cpphs >=1.3, directory >=1.0,
-               editline -any, fgl >=5.4, filepath -any, ghc >=6.10,
-               ghc-paths -any, haskell-src >=1.0,
-               haskell98 -any, hint >=0.3.2, hpc -any, mtl >=1.0, old-locale >=1.0,
-               old-time >=1.0, packedstring -any, parsec >=2.1, pretty -any,
-               process -any, random >=1.0, syb -any, template-haskell -any,
-               time >=1.1, unix >=2.3, utf8-string >=0.3
+build-depends: utf8-string >=0.3, unix >=2.3, time >=1.1,
+               template-haskell -any, syb -any, random >=1.0, process -any,
+               pretty -any, parsec >=2.1, packedstring -any, old-time >=1.0,
+               old-locale >=1.0, mtl >=1.0, hpc -any, hint >=0.3.2,
+               haskell98 -any, haskell-src >=1.0, ghc-paths -any, ghc >=6.10,
+               filepath -any, fgl >=5.4, editline -any, directory >=1.0,
+               cpphs >=1.3, containers >=0.2, bytestring >=0.9, bimap >=0.2,
+               base >=4.0, array -any, ansi-wl-pprint >=0.5,
+               ansi-terminal >=0.5.0, MonadCatchIO-mtl >=0.2
hunk ./igor2.cabal 23
-description: Igor2 is an analytical inductive program synthesis system, which addresses the problem of constructing recursive programs from incomplete specifications, typically input/output examples. In contrast to approaches of inductive logic programming and evolutionary computation, which are mainly search-based, analytical approaches have the advantage that synthesis effort is considerably lower. Igor2's approach guarantees that the induced programs are a minimal generalization over examples and terminate. 
+description: Igor2 is an analytical inductive program synthesis system, which addresses the problem of constructing recursive programs from incomplete specifications, typically input/output examples. In contrast to approaches of inductive logic programming and evolutionary computation, which are mainly search-based, analytical approaches have the advantage that synthesis effort is considerably lower. Igor2's approach guarantees that the induced programs are a minimal generalization over examples and terminate.
hunk ./igor2.cabal 49
-other-modules:
+other-modules: Data
hunk ./src/Igor2/Config.hs 2
-module Data.GlobalConfig (
+module Igor2.Config (
hunk ./src/Igor2/Config.hs 16
-import Logging
+import Igor2.Logging
hunk ./src/Igor2/Data/CallDependencies.hs 2
-module Data.CallDependencies( 
+module Igor2.Data.CallDependencies( 
hunk ./src/Igor2/Data/CallDependencies.hs 34
-import Logging
+import Igor2.Logging
hunk ./src/Igor2/Data/HypoSpace.hs 2
-module Data.HypoSpace (
+module Igor2.Data.HypoSpace (
hunk ./src/Igor2/Data/HypoSpace.hs 8
-    module Data.Hypotheses
+    module Igor2.Data.Hypotheses
hunk ./src/Igor2/Data/HypoSpace.hs 15
-import Rating.Rateable
-import Data.Hypotheses
-import Data.IOData
+import Igor2.Data.Rateable
+import Igor2.Data.Hypotheses
+import Igor2.Data.IOData
hunk ./src/Igor2/Data/HypoSpace.hs 20
-import Logging
+import Igor2.Logging
hunk ./src/Igor2/Data/Hypotheses.hs 2
-module Data.Hypotheses (
+module Igor2.Data.Hypotheses (
hunk ./src/Igor2/Data/Hypotheses.hs 12
-    module Data.CallDependencies,
-    module Data.Rules
+    module Igor2.Data.CallDependencies,
+    module Igor2.Data.Rules
hunk ./src/Igor2/Data/Hypotheses.hs 37
-import Data.Rules hiding (sameSymAt)
-import Data.IOData
+import Igor2.Data.Rules hiding (sameSymAt)
+import Igor2.Data.IOData
hunk ./src/Igor2/Data/Hypotheses.hs 40
-import Data.CallDependencies -- (CallDep, Call, tryAddCall, noCalls, cycles)
+import Igor2.Data.CallDependencies -- (CallDep, Call, tryAddCall, noCalls, cycles)
hunk ./src/Igor2/Data/Hypotheses.hs 42
-import Rating.Rateable
-import Logging
+import Igor2.Data.Rateable
+import Igor2.Logging
hunk ./src/Igor2/Data/IOData.hs 2
-module Data.IOData (
+module Igor2.Data.IOData (
hunk ./src/Igor2/Data/IOData.hs 11
-    )where 
+    )where
hunk ./src/Igor2/Data/IOData.hs 13
-import Data.Rules
+import Igor2.Data.Rules
hunk ./src/Igor2/Data/IOData.hs 17
-import Logging
+import Igor2.Logging
hunk ./src/Igor2/Data/IgorMonad.hs 2
-module Data.IgorMonad (
+module Igor2.Data.IgorMonad (
hunk ./src/Igor2/Data/IgorMonad.hs 18
-    module Data.IOData,
+    module Igor2.Data.IOData,
hunk ./src/Igor2/Data/IgorMonad.hs 20
-    module Data.Hypotheses
+    module Igor2.Data.Hypotheses
hunk ./src/Igor2/Data/IgorMonad.hs 28
-import Data.IOData
-import Data.GlobalConfig
-import Data.HypoSpace
- 
-import Data.Hypotheses
+import Igor2.Config
+import Igor2.Logging
+import Igor2.Data.IOData
+import Igor2.Data.HypoSpace
+import Igor2.Data.Hypotheses
hunk ./src/Igor2/Data/IgorMonad.hs 41
-import Logging
hunk ./src/Igor2/Data/Rateable.hs 2
-module Rating.Rateable (
+module Igor2.Data.Rateable (
hunk ./src/Igor2/Data/Rateable.hs 8
-import Data.CallDependencies
-import Data.IOData
+import Igor2.Data.CallDependencies
+import Igor2.Data.IOData
hunk ./src/Igor2/Data/Rateable.hs 12
-import Logging
+import Igor2.Logging
hunk ./src/Igor2/Data/Rules.hs 2
-module Data.Rules (
+module Igor2.Data.Rules (
hunk ./src/Igor2/Data/Rules.hs 41
+import Syntax.IFTemplateHaskell (pprint)
hunk ./src/Igor2/Data/Rules.hs 43
-import Logging
+import Igor2.Logging
hunk ./src/Igor2/Logging.hs 2
-module Logging (
+module Igor2.Logging (
hunk ./src/Igor2/Logging.hs 4
-       module Logging.Logger
+       module Igor2.Logging.Logger
hunk ./src/Igor2/Logging.hs 8
-import Logging.Logger
+import Igor2.Logging.Logger
hunk ./src/Igor2/Logging/Log.hs 2
-module Logging.Log (
+module Igor2.Logging.Log (
hunk ./src/Igor2/Logging/Logger.hs 2
-module Logging.Logger 
+module Igor2.Logging.Logger 
hunk ./src/Igor2/Logging/Logger.hs 19
-    module Logging.Log,     -- logging
+    module Igor2.Logging.Log,     -- logging
hunk ./src/Igor2/Logging/Logger.hs 39
-import Logging.Log      -- logging
+import Igor2.Logging.Log      -- logging
hunk ./src/Igor2/RuleDevelopment.hs 2
-module RuleDevelopment (
+module Igor2.RuleDevelopment (
hunk ./src/Igor2/RuleDevelopment.hs 8
-import RuleDevelopment.Partition
-import RuleDevelopment.Subfunction
-import RuleDevelopment.Matching
-import RuleDevelopment.UniProp
-import Data.IOData
-import Data.IgorMonad
-import Logging
+import Igor2.RuleDevelopment.Partition
+import Igor2.RuleDevelopment.Subfunction
+import Igor2.RuleDevelopment.Matching
+import Igor2.RuleDevelopment.UniProp
+import Igor2.Data.IOData
+import Igor2.Data.IgorMonad
+import Igor2.Logging
hunk ./src/Igor2/RuleDevelopment/Abduce.hs 2
-module RuleDevelopment.Abduce where
+module Igor2.RuleDevelopment.Abduce where
hunk ./src/Igor2/RuleDevelopment/Matching.hs 2
-module RuleDevelopment.Matching where
+module Igor2.RuleDevelopment.Matching where
hunk ./src/Igor2/RuleDevelopment/Matching.hs 13
-import Data.Rules
-import Data.GlobalConfig
-import Data.IgorMonad
-import Data.CallDependencies
-import Logging
hunk ./src/Igor2/RuleDevelopment/Matching.hs 14
+import Igor2.Config
+import Igor2.Logging
+import Igor2.Data.Rules
+import Igor2.Data.IgorMonad
+import Igor2.Data.CallDependencies
hunk ./src/Igor2/RuleDevelopment/Partition.hs 2
-module RuleDevelopment.Partition (
+module Igor2.RuleDevelopment.Partition (
hunk ./src/Igor2/RuleDevelopment/Partition.hs 8
-import Data.IgorMonad
-import Syntax
-import qualified Data.Rules as R (sameSymAt)
hunk ./src/Igor2/RuleDevelopment/Partition.hs 13
-import IOInterpreter
hunk ./src/Igor2/RuleDevelopment/Partition.hs 14
-import Logging
+
+import Igor2.Logging
+import IOInterpreter
+import Igor2.Data.IgorMonad
+import qualified Igor2.Data.Rules as R (sameSymAt)
+import Syntax
hunk ./src/Igor2/RuleDevelopment/Subfunction.hs 2
-module RuleDevelopment.Subfunction where
+module Igor2.RuleDevelopment.Subfunction where
hunk ./src/Igor2/RuleDevelopment/Subfunction.hs 4
-import Data.IgorMonad
-import Data.IOData
-import Data.Rules
+import Igor2.Data.IgorMonad
+import Igor2.Data.IOData
+import Igor2.Data.Rules
hunk ./src/Igor2/RuleDevelopment/Subfunction.hs 11
-import Logging
+import Igor2.Logging
hunk ./src/Igor2/RuleDevelopment/Subfunction.hs 19
-      then subfunction rf 
+      then subfunction rf
hunk ./src/Igor2/RuleDevelopment/UniProp.hs 2
-module RuleDevelopment.UniProp where
+module Igor2.RuleDevelopment.UniProp where
hunk ./src/Igor2/RuleDevelopment/UniProp.hs 12
-import Data.IgorMonad
-import Data.CallDependencies
-import Data.Rules
+import Igor2.Data.IgorMonad
+import Igor2.Data.CallDependencies
+import Igor2.Data.Rules
hunk ./src/Igor2/RuleDevelopment/UniProp.hs 19
-import Logging
+import Igor2.Logging
hunk ./src/Igor2/SynthesisEngine.hs 2
-module SynthesisEngine (
+module Igor2.SynthesisEngine (
hunk ./src/Igor2/SynthesisEngine.hs 11
-import Data.IgorMonad
-import Data.IOData
-import Data.Rules (hypos2decs)
-import Data.GlobalConfig
-import Data.HypoSpace
-import RuleDevelopment
hunk ./src/Igor2/SynthesisEngine.hs 13
-import qualified Data.MySet as S
hunk ./src/Igor2/SynthesisEngine.hs 14
-import Data.Util
hunk ./src/Igor2/SynthesisEngine.hs 20
-import Logging
hunk ./src/Igor2/SynthesisEngine.hs 22
+import Data.Util
+import qualified Data.MySet as S
+
+import Igor2.Config
+import Igor2.Data.HypoSpace
+import Igor2.Data.IgorMonad
+import Igor2.Data.IOData
+import Igor2.Data.Rules (hypos2decs)
+import Igor2.Logging
+import Igor2.RuleDevelopment
+
hunk ./src/Igor2/UI/Help.hs 2
-module UI.Help (verboseHelp) where
-import Logging
+module Igor2.UI.Help (verboseHelp) where
+import Igor2.Logging
hunk ./src/Igor2/UI/REPLoop.hs 5
-module UI.REPLoop(REPL(..), readEvalPrintLoop) where
+module Igor2.UI.REPLoop(REPL(..), readEvalPrintLoop) where
hunk ./src/Igor2/UI/UIStarter.hs 2
-module UI.UIStarter where
+module Igor2.UI.UIStarter where
hunk ./src/Igor2/UI/UIStarter.hs 14
-import Data.Rules
hunk ./src/Igor2/UI/UIStarter.hs 29
-import Data.GlobalConfig
+import Igor2.Config
+import Igor2.Data.Rules
+import Igor2.UI.REPLoop
+import Igor2.UI.Help
+import Igor2.SynthesisEngine
+import Igor2.Logging
hunk ./src/Igor2/UI/UIStarter.hs 36
-import UI.REPLoop
-import UI.Help
-import SynthesisEngine
-import Logging
hunk ./src/Main.hs 6
-import System.Environment    
+import System.Environment
hunk ./src/Main.hs 12
-import qualified UI.UIStarter as UI
+import qualified Igor2.UI.UIStarter as UI
hunk ./src/Main.hs 16
-     
+
hunk ./src/Main.hs 61
-    when (optShowHelp opts) $ 
-        putStrLn ("IgorII " ++ UI.version) >>   
-        putStrLn usage >> UI.showHelp >> 
+    when (optShowHelp opts) $
+        putStrLn ("IgorII " ++ UI.version) >>
+        putStrLn usage >> UI.showHelp >>
hunk ./src/Main.hs 65
-    when (optShowVersion opts) $ 
+    when (optShowVersion opts) $
hunk ./src/Main.hs 70
-                else print ("No such file: " ++ (show batch)) >> 
+                else print ("No such file: " ++ (show batch)) >>
hunk ./src/Main.hs 72
-      else if (not.null $ cmd) 
+      else if (not.null $ cmd)
hunk ./src/Main.hs 75
+
hunk ./src/PrettyPrinter.hs 22
-import Language.Haskell.TH --(Exp, Pat, Ppr(..), pprint)
+import Syntax.IFTemplateHaskell
hunk ./src/Syntax.hs 11
+    module Syntax.IFTemplateHaskell,
hunk ./src/Syntax.hs 23
+import Syntax.IFTemplateHaskell hiding (Name, mkName, Type(..))
hunk ./src/Syntax/Builder.hs 19
+
hunk ./src/Syntax/Builder.hs 22
-import Syntax.IFTemplateHaskell
+import Syntax.IFTemplateHaskell hiding (Type(..))
hunk ./src/Syntax/Builder.hs 29
-import Logging
+--import Igor2.Logging
hunk ./src/Syntax/Class.hs 4
+    Name, mkName, 
hunk ./src/Syntax/Class.hs 9
-    module Syntax.IFTemplateHaskell,
hunk ./src/Syntax/Class.hs 17
-import Syntax.IFTemplateHaskell
+import Syntax.IFTemplateHaskell (Name, mkName)
hunk ./src/Syntax/Class/Antiunifier.hs 8
-    AU, getMap, incrCnt, getCnt, putImg,
+    AU, getMap, getCnt, putImg,
hunk ./src/Syntax/Class/Unifier.hs 30
-import Logging
+-- import Igor2.Logging
hunk ./src/Syntax/Context.hs 17
-import Syntax.IFTemplateHaskell
+import Syntax.IFTemplateHaskell hiding (Type(..))
hunk ./src/Syntax/Expressions.hs 19
-import Syntax.IFTemplateHaskell
-import qualified Language.Haskell.TH.Syntax as TH
+import Syntax.IFTemplateHaskell hiding (Type)
+import qualified Syntax.IFTemplateHaskell as TH (Type(..), Lit(..),Pat(..))
hunk ./src/Syntax/IFTemplateHaskell.hs 5
-    isTuple, isNil, isCons, Name, mkName,
+    isTuple, isNil, isCons,--  Name, mkName,
hunk ./src/Syntax/IFTemplateHaskell.hs 7
---    module Language.Haskell.TH,
+    module Language.Haskell.TH,
+    module Language.Haskell.TH.Ppr,
hunk ./src/Syntax/IFTemplateHaskell.hs 10
-    module Language.Haskell.TH.Ppr
hunk ./src/Syntax/IFTemplateHaskell.hs 13
---                           , Clause (Clause)
---                           , Body (NormalB)
---                           , Exp (VarE, ConE, LitE, ListE, TupE, InfixE, AppE)
---                           , Pat (VarP, ConP, LitP, ListP, TupP, InfixP) 
+                           , Clause (Clause)
+                           , Body (NormalB)
+                           , Exp (VarE, ConE, LitE, ListE, TupE, InfixE, AppE)
+                           , Pat (VarP, ConP, LitP, ListP, TupP, InfixP) 
hunk ./src/Syntax/IFTemplateHaskell.hs 18
---                           , Lit (..)
+                           , Lit (..)
hunk ./src/Syntax/IFTemplateHaskell.hs 20
---                           , Type (ForallT, VarT, ConT, TupleT, ArrowT, ListT, AppT)
+                           , Type (ForallT, VarT, ConT, TupleT, ArrowT, ListT, AppT)
hunk ./src/Syntax/IFTemplateHaskell.hs 31
-import Language.Haskell.TH.Ppr
+import Language.Haskell.TH.Ppr (pprint)
hunk ./src/Syntax/UnifyTy.hs 22
-import Logging
+--import Igor2.Logging
