[code cleaning
martin.hofmann@uni-bamberg.de**20090715050716] hunk ./src/Data/IgorMonad.hs 8
-    setTarget, getTarget, addBgk, remBgk, currentBestHypos, getEvidence, getSearchSpace, 
-    tick, loopCount, loopsCount, hypoCount, isDebug, inEnhanced, ifIsSet, maxLoops, getPatComparison, background, 
-    targets, addIO, breakupM, coverAll, evalIO,
+    setTarget, getTarget, addBgk, remBgk, currentBestHypos, getEvidence, 
+    getSearchSpace, tick, loopCount, loopsCount, hypoCount, isDebug, 
+    inEnhanced, ifIsSet, maxLoops, getPatComparison, background, targets, 
+    predicates, addIO, breakupM, coverAll, evalIO,
hunk ./src/Data/IgorMonad.hs 23
+import Context.SynthesisContext 
+
hunk ./src/Data/IgorMonad.hs 40
-    { iodata :: !IOData
-    , searchSpace :: !HSpace
-    , loopcount :: [(Name,Int)]
-    , config :: SCR
+    { igor_io  :: !IOData
+    , igor_sp  :: !HSpace
+    , igor_lc  :: [(Name,Int)]
+    , igor_cnf :: SCR
+    , igor_ctx :: SynCtx
hunk ./src/Data/IgorMonad.hs 63
-getTarget = gets $ fst.head.loopcount
+getTarget = gets $ fst.head.igor_lc
hunk ./src/Data/IgorMonad.hs 72
-setupTarget n ( Igor iod _ lc cf) = do
+setupTarget n ( Igor iod _ lc cf ct) = do
hunk ./src/Data/IgorMonad.hs 74
-    return $ Igor iod (initHSpace initH) ((n,0):lc) cf  
+    return $ Igor iod (initHSpace initH) ((n,0):lc) cf ct  
hunk ./src/Data/IgorMonad.hs 80
-initIgor :: [(Name,Rules)] -> SCR -> Igor
+initIgor :: [(Name,Rules)] -> SCR -> SynCtx -> Igor
hunk ./src/Data/IgorMonad.hs 83
+--------------------------------------------------------------------------------
+-- Monadic operations on 'Context'
+--------------------------------------------------------------------------------
hunk ./src/Data/IgorMonad.hs 87
+context :: IM SynCtx
+context = gets igor_ctx
hunk ./src/Data/IgorMonad.hs 93
-isDebug = gets $ scr_debug.config
+isDebug = gets $ scr_debug.igor_cnf
hunk ./src/Data/IgorMonad.hs 96
-inEnhanced = gets $ scr_enhanced.config
+inEnhanced = gets $ scr_enhanced.igor_cnf
hunk ./src/Data/IgorMonad.hs 104
-maxLoops = gets $ scr_maxLoops.config
+maxLoops = gets $ scr_maxLoops.igor_cnf
hunk ./src/Data/IgorMonad.hs 107
-recArgComp = gets $ scr_recArgComp.config
+recArgComp = gets $ scr_cmpRecArg.igor_cnf
hunk ./src/Data/IgorMonad.hs 115
-                    
+
+predicates :: IM [(Name,Type)]
+predicates = gets $ scr_preds.igor_cnf
+
hunk ./src/Data/IgorMonad.hs 120
-targets = gets $ scr_tgts.config
+targets = gets $ scr_tgts.igor_cnf
hunk ./src/Data/IgorMonad.hs 123
-background = gets $ scr_bgks.config
+background = gets $ scr_bgks.igor_cnf
hunk ./src/Data/IgorMonad.hs 127
-    bgk <- gets $ scr_bgks.config
+    bgk <- gets $ scr_bgks.igor_cnf
hunk ./src/Data/IgorMonad.hs 129
-    modify (\i@(Igor _ _ _ c) -> i{config=c{scr_bgks=bgk'}})
+    modify (\i@(Igor _ _ _ c _) -> i{igor_cnf=c{scr_bgks=bgk'}})
hunk ./src/Data/IgorMonad.hs 133
-    bgk <- gets $ scr_bgks.config
+    bgk <- gets $ scr_bgks.igor_cnf
hunk ./src/Data/IgorMonad.hs 135
-    modify (\i@(Igor _ _ _ c) -> i{config=c{scr_bgks=bgk'}})
+    modify (\i@(Igor _ _ _ c _) -> i{igor_cnf=c{scr_bgks=bgk'}})
hunk ./src/Data/IgorMonad.hs 140
-currentBestHypos = liftM bestHypos $! gets searchSpace
+currentBestHypos = liftM bestHypos $! gets igor_sp
hunk ./src/Data/IgorMonad.hs 143
-getSearchSpace = gets searchSpace
+getSearchSpace = gets igor_sp
hunk ./src/Data/IgorMonad.hs 147
-    modify $ \igor@(Igor _ sp _ _) ->
-      igor{searchSpace = f sp}
+    modify $ \igor@(Igor _ sp _ _ _) ->
+      igor{igor_sp = f sp}
hunk ./src/Data/IgorMonad.hs 154
-getEvidence = gets iodata
+getEvidence = gets igor_io
hunk ./src/Data/IgorMonad.hs 158
-    modify $ \igor@(Igor io _ _ _) ->
-      igor{iodata = f io}
+    modify $ \igor@(Igor io _ _ _ _) ->
+      igor{igor_io = f io}
hunk ./src/Data/IgorMonad.hs 162
-tick = get >>= \i@(Igor _ _ ((n,lc):lcs) _) ->
-          put i{loopcount = (n,lc+1):lcs}
+tick = get >>= \i@(Igor _ _ ((n,lc):lcs) _ _) ->
+          put i{igor_lc = (n,lc+1):lcs}
hunk ./src/Data/IgorMonad.hs 169
-loopCount = gets $ snd.head.loopcount  
+loopCount = gets $ snd.head.igor_lc  
hunk ./src/Data/IgorMonad.hs 172
-loopsCount = gets $ loopcount
+loopsCount = gets $ igor_lc
hunk ./src/Data/IgorMonad.hs 175
-hypoCount = gets $ countHypos.searchSpace
+hypoCount = gets $ countHypos.igor_sp
hunk ./src/Data/IgorMonad.hs 179
-    i@(Igor iod _ _ _) <- get
+    i@(Igor iod _ _ _ _) <- get
hunk ./src/Data/IgorMonad.hs 181
-    put i{iodata = iod'}
+    put i{igor_io = iod'}
hunk ./src/Data/IgorMonad.hs 185
-breakupM rf = gets iodata >>= return . (breakup rf)
+breakupM rf = gets igor_io >>= return . (breakup rf)
hunk ./src/Data/IgorMonad.hs 191
-coverAll n = gets iodata >>= lift . fuse . (getAll n)
+coverAll n = gets igor_io >>= lift . fuse . (getAll n)
hunk ./src/Data/IgorMonad.hs 205
-                        pretty (iodata i) <$>
-                        pretty (searchSpace  i)<$>
-                        text "LOOPCOUNT: " <$> pretty (loopcount i))
+                        pretty (igor_io i) <$>
+                        pretty (igor_sp i) <$>
+                        text "LOOPCOUNT: " <$> pretty (igor_lc i))