[BUGFIX self call of sub fun was not allowed
martin.hofmann@uni-bamberg.de**20090612013308] hunk ./src/Data/CallDependencies.hs 102
-       else error "Call not admissible!"
+       else error $ "Call "++ (show c) ++ " not admissible in " ++ (show cd)
hunk ./src/Data/CallDependencies.hs 108
-       else fail "Call not admissible!"
+       else fail $ "Call "++ (show c) ++ " not admissible in " ++ (show cd)
hunk ./src/Data/HypoSpace.hs 32
+import Data.Either (partitionEithers)
hunk ./src/Data/HypoSpace.hs 89
-    develop h = catMaybes $ [ developH ro adv h | adv <- advs]
+    develop h = catMaybes [ developH ro adv h | adv <- advs]
+--                let (l,r) = partitionEithers [ developH ro adv h | adv <- advs]
+--                in trace ("XXX\n" ++ (unlines l)) $ r
hunk ./src/RuleDevelopment/Matching.hs 28
-    let bkgcalls  = map (flip (,) (Just GT)) bknames
+    let bgkcalls  = map (flip (,) (Just GT)) bknames
hunk ./src/RuleDevelopment/Matching.hs 30
-    let tgtcalls  = map (flip (,) (Just LT)) tgtnames 
+    let tgtcalls  = map (flip (,) (Just LT)) ((name cr):tgtnames) 
hunk ./src/RuleDevelopment/Matching.hs 32
-    let allcalls  =  M.toList $ foldl (flip $ uncurry M.insert) scope (bkgcalls ++ tgtcalls)
-    -- bkgcalls overwrites previous calls in scope,
+    let allcalls  =  M.toList $ foldl (flip $ uncurry M.insert) scope (bgkcalls ++ tgtcalls)
+    -- bkgcalls and tgtcalls may overwrite calls in scope,
hunk ./src/RuleDevelopment/Matching.hs 37
-    llogIN ( text "Trying calls to:" <^> pretty allcalls )
+    llogIN ( text "Call Dependencies:" <^> pretty cd )
+--    llogIN ( text "scope:" <^> pretty scope )
+--    llogIN ( text "bgkcalls:" <^> pretty bgkcalls )
+--    llogIN ( text "tgtcalls:" <^> pretty tgtcalls )
+    llogIN ( text "Allowed calls:" <^> pretty allcalls)
hunk ./src/RuleDevelopment/Matching.hs 67
-     llogIN (text "Need to try matchings (C vs T)" <$>
+     llogIN (text "No direct calls possible! Need to try matchings (C vs T)" <$>
hunk ./src/RuleDevelopment/Matching.hs 105
-     return $ map ((,) =<< comp (lhs.crul $ scio)) $ catMaybes pats
+     return $ map ((,) =<< flip comp (lhs.crul $ cr)) $ catMaybes pats