JVM assembler/disassembler tested to work on Hello.java.

[hs-java.git] / JVM / Types.hs

diff --git a/JVM/Types.hs b/JVM/Types.hs
index 9c96144791e4741f10c0c66cd5be416d7c2f75fe..b64da9337dc0216c0c3a7f516d0743fea77dfa70 100644 (file)
--- a/JVM/Types.hs
+++ b/JVM/Types.hs
@@ -3,7 +3,10 @@
 module JVM.Types where
 
 import Codec.Binary.UTF8.String hiding (encode, decode)
+import Control.Applicative
 import Data.Array
+import Data.Binary
+import Data.Binary.Put
 import qualified Data.ByteString.Lazy as B
 import Data.Word
 import Data.Char
@@ -22,6 +25,13 @@ toString bstr = decodeString $ map (chr . fromIntegral) $ B.unpack bstr
 -- | Constant pool
 type Pool = Array Word16 Constant
 
+asize :: (Ix i) => Array i e -> Int
+asize = length . elems
+
+showListIx :: (Show a) => [a] -> String
+showListIx list = unlines $ zipWith s [1..] list
+  where s i x = show i ++ ":\t" ++ show x
+
 class HasAttributes a where
   attributes :: a -> Attributes
 
@@ -56,7 +66,7 @@ deriving instance Eq (Signature a) => Eq (NameType a)
 
 -- | Constant pool item
 data Constant =
-    CClass {className :: B.ByteString}
+    CClass B.ByteString
   | CField {refClass :: B.ByteString, fieldNameType :: NameType Field}
   | CMethod {refClass :: B.ByteString, nameType :: NameType Method}
   | CIfaceMethod {refClass :: B.ByteString, nameType :: NameType Method}
@@ -70,6 +80,10 @@ data Constant =
   | CUnicode {getString :: B.ByteString}
   deriving (Eq)
 
+className ::  Constant -> B.ByteString
+className (CClass s) = s
+className x = error $ "Not a class: " ++ show x
+
 instance Show Constant where
   show (CClass name) = "class " ++ toString name
   show (CField cls nt) = "field " ++ toString cls ++ "." ++ show nt
@@ -139,3 +153,11 @@ data Attribute = Attribute {
 -- | Set of attributes
 type Attributes = M.Map B.ByteString B.ByteString
 
+instance (Binary (Signature a)) => Binary (NameType a) where
+  put (NameType n t) = putLazyByteString n >> put t
+
+  get = NameType <$> get <*> get
+
+byteString ::  (Binary t) => t -> B.ByteString
+byteString x = runPut (put x)
+