Misc minor updates.

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

diff --git a/JVM/Dump.hs b/JVM/Dump.hs
index a5b2d196b27ee05ca4b74e24926ef0412f74458f..3f450ed5e13c159f5f4be433fc207b6d4a08bfb9 100644 (file)
--- a/JVM/Dump.hs
+++ b/JVM/Dump.hs
@@ -2,23 +2,24 @@
 module JVM.Dump where
 
 import Control.Monad
-import Data.Array
+import qualified Data.Map as M
 import qualified Data.ByteString.Lazy as B
 import Text.Printf
 
-import JVM.Types
+import JVM.Common ()
+import JVM.ClassFile
 import JVM.Converter
 import JVM.Assembler
 
-dumpClass :: Class -> IO ()
+dumpClass :: Class Resolved -> IO ()
 dumpClass cls = do
     putStr "Class: "
-    B.putStrLn (this cls)
+    B.putStrLn (thisClass cls)
     putStrLn "Constants pool:"
-    forM_ (assocs $ constantPool cls) $ \(i, c) ->
+    forM_ (M.assocs $ constsPool cls) $ \(i, c) ->
       putStrLn $ printf "  #%d:\t%s" i (show c)
     putStrLn "Methods:"
-    forM_ (methods cls) $ \m -> do
+    forM_ (classMethods cls) $ \m -> do
       putStr ">> Method "
       B.putStr (methodName m)
       print (methodSignature m)