projects
/
mate.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2049798
)
refactor: trivial stuff and add -fwarn-tabs to $(GHC_OPT)
author
Bernhard Urban
<lewurm@gmail.com>
Fri, 17 Aug 2012 17:21:45 +0000
(19:21 +0200)
committer
Bernhard Urban
<lewurm@gmail.com>
Fri, 17 Aug 2012 08:21:38 +0000
(10:21 +0200)
Makefile
patch
|
blob
|
history
Mate.hs
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index abd630f75f2ee64a194d76634ada378427b87588..b0a440ddfc97cbb1c05324873435cbe51931f14e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-18,7
+18,7
@@
PACKAGES := $(addprefix -package ,$(PACKAGES_))
# use `cpphs'
GHC_CPP := -cpp -pgmP cpphs -optP --cpp
# 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)
# 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 1321104a20fdbbf4c80b2cc848ec3c46ccf8ec77..5ea2f7d200ae08d847a3677f54f3603fe3caf88f 100644
(file)
--- 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
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
cls <- getClassFile bclspath
executeMain bclspath cls
+
parseArgs ("-cp":cps) cpset = parseArgs ("-classpath":cps) cpset
parseArgs ("-classpath":cps:xs) False = do
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 ()
parseArgs xs True
where
addStuff :: String -> IO ()
@@
-54,7
+54,7
@@
parseArgs (('-':_):_) _ = error "Usage: mate [-cp|-classpath <cp1:cp2:..>] [<cla
-- first argument which isn't prefixed by '-' should be a class file
parseArgs (clspath:_) stdcp = do
unless stdcp $ addClassPath "./"
-- first argument which isn't prefixed by '-' should be a class file
parseArgs (clspath:_) stdcp = do
unless stdcp $ addClassPath "./"
- let bclspath = B.pack
$ map (fromIntegral . ord)
clspath
+ let bclspath = B.pack
. map (fromIntegral . ord) $
clspath
cls <- getClassFile bclspath
executeMain bclspath cls
parseArgs _ _ = parseArgs ["-"] False
cls <- getClassFile bclspath
executeMain bclspath cls
parseArgs _ _ = parseArgs ["-"] False