X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate.hs;h=eb3c8733bab63d9261cc54f6247888e244220fbc;hb=d3f63d65d80aaab4ad8eac43ee1caea7dea09fbd;hp=1c229e3cc560e8ddb1d2583febaa18b6eaf8c8c7;hpb=1315c607541c6fe37830242dfca042e60a2b6eb0;p=mate.git diff --git a/Mate.hs b/Mate.hs index 1c229e3..eb3c873 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 @@ -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 @@ -52,7 +53,7 @@ parseArgs ("-classpath":xs) _ = parseArgs ("-":xs) True -- usage parseArgs (('-':_):_) _ = error "Usage: mate [-cp|-classpath ] [ | -jar ]" -- 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