[project @ 2001-03-16 09:07:41 by qrczak]

Compile hsc2hs with -O.
Remove INLINE pragmas - they actually degrade performance by 2%.

diff --git a/ghc/utils/hsc2hs/Main.hs b/ghc/utils/hsc2hs/Main.hs
index ac2302f..290e0db 100644 (file)
--- a/ghc/utils/hsc2hs/Main.hs
+++ b/ghc/utils/hsc2hs/Main.hs
@@ -1,5 +1,5 @@
 ------------------------------------------------------------------------
--- $Id: Main.hs,v 1.25 2001/03/05 00:07:23 qrczak Exp $
+-- $Id: Main.hs,v 1.26 2001/03/16 09:07:41 qrczak Exp $
 --
 -- Program for converting .hsc files to .hs files, by converting the
 -- file into a C program which is run to generate the Haskell source.
@@ -137,11 +137,9 @@ Parser m `fakeOutput` out =
         Success pos' _ s' a -> Success pos' out s' a
         Failure pos' msg    -> Failure pos' msg
 
-{-# INLINE lookAhead #-}
 lookAhead :: Parser String
 lookAhead = Parser $ \pos s -> Success pos [] s s
 
-{-# INLINE satisfy #-}
 satisfy :: (Char -> Bool) -> Parser Char
 satisfy p =
     Parser $ \pos s -> case s of
@@ -282,7 +280,6 @@ unescapeHashes []          = []
 unescapeHashes ('#':'#':s) = '#' : unescapeHashes s
 unescapeHashes (c:s)       = c   : unescapeHashes s
 
-{-# INLINE lookAheadC #-}
 lookAheadC :: Parser String
 lookAheadC = liftM joinLines lookAhead
     where
@@ -290,7 +287,6 @@ lookAheadC = liftM joinLines lookAhead
     joinLines ('\\':'\n':s) = joinLines s
     joinLines (c:s)         = c : joinLines s
 
-{-# INLINE satisfyC #-}
 satisfyC :: (Char -> Bool) -> Parser Char
 satisfyC p = do
     s <- lookAhead

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index 0f70d89..9ff860c 100644 (file)
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.11 2001/03/14 12:13:02 rrt Exp $
+# $Id: Makefile,v 1.12 2001/03/16 09:07:41 qrczak Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -10,7 +10,7 @@ INCLUDE_DIR=ghc/includes
 INSTALLING=1
 
 HS_PROG           = hsc2hs-bin
-SRC_HC_OPTS      += -package util
+SRC_HC_OPTS      += -package util -O
 
 INSTALLED_SCRIPT_PROG  = hsc2hs
 INPLACE_SCRIPT_PROG    = hsc2hs-inplace