Enhace constants pool handling.

[hs-java.git] / Java / JAR / Archive.hs

diff --git a/Java/JAR/Archive.hs b/Java/JAR/Archive.hs
index 035f1e1d5b4ec31085e0b1d6a9676bb0d64dddcf..a4dd02669e9a09693223f3b169312c20eccca7c3 100644 (file)
--- a/Java/JAR/Archive.hs
+++ b/Java/JAR/Archive.hs
@@ -1,10 +1,9 @@
-
+-- | This module defines functions to read Java JAR files.
 module Java.JAR.Archive where
 
-import Control.Monad.Trans
-import qualified Control.Monad.State as St
 import qualified Codec.Archive.LibZip as Zip
 import Data.Binary
+import Data.List
 import qualified Data.ByteString.Lazy as B
 
 import Java.ClassPath.Types
@@ -12,21 +11,23 @@ import Java.ClassPath.Common
 import JVM.ClassFile
 import JVM.Converter
 
-readJAR :: FilePath -> IO [Tree CPEntry]
-readJAR jarfile = do
-  files <- Zip.withArchive [] jarfile $ Zip.fileNames []
-  return $ mapF (NotLoadedJAR jarfile) (buildTree files)
+readJAREntry :: (Enum a) => FilePath -> String -> IO (Maybe [a])
+readJAREntry jarfile path = do
+  Zip.catchZipError (Just `fmap` (Zip.withArchive [] jarfile $ Zip.fileContents [] path))
+                    (\_ -> return Nothing)
+
+-- | Read all entires from JAR file
+readAllJAR :: FilePath -> IO [Tree CPEntry]
+readAllJAR jarfile = do
+    files <- Zip.withArchive [] jarfile $ Zip.fileNames []
+    return $ mapF (NotLoadedJAR jarfile) (buildTree $ filter good files)
+  where
+    good file = ".class" `isSuffixOf` file
 
+-- | Read one class from JAR file
 readFromJAR :: FilePath -> FilePath -> IO (Class Direct)
 readFromJAR jarfile path = do
   content <- Zip.withArchive [] jarfile $ Zip.fileContents [] path
   let bstr = B.pack content
   return $ classFile2Direct (decode bstr)
 
-addJAR :: FilePath -> ClassPath ()
-addJAR jarfile = do
-  classes <- liftIO $ readJAR jarfile
-  cp <- St.get
-  let cp' = merge $ cp ++ classes
-  St.put cp'
-