hs-java: upgrade to 0.3.1

[mate.git] / Mate / Utilities.hs

diff --git a/Mate/Utilities.hs b/Mate/Utilities.hs
index 05220fce5447d5ded8ae15e72e91d51c57293b03..4ae0bac7d23c765199a3651686316d112e87de9b 100644 (file)
--- a/Mate/Utilities.hs
+++ b/Mate/Utilities.hs
@@ -11,45 +11,44 @@ import JVM.ClassFile
 import Mate.Types
 
 
--- TODO: actually this function already exists in hs-java-0.3!
-lookupMethod :: B.ByteString -> Class Resolved -> Maybe (Method Resolved)
-lookupMethod name cls = look (classMethods cls)
-  where
-    look [] = Nothing
-    look (f:fs)
-      | methodName f == name = Just f
-      | otherwise  = look fs
-
-buildMethodID :: Class Resolved -> Word16 -> MethodInfo
+buildMethodID :: Class Direct -> Word16 -> MethodInfo
 buildMethodID cls idx = MethodInfo (ntName nt) rc (ntSignature nt)
-  where
-  (CMethod rc nt) = (constsPool cls) M.! idx
+  where (rc, nt) = case constsPool cls M.! idx of
+                    (CMethod rc' nt') -> (rc', nt')
+                    (CIfaceMethod rc' nt') -> (rc', nt')
+                    _ -> error "buildMethodID: something wrong. abort."
 
-buildStaticFieldID :: Class Resolved -> Word16 -> StaticFieldInfo
+buildStaticFieldID :: Class Direct -> Word16 -> StaticFieldInfo
 buildStaticFieldID cls idx = StaticFieldInfo rc (ntName fnt)
-  where (CField rc fnt) = (constsPool cls) M.! idx
+  where (CField rc fnt) = constsPool cls M.! idx
 
-buildFieldOffset :: Class Resolved -> Word16 -> (B.ByteString, B.ByteString)
+buildFieldOffset :: Class Direct -> Word16 -> (B.ByteString, B.ByteString)
 buildFieldOffset cls idx = (rc, ntName fnt)
-  where (CField rc fnt) = (constsPool cls) M.! idx
+  where (CField rc fnt) = constsPool cls M.! idx
 
-buildClassID :: Class Resolved -> Word16 -> B.ByteString
+buildClassID :: Class Direct -> Word16 -> B.ByteString
 buildClassID cls idx = cl
-  where (CClass cl) = (constsPool cls) M.! idx
+  where (CClass cl) = constsPool cls M.! idx
 
-methodGetArgsCount :: Class Resolved -> Word16 -> Word32
+methodGetArgsCount :: Class Direct -> Word16 -> Word32
 methodGetArgsCount cls idx = fromIntegral $ length args
   where
-  (CMethod _ nt) = (constsPool cls) M.! idx
+  nt = case constsPool cls M.! idx of
+    (CMethod _ nt') -> nt'
+    (CIfaceMethod _ nt') -> nt'
+    _ -> error "methodGetArgsCount: something wrong. abort."
   (MethodSignature args _) = ntSignature nt
 
 -- TODO(bernhard): Extend it to more than just int, and provide typeinformation
-methodHaveReturnValue :: Class Resolved -> Word16 -> Bool
+methodHaveReturnValue :: Class Direct -> Word16 -> Bool
 methodHaveReturnValue cls idx = case ret of
     ReturnsVoid -> False;
     (Returns IntType) -> True;
     (Returns (ObjectType _)) -> True;
     _ -> error "methodHaveReturnValue: todo"
   where
-  (CMethod _ nt) = (constsPool cls) M.! idx
+  nt = case constsPool cls M.! idx of
+    (CMethod _ nt') -> nt'
+    (CIfaceMethod _ nt') -> nt'
+    _ -> error "methodHaveReturnValue: something wrong. abort."
   (MethodSignature _ ret) = ntSignature nt