X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FUtilities.hs;h=da07ecf18eb95d860ce266f8ce3a927445d3ece1;hb=03ddf0056a8ebae7ce10d694bbf906c276677a33;hp=05220fce5447d5ded8ae15e72e91d51c57293b03;hpb=4acc971dbcafd34fa7f5716513ae4dd47e0ea0eb;p=mate.git

diff --git a/Mate/Utilities.hs b/Mate/Utilities.hs
index 05220fc..da07ecf 100644
--- a/Mate/Utilities.hs
+++ b/Mate/Utilities.hs
@@ -4,52 +4,71 @@ module Mate.Utilities where
 
 import Data.Word
 import qualified Data.Map as M
+import qualified Data.Set as S
 import qualified Data.ByteString.Lazy as B
+import Data.List
+import Data.Maybe
 
 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
+    (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 cls idx = fromIntegral $ length args
-  where
-  (CMethod _ nt) = (constsPool cls) M.! idx
-  (MethodSignature args _) = ntSignature nt
+
+methodNameTypeByIdx :: Class Direct -> Word16 -> NameType (Method Direct)
+methodNameTypeByIdx cls idx = case constsPool cls M.! idx of
+  (CMethod _ nt') -> nt'
+  (CIfaceMethod _ nt') -> nt'
+  _ -> error "methodGetArgsCount: something wrong. abort."
+
+methodGetArgsCount :: NameType (Method Direct) -> Word32
+methodGetArgsCount nt = genericLength args
+  where (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 BoolType) -> True
+    (Returns CharByte) -> True
     (Returns IntType) -> True;
+    (Returns (Array _ _)) -> True
     (Returns (ObjectType _)) -> True;
-    _ -> error "methodHaveReturnValue: todo"
+    _ -> error $ "methodHaveReturnValue: todo: " ++ show ret
   where
-  (CMethod _ nt) = (constsPool cls) M.! idx
-  (MethodSignature _ ret) = ntSignature nt
+    nt = case constsPool cls M.! idx of
+      (CMethod _ nt') -> nt'
+      (CIfaceMethod _ nt') -> nt'
+      _ -> error "methodHaveReturnValue: something wrong. abort."
+    (MethodSignature _ ret) = ntSignature nt
+
+methodInfoToMethod :: MethodInfo -> Class Direct -> Method Direct
+methodInfoToMethod mi cls =
+  fromJust $ lookupMethodSig (methName mi) (methSignature mi) cls
+
+methodIsStatic :: Method Direct -> Bool
+methodIsStatic = S.member ACC_STATIC . methodAccessFlags
+
+lookupMethodSig :: B.ByteString -> MethodSignature -> Class Direct -> Maybe (Method Direct)
+lookupMethodSig name sig cls =
+  find (\x -> methodName x == name && methodSignature x == sig) $ classMethods cls