X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mate.git;a=blobdiff_plain;f=Mate%2FTypes.hs;h=5e5bf221e0ba26420943967d2b77e2cdcedb7ab6;hp=0fe838e0edd9524f62fc186659ce75757402d296;hb=c803146cc80b61305fde8279f0a36f8fe6ef7eb2;hpb=120517704ac01a6d957b1904d63ab707a0c4ee95

diff --git a/Mate/Types.hs b/Mate/Types.hs
index 0fe838e..5e5bf22 100644
--- a/Mate/Types.hs
+++ b/Mate/Types.hs
@@ -40,11 +40,10 @@ type TrapMap = M.Map NativeWord TrapCause
 
 data TrapCause =
   StaticMethod MethodInfo | -- for static calls
-  VirtualMethod Bool MethodInfo | -- for virtual calls
-  InterfaceMethod Bool MethodInfo | -- for interface calls
+  VirtualCall Bool MethodInfo (IO NativeWord) | -- for invoke{interface,virtual}
   InstanceOf B.ByteString | -- class name
   NewObject B.ByteString | -- class name
-  StaticField StaticFieldInfo deriving Show
+  StaticField StaticFieldInfo
 
 data StaticFieldInfo = StaticFieldInfo {
   sfiClassName :: B.ByteString,