projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a division-by-zero when +RTS -V0 is given
[ghc-hetmet.git]
/
utils
/
hsc2hs
/
Main.hs
diff --git
a/utils/hsc2hs/Main.hs
b/utils/hsc2hs/Main.hs
index
77b948f
..
a939f31
100644
(file)
--- a/
utils/hsc2hs/Main.hs
+++ b/
utils/hsc2hs/Main.hs
@@
-42,11
+42,7
@@
import System.IO ( openFile, IOMode(..), hClose )
#endif
#if defined(__GLASGOW_HASKELL__) && !defined(BUILD_NHC)
#endif
#if defined(__GLASGOW_HASKELL__) && !defined(BUILD_NHC)
-#ifdef USING_COMPAT
-import Compat.RawSystem ( rawSystem )
-#else
import System.Cmd ( rawSystem )
import System.Cmd ( rawSystem )
-#endif
#define HAVE_rawSystem
#elif __NHC__ >= 117
import System.Cmd ( rawSystem )
#define HAVE_rawSystem
#elif __NHC__ >= 117
import System.Cmd ( rawSystem )
@@
-133,7
+129,7
@@
main = do
-- to find one by looking near the executable. This only
-- works on Win32 or Hugs (getExecDir). On Unix, there's a wrapper
-- script which specifies an explicit template flag.
-- to find one by looking near the executable. This only
-- works on Win32 or Hugs (getExecDir). On Unix, there's a wrapper
-- script which specifies an explicit template flag.
- flags_w_tpl <- if any template_flag flags then
+ flags_w_tpl0 <- if any template_flag flags then
return flags
else
do mb_path <- getExecDir "/bin/hsc2hs.exe"
return flags
else
do mb_path <- getExecDir "/bin/hsc2hs.exe"
@@
-147,6
+143,12
@@
main = do
then return ((Template templ):)
else return id
return (add_opt flags)
then return ((Template templ):)
else return id
return (add_opt flags)
+
+ -- take only the last --template flag on the cmd line
+ let
+ (before,tpl:after) = break template_flag (reverse flags_w_tpl0)
+ flags_w_tpl = reverse (before ++ tpl : filter (not.template_flag) after)
+
case (files, errs) of
(_, _)
| any isHelp flags_w_tpl -> bye (usageInfo header options)
case (files, errs) of
(_, _)
| any isHelp flags_w_tpl -> bye (usageInfo header options)