ClassPool: JAR and ClassPath support

[mate.git] / Mate.hs

diff --git a/Mate.hs b/Mate.hs
index 911c1dbd1c1ef1b892a511c65835f3e3c73537e9..95daaf8133d890e2445ef353b05072d5aeb9288e 100644 (file)
--- a/Mate.hs
+++ b/Mate.hs
@@ -6,12 +6,14 @@ module Main where
 import System.Environment
 import Data.Char
 import Data.List
+import Data.String.Utils
 import qualified Data.ByteString.Lazy as B
 
 #ifdef DEBUG
 import Text.Printf
 #endif
 import JVM.ClassFile
+import Java.JAR
 
 import Mate.BasicBlocks
 import Mate.MethodPool
@@ -23,24 +25,39 @@ main ::  IO ()
 main = do
   args <- getArgs
   register_signal
+  addClassPath "./"
   case args of
     [clspath] -> do
       let bclspath = B.pack $ map (fromIntegral . ord) clspath
       cls <- getClassFile bclspath
-      hmap <- parseMethod cls "main"
-      case hmap of
-        Just hmap' -> do
-          let methods = classMethods cls; methods :: [Method Direct]
-          let method = find (\x -> methodName x == "main") methods
-          case method of
-            Just m -> do
-              let mi = MethodInfo "main" bclspath $ methodSignature m
-              entry <- compileBB hmap' mi
-              addMethodRef entry mi [bclspath]
+      executeMain bclspath cls
+    ["-jar", jarpath] -> do
+      addClassPathJAR jarpath
+      res <- readMainClass jarpath
+      case res of
+        Nothing -> error "JAR: no MainClass entry found. Try to pass the jar file via -cp instead."
+        Just mc -> do
+          let mc' = replace "." "/" mc
+          let bclspath = B.pack $ map (fromIntegral . ord) mc'
+          cls <- getClassFile bclspath
+          executeMain bclspath cls
+    _ -> error "Usage: mate [<class-file> | -jar <jar-file>]"
+
+executeMain :: B.ByteString -> Class Direct -> IO ()
+executeMain bclspath cls = do
+  hmap <- parseMethod cls "main"
+  case hmap of
+    Just hmap' -> do
+      let methods = classMethods cls; methods :: [Method Direct]
+      let method = find (\x -> methodName x == "main") methods
+      case method of
+        Just m -> do
+          let mi = MethodInfo "main" bclspath $ methodSignature m
+          entry <- compileBB hmap' mi
+          addMethodRef entry mi [bclspath]
 #ifdef DEBUG
-              printf "executing `main' now:\n"
+          printf "executing `main' now:\n"
 #endif
-              executeFuncPtr entry
-            Nothing -> error "main not found"
+          executeFuncPtr entry
         Nothing -> error "main not found"
-    _ -> error "Usage: mate <class-file>"
+    Nothing -> error "main not found"