projects
/
hs-java.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better error handling.
[hs-java.git]
/
rebuild-class.hs
diff --git
a/rebuild-class.hs
b/rebuild-class.hs
index 337c5b2f9d95fd94907f270055450e5fa0aff034..4afb954b25cd78dcde77a08daeed2f7c87ec423c 100644
(file)
--- a/
rebuild-class.hs
+++ b/
rebuild-class.hs
@@
-1,17
+1,13
@@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE OverloadedStrings #-}
-import Control.Monad
-import Data.Array
import Data.Binary
import System.Environment
import qualified Data.ByteString.Lazy as B
import Data.Binary
import System.Environment
import qualified Data.ByteString.Lazy as B
-import Text.Printf
import qualified Data.Map as M
import qualified Data.Map as M
-import JVM.
Types
+import JVM.
Common
import JVM.ClassFile
import JVM.Converter
import JVM.ClassFile
import JVM.Converter
-import JVM.Assembler
import JVM.Dump
main = do
import JVM.Dump
main = do
@@
-19,10
+15,10
@@
main = do
case args of
[clspath,outpath] -> do
cls <- parseClassFile clspath
case args of
[clspath,outpath] -> do
cls <- parseClassFile clspath
- clsfile <- decodeFile clspath :: IO (Class
Pointers
)
+ clsfile <- decodeFile clspath :: IO (Class
File
)
dumpClass cls
putStrLn $ "Source pool:\n" ++ showListIx (M.elems $ constsPool clsfile)
dumpClass cls
putStrLn $ "Source pool:\n" ++ showListIx (M.elems $ constsPool clsfile)
- let result = classFile cls
+ let result = class
Direct2
File cls
putStrLn $ "Result pool:\n" ++ showListIx (M.elems $ constsPool result)
B.writeFile outpath (encodeClass cls)
putStrLn $ "Result pool:\n" ++ showListIx (M.elems $ constsPool result)
B.writeFile outpath (encodeClass cls)