[project @ 2004-02-07 16:37:06 by panne]

Simplifications + small steps towards a stand-alone hsc2hs:

 * Replaced Config module by a simple CPP macro
 * Don't #include configuration header
 * Bumped version number
 * Warning police

diff --git a/ghc/utils/hsc2hs/Main.hs b/ghc/utils/hsc2hs/Main.hs
index f90a89c..ae40cf4 100644 (file)
--- a/ghc/utils/hsc2hs/Main.hs
+++ b/ghc/utils/hsc2hs/Main.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fglasgow-exts #-}
 
 ------------------------------------------------------------------------
 {-# OPTIONS -fglasgow-exts #-}
 
 ------------------------------------------------------------------------

--- $Id: Main.hs,v 1.49 2003/10/01 16:45:10 sof Exp $
+-- $Id: Main.hs,v 1.50 2004/02/07 16:37:06 panne 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.
 --
 -- Program for converting .hsc files to .hs files, by converting the
 -- file into a C program which is run to generate the Haskell source.

@@ -17,7 +17,6 @@ import System.Console.GetOpt
 import GetOpt
 #endif
 
 import GetOpt
 #endif
 

-import Config

 import System        (getProgName, getArgs, ExitCode(..), exitWith, system)
 import Directory     (removeFile,doesFileExist)
 import Monad         (MonadPlus(..), liftM, liftM2, when, unless)
 import System        (getProgName, getArgs, ExitCode(..), exitWith, system)
 import Directory     (removeFile,doesFileExist)
 import Monad         (MonadPlus(..), liftM, liftM2, when, unless)

@@ -25,11 +24,8 @@ import Char          (isAlpha, isAlphaNum, isSpace, isDigit, toUpper, intToDigit
 import List          (intersperse, isSuffixOf)
 import IO            (hPutStr, hPutStrLn, stderr)
 
 import List          (intersperse, isSuffixOf)
 import IO            (hPutStr, hPutStrLn, stderr)
 

-#include "../../includes/config.h"
-
-#ifdef mingw32_HOST_OS
+#if defined(mingw32_HOST_OS)

 import Foreign
 import Foreign

-

 #if __GLASGOW_HASKELL__ >= 504
 import Foreign.C.String
 #else
 #if __GLASGOW_HASKELL__ >= 504
 import Foreign.C.String
 #else

@@ -38,9 +34,8 @@ import CString
 #endif
 
 
 #endif
 
 

-

 version :: String
 version :: String

-version = "hsc2hs version 0.65\n"
+version = "hsc2hs version 0.66\n"

 
 data Flag
     = Help
 
 data Flag
     = Help

@@ -56,6 +51,7 @@ data Flag
     | Output    String
     | Verbose
 
     | Output    String
     | Verbose
 

+template_flag :: Flag -> Bool

 template_flag (Template _) = True
 template_flag _                   = False
 
 template_flag (Template _) = True
 template_flag _                   = False
 

@@ -131,8 +127,8 @@ main = do
             where
             isHelp    Help    = True; isHelp    _ = False
             isVersion Version = True; isVersion _ = False
             where
             isHelp    Help    = True; isHelp    _ = False
             isVersion Version = True; isVersion _ = False

-        (files@(_:_), []) -> mapM_ (processFile flags_w_tpl) files
-        (_,   errs) -> die (concat errs ++ usageInfo header options)
+        ((_:_), []) -> mapM_ (processFile flags_w_tpl) files
+        (_,     _ ) -> die (concat errs ++ usageInfo header options)

 
 getProgramName :: IO String
 getProgramName = liftM (`withoutSuffix` "-bin") getProgName
 
 getProgramName :: IO String
 getProgramName = liftM (`withoutSuffix` "-bin") getProgName

@@ -498,7 +494,7 @@ output flags name toks = do
     
     let cProgName    = outDir++outBase++"_hsc_make.c"
         oProgName    = outDir++outBase++"_hsc_make.o"
     
     let cProgName    = outDir++outBase++"_hsc_make.c"
         oProgName    = outDir++outBase++"_hsc_make.o"

-        progName     = outDir++outBase++"_hsc_make" ++ progNameSuffix
+        progName     = outDir++outBase++"_hsc_make" ++ EXEEXT

        outHFile     = outBase++"_hsc.h"
         outHName     = outDir++outHFile
         outCName     = outDir++outBase++"_hsc.c"
        outHFile     = outBase++"_hsc.h"
         outHName     = outDir++outHFile
         outCName     = outDir++outBase++"_hsc.c"

@@ -506,7 +502,7 @@ output flags name toks = do
        beVerbose    = any (\ x -> case x of { Verbose{} -> True; _ -> False}) flags
 
     let execProgName
        beVerbose    = any (\ x -> case x of { Verbose{} -> True; _ -> False}) flags
 
     let execProgName

-            | null outDir = '.':pathSep:progName
+            | null outDir = dosifyPath ("./" ++ progName)

             | otherwise   = progName
     
     let specials = [(pos, key, arg) | Special pos key arg <- toks]
             | otherwise   = progName
     
     let specials = [(pos, key, arg) | Special pos key arg <- toks]

@@ -673,9 +669,9 @@ outHeaderHs flags inH toks =
                   showCString s++"\");\n"
 
 outTokenHs :: Token -> String
                   showCString s++"\");\n"
 
 outTokenHs :: Token -> String

-outTokenHs (Text pos text) =
-    case break (== '\n') text of
-        (all, [])       -> outText all
+outTokenHs (Text pos txt) =
+    case break (== '\n') txt of
+        (allTxt, [])       -> outText allTxt

         (first, _:rest) ->
             outText (first++"\n")++
             outHsLine pos++
         (first, _:rest) ->
             outText (first++"\n")++
             outHsLine pos++

@@ -808,12 +804,16 @@ showCString = concatMap showCChar
 --     Cut and pasted from ghc/compiler/SysTools
 -- Convert paths foo/baz to foo\baz on Windows
 
 --     Cut and pasted from ghc/compiler/SysTools
 -- Convert paths foo/baz to foo\baz on Windows
 

-
+dosifyPath :: String -> String

 #if defined(mingw32_HOST_OS)
 #if defined(mingw32_HOST_OS)

-subst a b ls = map (\ x -> if x == a then b else x) ls
-unDosifyPath xs = subst '\\' '/' xs

 dosifyPath xs = subst '/' '\\' xs
 
 dosifyPath xs = subst '/' '\\' xs
 

+unDosifyPath :: String -> String
+unDosifyPath xs = subst '\\' '/' xs
+
+subst :: Eq a => a -> a -> [a] -> [a]
+subst a b ls = map (\ x -> if x == a then b else x) ls
+

 getExecDir :: String -> IO (Maybe String)
 -- (getExecDir cmd) returns the directory in which the current
 --                 executable, which should be called 'cmd', is running
 getExecDir :: String -> IO (Maybe String)
 -- (getExecDir cmd) returns the directory in which the current
 --                 executable, which should be called 'cmd', is running

@@ -836,5 +836,5 @@ foreign import stdcall "GetModuleFileNameA" unsafe
 dosifyPath xs = xs
 
 getExecDir :: String -> IO (Maybe String) 
 dosifyPath xs = xs
 
 getExecDir :: String -> IO (Maybe String) 

-getExecDir s = do return Nothing
+getExecDir _ = return Nothing

 #endif
 #endif

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index 562803a..94ed548 100644 (file)
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,4 @@
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------

-# $Id: Makefile,v 1.38 2003/06/04 15:18:30 panne Exp $

 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk

@@ -23,7 +22,10 @@ ifeq "$(ghc_ge_504)" "NO"
 SRC_HC_OPTS +=  -package util
 endif
 
 SRC_HC_OPTS +=  -package util
 endif
 

-SRC_HC_OPTS      += -cpp
+SRC_HC_OPTS      += -Wall -cpp '-DEXEEXT="$(exeext)"'
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+SRC_HC_OPTS      += -Dmingw32_HOST_OS=1
+endif

 
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALLED_SCRIPT_PROG  = hsc2hs
 
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALLED_SCRIPT_PROG  = hsc2hs

@@ -78,29 +80,6 @@ override datadir=$(libdir)
 INSTALL_DATAS += template-hsc.h
 
 # -----------------------------------------------------------------------------
 INSTALL_DATAS += template-hsc.h
 
 # -----------------------------------------------------------------------------

-# Create driver configuration
-
-CONFIG_HS   = Config.hs
-CLEAN_FILES += $(CONFIG_HS)
-EXTRA_SRCS  += $(CONFIG_HS)
-
-boot :: $(CONFIG_HS)
-
-$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
-       @$(RM) -f $(CONFIG_HS)
-       @echo -n "Creating $(CONFIG_HS) ... "
-       @echo "module Config where" >>$(CONFIG_HS)
-       @echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
-       @echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
-       @echo "progNameSuffix        = \"$(exeext)\"" >> $(CONFIG_HS)
-ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-       @echo "pathSep               = '/'" >> $(CONFIG_HS)
-else
-       @echo "pathSep               = (toEnum 92 :: Char)" >> $(CONFIG_HS)
-endif
-       @echo done.
-
-# -----------------------------------------------------------------------------

 # don't recurse on 'make install'
 #
 ifeq "$(INSTALLING)" "1"
 # don't recurse on 'make install'
 #
 ifeq "$(INSTALLING)" "1"