From: Bernhard Urban Date: Fri, 17 Aug 2012 17:21:45 +0000 (+0200) Subject: refactor: trivial stuff and add -fwarn-tabs to $(GHC_OPT) X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mate.git;a=commitdiff_plain;h=f0c1382a5ac2cf98fd6a9dcd3d193e47ca9ed8aa refactor: trivial stuff and add -fwarn-tabs to $(GHC_OPT) --- diff --git a/Makefile b/Makefile index abd630f..b0a440d 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ PACKAGES := $(addprefix -package ,$(PACKAGES_)) # use `cpphs' GHC_CPP := -cpp -pgmP cpphs -optP --cpp -GHC_OPT = -I. -O0 -Wall -fno-warn-unused-do-bind +GHC_OPT = -I. -O0 -Wall -fno-warn-unused-do-bind -fwarn-tabs # see *.gdb target. also useful for profiling (-p at call) GHC_OPT += -rtsopts # -prof -auto-all GHC_OPT += $(GHC_CPP) diff --git a/Mate.hs b/Mate.hs index 1321104..5ea2f7d 100644 --- a/Mate.hs +++ b/Mate.hs @@ -36,13 +36,13 @@ parseArgs ("-jar":jarpath:_) stdcp = do case res of Nothing -> error "JAR: no MainClass entry found. Try to pass the jar file via -cp instead." Just mc -> do - let bclspath = B.pack $ map (fromIntegral . ord) mc + let bclspath = B.pack . map (fromIntegral . ord) $ mc cls <- getClassFile bclspath executeMain bclspath cls + parseArgs ("-cp":cps) cpset = parseArgs ("-classpath":cps) cpset parseArgs ("-classpath":cps:xs) False = do - let paths = splitOn ":" cps - mapM_ addStuff paths + mapM_ addStuff $ splitOn ":" cps parseArgs xs True where addStuff :: String -> IO () @@ -54,7 +54,7 @@ parseArgs (('-':_):_) _ = error "Usage: mate [-cp|-classpath ] [