classpool: staticfields calculation: bugfix

[mate.git] / Mate / ClassPool.hs

diff --git a/Mate/ClassPool.hs b/Mate/ClassPool.hs
index 816c73b98ef4b7b5e1e9922838dae4776d3e915f..8b3e8a961fdb71af97418061fe2f23f8ceeb3041 100644 (file)
--- a/Mate/ClassPool.hs
+++ b/Mate/ClassPool.hs
@@ -197,7 +197,14 @@ calculateFields :: Class Direct -> Maybe ClassInfo -> IO (FieldMap, FieldMap)
 calculateFields cf superclass = do
     -- TODO(bernhard): correct sizes. int only atm
 
-    let (sfields, ifields) = span (S.member ACC_STATIC . fieldAccessFlags) (classFields cf)
+    -- TODO(bernhard): nicer replacement for `myspan'
+    let (sfields, ifields) = myspan (S.member ACC_STATIC . fieldAccessFlags) (classFields cf)
+        myspan :: (a -> Bool) -> [a] -> ([a], [a])
+        myspan _ [] = ([],[])
+        myspan p (x:xs)
+          | p x = (x:ns, ni)
+          | otherwise = (ns, x:ni)
+          where (ns,ni) = myspan p xs
 
     staticbase <- mallocClassData $ fromIntegral (length sfields) * 4
     let i_sb = fromIntegral $ ptrToIntPtr staticbase