Add simple code generator monad.

[hs-java.git] / dump-class.hs

diff --git a/dump-class.hs b/dump-class.hs
index 37a52e614dd189f7b7cc01be1360eb35cf6e9b2e..d76c8f2f8cb64b00c527478aa5ee8e096efd9e7a 100644 (file)
--- a/dump-class.hs
+++ b/dump-class.hs
@@ -7,31 +7,14 @@ import System.Environment
 import qualified Data.ByteString.Lazy as B
 import Text.Printf
 
-import JVM.Types
 import JVM.Converter
-import JVM.Assembler
+import JVM.Dump
 
 main = do
   args <- getArgs
   case args of
     [clspath] -> do
       cls <- parseClassFile clspath
-      putStr "Class: "
-      B.putStrLn (this cls)
-      putStrLn "Constants pool:"
-      forM_ (assocs $ constantPool cls) $ \(i, c) ->
-        putStrLn $ printf "  #%d:\t%s" i (show c)
-      putStrLn "Methods:"
-      forM_ (methods cls) $ \m -> do
-        putStr ">> Method "
-        B.putStr (methodName m)
-        print (methodSignature m)
-        case attrByName m "Code" of
-          Nothing -> putStrLn "(no code)\n"
-          Just bytecode -> let code = decodeMethod bytecode
-                           in  forM_ (codeInstructions code) $ \i -> do
-                                 putStr "  "
-                                 print i
-
+      dumpClass cls
     _ -> error "Synopsis: dump-class File.class"