From cad1838c9e503da6d5d7524daa7bf7bf678b4a86 Mon Sep 17 00:00:00 2001 From: "Malcolm.Wallace@cs.york.ac.uk" Date: Mon, 25 Jun 2007 09:45:15 +0000 Subject: [PATCH] Change C-style comments to Haskell-style. These two headers are only ever used for pre-processing Haskell code, and are never seen by any C tools except cpp. Using the Haskell comment convention means that cpphs no longer needs to be given the --strip option to remove C comments from open code. This is a Good Thing, because all of /* */ and // are valid Haskell operator names, and there is no compelling reason to forbid using them in files which also happen to have C-preprocessor directives. --- include/CTypes.h | 14 +++++++------- include/Typeable.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/CTypes.h b/include/CTypes.h index f82faa8..eb1a38b 100644 --- a/include/CTypes.h +++ b/include/CTypes.h @@ -1,19 +1,19 @@ -/* ----------------------------------------------------------------------------- +{- ----------------------------------------------------------------------------- * Dirty CPP hackery for CTypes/CTypesISO * * (c) The FFI task force, 2000 - * -------------------------------------------------------------------------- */ + * -------------------------------------------------------------------------- -} #ifndef CTYPES__H #define CTYPES__H #include "Typeable.h" -/* As long as there is no automatic derivation of classes for newtypes we resort +{- As long as there is no automatic derivation of classes for newtypes we resort to extremely dirty cpp-hackery. :-P Some care has to be taken when the - macros below are modified, otherwise the layout rule will bite you. */ + macros below are modified, otherwise the layout rule will bite you.-} -/* A hacked version for GHC follows the Haskell 98 version... */ +{- A hacked version for GHC follows the Haskell 98 version... -} #ifndef __GLASGOW_HASKELL__ #define ARITHMETIC_TYPE(T,C,S,B) \ @@ -168,9 +168,9 @@ instance Storable T where { \ #else /* __GLASGOW_HASKELL__ */ -/* GHC can derive any class for a newtype, so we make use of that +{- GHC can derive any class for a newtype, so we make use of that * here... - */ + -} #define ARITHMETIC_CLASSES Eq,Ord,Num,Enum,Storable,Real #define INTEGRAL_CLASSES Bounded,Integral,Bits diff --git a/include/Typeable.h b/include/Typeable.h index b4ea475..a9804d1 100644 --- a/include/Typeable.h +++ b/include/Typeable.h @@ -1,4 +1,4 @@ -/* ---------------------------------------------------------------------------- +{- ---------------------------------------------------------------------------- * Macros to help make Typeable instances. * * INSTANCE_TYPEABLEn(tc,tcname,"tc") defines @@ -8,7 +8,7 @@ * instance (Typeable a, Typeable b) => Typeable/n-2/ (tc a b) * ... * instance (Typeable a1, ..., Typeable an) => Typeable (tc a1 ... an) - * -------------------------------------------------------------------------- */ + * -------------------------------------------------------------------------- -} #ifndef TYPEABLE_H #define TYPEABLE_H @@ -19,8 +19,8 @@ instance Typeable tycon where { typeOf _ = mkTyConApp tcname [] } #ifdef __GLASGOW_HASKELL__ -/* For GHC, the extra instances follow from general instance declarations - * defined in Data.Typeable. */ +-- For GHC, the extra instances follow from general instance declarations +-- defined in Data.Typeable. #define INSTANCE_TYPEABLE1(tycon,tcname,str) \ tcname = mkTyCon str; \ -- 1.7.10.4