X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate.hs;h=ee03d8d78ad1b3dfb19f766ae813d062f000c305;hb=13cf9f65321881050edb99776f29eea8580ec457;hp=1c229e3cc560e8ddb1d2583febaa18b6eaf8c8c7;hpb=1315c607541c6fe37830242dfca042e60a2b6eb0;p=mate.git

diff --git a/Mate.hs b/Mate.hs
index 1c229e3..ee03d8d 100644
--- a/Mate.hs
+++ b/Mate.hs
@@ -8,6 +8,7 @@ import Data.Char
 import Data.List
 import Data.List.Split
 import qualified Data.ByteString.Lazy as B
+import Control.Monad
 
 #ifdef DEBUG
 import Text.Printf
@@ -19,7 +20,7 @@ import Mate.BasicBlocks
 import Mate.MethodPool
 import Mate.Types
 import Mate.ClassPool
-import Mate.X86TrapHandling
+import Mate.NativeMaschine
 
 main ::  IO ()
 main = do
@@ -29,7 +30,7 @@ main = do
 
 parseArgs :: [String] -> Bool -> IO ()
 parseArgs ("-jar":jarpath:_) stdcp = do
-  if not stdcp then addClassPath "./" else return ()
+  unless stdcp $ addClassPath "./"
   addClassPathJAR jarpath
   res <- readMainClass jarpath
   case res of
@@ -43,16 +44,16 @@ parseArgs ("-classpath":cps:xs) False = do
   let paths = splitOn ":" cps
   mapM_ addStuff paths
   parseArgs xs True
-  where
-  addStuff :: String -> IO ()
-  addStuff x
-    | ".jar" `isSuffixOf` x = addClassPathJAR x
-    | otherwise = addClassPath $ x ++ "/"
+    where
+      addStuff :: String -> IO ()
+      addStuff x
+        | ".jar" `isSuffixOf` x = addClassPathJAR x
+        | otherwise = addClassPath $ x ++ "/"
 parseArgs ("-classpath":xs) _ = parseArgs ("-":xs) True -- usage
 parseArgs (('-':_):_) _ = error "Usage: mate [-cp|-classpath <cp1:cp2:..>] [<class-file> | -jar <jar-file>]"
 -- first argument which isn't prefixed by '-' should be a class file
 parseArgs (clspath:_) stdcp = do
-  if not stdcp then addClassPath "./" else return ()
+  unless stdcp $ addClassPath "./"
   let bclspath = B.pack $ map (fromIntegral . ord) clspath
   cls <- getClassFile bclspath
   executeMain bclspath cls
@@ -65,14 +66,11 @@ executeMain bclspath cls = do
   case find (\x -> methodName x == "main") methods of
     Just m -> do
       let mi = MethodInfo "main" bclspath $ methodSignature m
-      hmap <- parseMethod cls "main" $ methodSignature m
-      case hmap of
-        Just hmap' -> do
-          entry <- compileBB hmap' mi
-          addMethodRef entry mi [bclspath]
+      rawmethod <- parseMethod cls "main" $ methodSignature m
+      entry <- compileBB rawmethod 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"