gtk2hs-buildtools 0.13.10.0 → 0.13.11.0

raw patch · 27 files changed

+76/−75 lines, 27 filesdep ~Cabaldep ~basePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: Cabal, base

API changes (from Hackage documentation)

Files

• c2hs/base/admin/Config.hs +1/−1
• c2hs/base/errors/Errors.hs +2/−2
• c2hs/base/general/Binary.hs +3/−3
• c2hs/base/general/FileOps.hs +1/−1
• c2hs/base/general/UNames.hs +3/−3
• c2hs/base/state/StateBase.hs +1/−1
• c2hs/base/state/StateTrans.hs +4/−4
• c2hs/base/syms/Attributes.hs +2/−2
• c2hs/base/syms/NameSpaces.hs +7/−7
• c2hs/base/syntax/Lexers.hs +2/−2
• c2hs/c/CAST.hs +1/−1
• c2hs/c/CAttrs.hs +1/−1
• c2hs/c/CNames.hs +2/−2
• c2hs/c/CParser.y +3/−3
• c2hs/c/CParserMonad.hs +1/−1
• c2hs/c/CPretty.hs +1/−1
• c2hs/c/CTrav.hs +8/−8
• c2hs/chs/CHS.hs +4/−4
• c2hs/chs/CHSLexer.hs +3/−3
• c2hs/gen/GBMonad.hs +1/−1
• c2hs/gen/GenBind.hs +7/−7
• c2hs/toplevel/Gtk2HsC2Hs.hs +5/−5
• c2hs/toplevel/c2hs_config.c +1/−1
• gtk2hs-buildtools.cabal +3/−3
• hierarchyGen/TypeGen.hs +1/−1
• hierarchyGen/hierarchy.list +2/−2
• src/Gtk2HsSetup.hs +6/−5

@@ -34,7 +34,7 @@                --                errorLimit,                ---               -- debuging+               -- debugging                --                assertEnabled) where

@@ -19,7 +19,7 @@ -- --- DESCRIPTION --------------------------------------------------------------- -----  This modules exports some auxilliary routines for error handling.+--  This modules exports some auxiliary routines for error handling. -- --- DOCU ---------------------------------------------------------------------- --@@ -78,7 +78,7 @@ -- note that the equality to on errors takes into account only the error level -- and position (not the error text) ----- note that these comparisions are expensive (the positions contain the file+-- note that these comparisons are expensive (the positions contain the file -- names as strings) -- instance Eq Error where

@@ -296,7 +296,7 @@ getByte = getWord8  -- -------------------------------------------------------------------------------- Primitve Word writes+-- Primitive Word writes  instance Binary Word8 where   put_ = putWord8@@ -358,7 +358,7 @@                (fromIntegral w8))  -- -------------------------------------------------------------------------------- Primitve Int writes+-- Primitive Int writes  instance Binary Int8 where   put_ h w = put_ h (fromIntegral w :: Word8)@@ -668,7 +668,7 @@   dict_p_p <- tellBin bh   put_ bh dict_p_p      -- Placeholder for ptr to dictionary -        -- Make some intial state+        -- Make some initial state   usr_state <- newWriteState          -- Put the main thing,

@@ -69,7 +69,7 @@ -- |Create a temporary file with a unique name. -- --  * A unique sequence of at least six characters and digits is added---   inbetween the two given components (the latter of which must include the+--   in between the two given components (the latter of which must include the --   file suffix if any is needed) -- --  * Default permissions are used, which might not be optimal, but

@@ -19,7 +19,7 @@ -- --- DESCRIPTION --------------------------------------------------------------- -----  Generates unqiue names according to a method of L. Augustsson, M. Rittri+--  Generates unique names according to a method of L. Augustsson, M. Rittri --  & D. Synek ``Functional pearl: On generating unique names'', Journal of --  Functional Programming 4(1), pp 117-123, 1994. --@@ -33,7 +33,7 @@ --  * This module provides an ordering relation on names (e.g., for using --    `Maps'), but no assumption maybe made on the order in which names --    are generated from the name space.  Furthermore, names are instances of---    `Ix' to allow to use them as indicies.+--    `Ix' to allow to use them as indices. -- --  * A supply should be used *at most* once to *either* split it or extract a --    stream of names.  A supply used repeatedly will always generate the same@@ -77,7 +77,7 @@   index   (Name from, Name to) (Name idx) = index   (from, to) idx   inRange (Name from, Name to) (Name idx) = inRange (from, to) idx --- we want to show the number only, to be useful for generating unqiue+-- we want to show the number only, to be useful for generating unique -- printable names -- instance Show Name where

@@ -133,7 +133,7 @@ (+>=)   :: PreCST e s a -> (a -> PreCST e s b) -> PreCST e s b m +>= k  = CST $ unpackCST m >>= (\a -> unpackCST (k a)) --- bind dropping the result of the first state transfomer+-- bind dropping the result of the first state transformer -- (+>)   :: PreCST e s a -> PreCST e s b -> PreCST e s b k +> m  = k +>= const m

@@ -42,7 +42,7 @@ --    Duponcheel (Report YALEU/DCS/RR-1004) from 1993, Section 8. -- --  * The use of GHC's inplace-update goodies within monads of kind `STB' is---    possible, bacause `IO' is based on `ST' in the GHC.+--    possible, because `IO' is based on `ST' in the GHC. -- --  * In the following, we call the two kinds of state managed by the `STB' the --    base state (the omnipresent state of the compiler) and generic state.@@ -149,7 +149,7 @@                                     in                                     k' bs' gs'                   -- cont --- bind dropping the result of the first state transfomer+-- bind dropping the result of the first state transformer -- (+>)   :: STB bs gs a -> STB bs gs b -> STB bs gs b k +> m  = k +>= const m@@ -270,8 +270,8 @@ -- --   - exceptions are meant to be caught in order to recover the currently --     executed operation; they turn into fatal errors if they are not caught;---     execeptions are tagged, which allows to deal with multiple kinds of---     execeptions at the same time and to handle them differently+--     exceptions are tagged, which allows to deal with multiple kinds of+--     exceptions at the same time and to handle them differently --   - user-defined fatal errors abort the currently executed operation, but --     they may be caught at the top-level in order to terminate gracefully or --     to invoke another operation; there is no special support for different

@@ -358,12 +358,12 @@     UndefStdAttr    -> interr $ "Attributes.getStdAttrDft: Undefined in\n"                                 ++ errLoc atab (posOf at) --- check if the attribue value is marked as "don't care" (EXPORTED)+-- check if the attribute value is marked as "don't care" (EXPORTED) -- isDontCareStdAttr         :: AttrTable (StdAttr a) -> Attrs -> Bool isDontCareStdAttr atab at  = isDontCare (getAttr atab at) --- check if the attribue value is still undefined (EXPORTED)+-- check if the attribute value is still undefined (EXPORTED) -- --  * we also regard "don't care" attributes as undefined --

@@ -58,7 +58,7 @@ --   they are not very many and the definitions entered last are the most --   frequently accessed ones; the list structure naturally hides older --   definitions, i.e., definitions from outer ranges; adding new definitions---   is done in time proportinal to the current size of the range; removing a+--   is done in time proportional to the current size of the range; removing a --   range is done in constant time (and the definitions of a range can be --   returned as a result of leaving the range); lookup is proportional to the --   number of definitions in the local ranges and the logarithm of the number@@ -76,11 +76,11 @@  -- add global definition (EXPORTED) -----  * returns the modfied name space+--  * returns the modified name space -----  * if the identfier is already declared, the resulting name space contains+--  * if the identifier is already declared, the resulting name space contains --   the new binding and the second component of the result contains the---   definition declared previosuly (which is henceforth not contained in the+--   definition declared previously (which is henceforth not contained in the --   name space anymore) -- defGlobal :: NameSpace a -> Ident -> a -> (NameSpace a, Maybe a)@@ -101,13 +101,13 @@  -- add local definition (EXPORTED) -----  * returns the modfied name space+--  * returns the modified name space -- --  * if there is no local range, the definition is entered globally -----  * if the identfier is already declared, the resulting name space contains+--  * if the identifier is already declared, the resulting name space contains --   the new binding and the second component of the result contains the---   definition declared previosuly (which is henceforth not contained in the+--   definition declared previously (which is henceforth not contained in the --   name space anymore) -- defLocal :: NameSpace a -> Ident -> a -> (NameSpace a, Maybe a)

@@ -104,7 +104,7 @@ --    Regarding the character ranges, there seem to be at least two --    possibilities.  Doaitse explicitly uses ranges and avoids expanding --    them.  The problem with this approach is that we may only have---    predicates such as `isAlphaNum' to determine whether a givne character+--    predicates such as `isAlphaNum' to determine whether a given character --    belongs to some character class.  From this representation it is --    difficult to efficiently compute a range.  The second approach, as --    proposed by Tom Pledger <Tom.Pledger@peace.com> (on the Haskell list)@@ -126,7 +126,7 @@ --      many re = \l' -> let self = re1 self >||< l' in self -- --    since epsilon = id.''  This should actually be as good as the current---    definiton and it might be worthwhile to offer it as a variant.+--    definition and it might be worthwhile to offer it as a variant. --  module Lexers (Regexp, Lexer, Action, epsilon, char, (+>), lexaction,

@@ -414,7 +414,7 @@  -- C declarator (K&R A8.5) and abstract declarator (K&R A8.8) (EXPORTED) -----  * We have one type qualifer list `[CTypeQual]' for each indirection (ie,+--  * We have one type qualifier list `[CTypeQual]' for each indirection (ie, --   each occurrence of `*' in the concrete syntax). -- --  * We unfold K&R's direct-declarators nonterminal into declarators.  Note

@@ -34,7 +34,7 @@ --  * In addition to the name spaces, the attribute structure tree contains --    a ident-definition table, which for attribute handles of identifiers --    refers to the identifiers definition.  These are only used in usage---    occurences, except for one exception: The tag identifiers in forward+--    occurrences, except for one exception: The tag identifiers in forward --    definitions of structures or enums get a reference to the corresponding --    full definition - see `CTrav' for full details. --

@@ -66,7 +66,7 @@                      return ac'  --- name analyis traversal+-- name analysis traversal -- ----------------------  -- traverse a complete header file@@ -180,7 +180,7 @@ naCExpr (CCompoundLit _ inits          _) = mapM_ (naCInit . snd) inits  --- auxilliary functions+-- auxiliary functions -- --------------------  -- raise an error and exception if the identifier is defined twice

@@ -35,7 +35,7 @@ -- -- --  Since some of the grammar productions are quite difficult to read---  (especially those involved with the decleration syntax) we document them+--  (especially those involved with the declaration syntax) we document them --  with an extended syntax that allows a more consise representation: -- --  Ordinary rules@@ -84,7 +84,7 @@ -- --- TODO ---------------------------------------------------------------------- -----  * GNUC __attribute__s should be enetered into the parse tree since they+--  * GNUC __attribute__s should be entered into the parse tree since they --    contain useful api/abi information. -- --  * Some other extensions are currently recognised by the parser but not@@ -907,7 +907,7 @@               case $4 of                 (d,s) -> CDecl declspecs ((d,Nothing,s) : dies) attr } -  -- We're being far too liberal in the parsing here, we realyl want to just+  -- We're being far too liberal in the parsing here, we really want to just   -- allow unnamed struct and union fields but we're actually allowing any   -- unnamed struct member. Making it allow only unnamed structs or unions in   -- the parser is far too tricky, it makes things ambiguous. So we'll have to

@@ -1,7 +1,7 @@ --  C -> Haskell Compiler: Lexer for C Header Files -- --  Author : Manuel M T Chakravarty, Duncan Coutts---  Created: 12 Febuary 2007+--  Created: 12 February 2007 -- --  Copyright (c) [1999..2004] Manuel M T Chakravarty --  Copyright (c) 2005-2007 Duncan Coutts

@@ -129,7 +129,7 @@   pretty _ = text "<<CPretty: CExpr not yet implemented!>>"  --- auxilliary functions+-- auxiliary functions -- --------------------  ident :: Ident -> Doc

@@ -109,7 +109,7 @@ type CState s    = (AttrC, s) type CT     s a  = CST (CState s) a --- read attributed struture tree+-- read attributed structure tree -- readAttrCCT        :: (AttrC -> a) -> CT s a readAttrCCT reader  = readCST $ \(ac, _) -> reader ac@@ -237,7 +237,7 @@ --   object association added; otherwise, if a definition of the same name was --   already present, it is returned (see DOCU section) -----  * it is checked that the first occurence of an enumeration tag is+--  * it is checked that the first occurrence of an enumeration tag is --   accompanied by a full definition of the enumeration -- defTag         :: Ident -> CTag -> CT s (Maybe CTag)@@ -256,16 +256,16 @@                            return Nothing               -- transparent for env   where     -- compute whether we have the case of a non-conflicting redefined tag-    -- definition, and if so, return the full definition and the foreward +    -- definition, and if so, return the full definition and the forward      -- definition's tag identifier     --     --  * the first argument contains the _previous_ definition     ---    --  * in the case of a structure, a foreward definition after a full+    --  * in the case of a structure, a forward definition after a full     --   definition is allowed, so we have to handle this case; enumerations-    --   don't allow foreward definitions+    --   don't allow forward definitions     ---    --  * there may also be multiple foreward definition; if we have two of+    --  * there may also be multiple forward definition; if we have two of     --   them here, one is arbitrarily selected to take the role of the full     --   definition      --@@ -747,7 +747,7 @@         decl <- findAndChaseDecl ide ind useShadows         structFromDecl (posOf ide) decl --- for the given identifier, check for the existance of both a type definition+-- for the given identifier, check for the existence of both a type definition -- or a struct, union, or enum definition (EXPORTED) -- --  * if a typedef and a tag exists, the typedef takes precedence@@ -915,4 +915,4 @@ enumForwardErr pos  =   raiseErrorCTExc pos      ["Forward definition of enumeration!",-     "ANSI C does not permit foreward definitions of enumerations!"]+     "ANSI C does not permit forward definitions of enumerations!"]

@@ -129,7 +129,7 @@ --  * `CHSHook' are binding hooks, which are being replaced by Haskell code by --   `GenBind.expandHooks'  -----  * `CHSCPP' and `CHSC' are fragements of C code that are being removed when+--  * `CHSCPP' and `CHSC' are fragments of C code that are being removed when --   generating the custom C header in `GenHeader.genHeader' -- --  * `CHSCond' are strutured conditionals that are being generated by@@ -393,7 +393,7 @@     contents version kind | hasCPP mod = showCHSModule mod pureHaskell                           | otherwise =        "-- GENERATED by " ++ version ++ " " ++ kind ++ "\n\-      \-- Edit the ORIGNAL .chs file instead!\n\n"+      \-- Edit the ORIGINAL .chs file instead!\n\n"       ++ showCHSModule mod pureHaskell  -- to keep track of the current state of the line emission automaton@@ -817,10 +817,10 @@   return $ CHSHook (CHSImport qual modid fName pos) : frags  -- Qualified module names do not get lexed as a single token so we need to--- reconstruct it from a sequence of identifer and dot tokens.+-- reconstruct it from a sequence of identifier and dot tokens. -- rebuildModuleId ide (CHSTokDot _ : CHSTokIdent _ ide' : toks) = -  let catIdent ide ide' = onlyPosIdent (posOf ide)  --FIXME: unpleasent hack+  let catIdent ide ide' = onlyPosIdent (posOf ide)  --FIXME: unpleasant hack                             (identToLexeme ide ++ '.' : identToLexeme ide')    in rebuildModuleId (catIdent ide ide') toks rebuildModuleId ide                                     toks  = (ide, toks)

@@ -108,8 +108,8 @@ --    C->Haskell keywords. -- --  * In the binding-hook lexer, the lexeme `#}' transfers control back to the ---    base lexer.  An occurence of the lexeme `{#' inside the binding-hook---    lexer triggers an error.  The symbol `{#' is not explcitly represented+--    base lexer.  An occurrence of the lexeme `{#' inside the binding-hook+--    lexer triggers an error.  The symbol `{#' is not explicitly represented --    in the resulting token stream.  However, the occurrence of a token --    representing one of the reserved identifiers `call', `context', `enum', --    and `field' marks the start of a binding hook.  Strictly speaking, `#}'@@ -119,7 +119,7 @@ --    representing `#}'. -- --  * The rule `ident' describes Haskell identifiers, but without---    distinguishing between variable and constructor identifers (ie, those+--    distinguishing between variable and constructor identifiers (ie, those --    starting with a lowercase and those starting with an uppercase letter). --    However, we use it also to scan C identifiers; although, strictly --    speaking, it is too general for them.  In the case of C identifiers,

@@ -374,7 +374,7 @@  -- merge the pointer and Haskell object maps -----  * currently, the read map overrides any entires for shared keys in the map+--  * currently, the read map overrides any entries for shared keys in the map --   that is already in the monad; this is so that, if multiple import hooks --   add entries for shared keys, the textually latest prevails; any local --   entries are entered after all import hooks anyway

@@ -27,7 +27,7 @@ -- --  * If there is an error in one binding hook, it is skipped and the next one  --    is processed (to collect as many errors as possible).  However, if at---    least one error occured, the expansion of binding hooks ends in a fatal+--    least one error occurred, the expansion of binding hooks ends in a fatal --    exception. -- --  * `CST' exceptions are used to back off a binding hook as soon as an error @@ -432,7 +432,7 @@     --     (ObjCO cdecl, ide) <- findFunObj ide True     mLock <- if isNol then return Nothing else getLock-    let ideLexeme = identToLexeme ide  -- orignal name might have been a shadow+    let ideLexeme = identToLexeme ide  -- original name might have been a shadow         hsLexeme  = ideLexeme `maybe` identToLexeme $ oalias         cdecl'    = ide `simplifyDecl` cdecl     callImport hook isPure isUns mLock ideLexeme hsLexeme cdecl' pos@@ -448,7 +448,7 @@     --     (ObjCO cdecl, cide) <- findFunObj ide True     mLock <- if isNol then return Nothing else getLock-    let ideLexeme = identToLexeme ide  -- orignal name might have been a shadow+    let ideLexeme = identToLexeme ide  -- original name might have been a shadow         hsLexeme  = ideLexeme `maybe` identToLexeme $ oalias         fiLexeme  = hsLexeme ++ "'_"   --  *Urgh* - probably unique...         fiIde     = onlyPosIdent nopos fiLexeme@@ -928,7 +928,7 @@         noDftMarshErr pos "\"out\"" hsTy cTys       return (marsh, case marsh of {Just (_, kind) -> kind == CHSIOArg})     ---    -- add void marshaller if no explict one is given+    -- add void marshaller if no explicit one is given     --     addDftVoid marsh@(Just (_, kind)) = return (marsh, kind == CHSIOArg)     addDftVoid        Nothing         = do@@ -1001,7 +1001,7 @@         _                                                   ->            ptrExpectedErr pos --- replaces a decleration by its alias if any+-- replaces a declaration by its alias if any -- --  * the alias inherits any field size specification that the original --   declaration may have@@ -1223,7 +1223,7 @@  -- types that may occur in foreign declarations, ie, Haskell land types -----  * we reprsent C functions with no arguments (ie, the ANSI C `void'+--  * we represent C functions with no arguments (ie, the ANSI C `void' --   argument) by `FunET UnitET res' rather than just `res' internally, --   although the latter representation is finally emitted into the binding --   file; this is because we need to know which types are functions (in@@ -1936,7 +1936,7 @@   illegalConstExprErr cpos "! applied to a float"  --- auxilliary functions+-- auxiliary functions -- --------------------  -- create an identifier without position information

@@ -42,7 +42,7 @@ --  Note: These also depend on suffixes defined in the compiler proper. -- --  .h   C header file---  .i   pre-processeed C header file+--  .i   pre-processed C header file --  .hs  Haskell file --  .chs Haskell file with C->Haskell hooks (binding file) --  .chi C->Haskell interface file@@ -54,13 +54,13 @@ --  --cppopts=CPPOPTS --        Pass the additional options CPPOPTS to the C preprocessor. -----        Repeated occurences accumulate.+--        Repeated occurrences accumulate. -- --  -c CPP --  --cpp=CPP --        Use the executable CPP to invoke CPP. -----        In the case of repeated occurences, the last takes effect.+--        In the case of repeated occurrences, the last takes effect. -- --  -d TYPE --  --dump=TYPE@@ -128,7 +128,7 @@ --        Wrap each foreign function call in the function NAME. This --        function is usually a function that acquires a lock for --        the memory region that the called function is about to access.---        A wrap function can also be specificed within the file in the+--        A wrap function can also be specified within the file in the --        context hook, in which case it overrides the command line function. --        The wrapper function can be omitted on a call-by-call basis by --        using the nolock option in the call hook.@@ -215,7 +215,7 @@           | PreComp String      -- write or read a precompiled header           | LockFun String      -- wrap each function call in this function           | Version             -- print version information on stderr-          | Error   String      -- error occured during processing of options+          | Error   String      -- error occurred during processing of options           deriving Eq  data DumpType = Trace         -- compiler trace

@@ -42,7 +42,7 @@ {   union bitfield_direction_union v; -  /* if setting the second bit in a bitfield makes the storeage unit contain+  /* if setting the second bit in a bitfield makes the storage unit contain    * the value `2', the direction of bitfields must be increasing towards the    * MSB     */

@@ -1,6 +1,6 @@ cabal-version:  3.0 Name:   gtk2hs-buildtools-Version:        0.13.10.0+Version:        0.13.11.0 License:        GPL-2.0-only License-file:   COPYING Copyright:      (c) 2001-2010 The Gtk2Hs Team@@ -20,7 +20,7 @@                 to call back from C to Haskell. These tools are not needed                 to actually run Gtk2Hs programs. Category:       Development-Tested-With:    GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.1+Tested-With:    GHC == 9.10.1, GHC == 9.8.2, GHC == 9.6.6, GHC == 9.4.8, GHC == 9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2 Data-Files:     callbackGen/Signal.chs.template                 hierarchyGen/hierarchy.list                 hierarchyGen/Hierarchy.chs.template@@ -40,7 +40,7 @@         build-depends:   base >= 4 && < 5,                          process, array, pretty,                          filepath, random,-                         Cabal >= 1.24.0.0,+                         Cabal >= 2.0,                          filepath >= 1.3.0.0,                          directory >= 1.2.0.0,                          containers >= 0.5.5.1

@@ -10,7 +10,7 @@ import System.IO (stderr, hPutStr) import Paths_gtk2hs_buildtools (getDataFileName) --- The current object and its inheritence relationship is defined by all+-- The current object and its inheritance relationship is defined by all -- ancestors and their column position. type ObjectSpec = [(Int,String)] 

@@ -10,7 +10,7 @@ # function is not specified, the <name> is converted to # gtk_<name'>_get_type where <name'> is <name> where each upperscore # letter is converted to an underscore and lowerletter. The underscore-# is omitted if an upperscore letter preceeded: GtkHButtonBox ->+# is omitted if an upperscore letter preceded: GtkHButtonBox -> # gtk_hbutton_box_get_type. The generation of a type can be # conditional by appending 'if <tag>'. Such types are only produces if # --tag=<tag> is given on the command line of TypeGenerator.@@ -213,7 +213,7 @@         GtkSourceLanguageManager	if gtksourceview2 	GladeXML			as GladeXML, glade_xml_get_type if libglade 	GConfClient			as GConf if gconf-# These ones are actualy interfaces, but interface implementations are GObjects+# These ones are actually interfaces, but interface implementations are GObjects 	GtkEditable 	GtkSourceStyle			as SourceStyleObject if gtksourceview2 	GtkSourceStyleScheme		if sourceview

@@ -10,6 +10,7 @@   c2hsLocal   ) where +import Data.String (fromString) import Data.Maybe (mapMaybe) #if MIN_VERSION_Cabal(2,4,0) import Distribution.Pretty (prettyShow)@@ -30,7 +31,7 @@                                                emptyBuildInfo, allBuildInfo,                                                Library(..),                                                explicitLibModules, hasLibs)-import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms),+import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..), buildDir,                                            InstallDirs(..),                                            ComponentLocalBuildInfo,                                            componentPackageDeps,@@ -122,7 +123,7 @@ gtk2hsUserHooks = simpleUserHooks {     -- hookedPrograms is only included for backwards compatibility with older Setup.hs.     hookedPrograms = [typeGenProgram, signalGenProgram, c2hsLocal],-    hookedPreProcessors = [("chs", ourC2hs)],+    hookedPreProcessors = [(fromString "chs", ourC2hs)],     confHook = \pd cf ->       (fmap adjustLocalBuildInfo (confHook simpleUserHooks pd cf)),     postConf = \args cf pd lbi -> do@@ -350,7 +351,7 @@   let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest   -- cannot use the recommended 'findModuleFiles' since it fails if there exists   -- a modules that does not have a .chi file-  mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi] . toFilePath)+  mFiles <- mapM (findFileWithExtension' [fromString "chi"] [buildDir lbi] . toFilePath)                    (PD.explicitLibModules lib)    let files = [ f | Just f <- mFiles ]@@ -478,7 +479,7 @@ #else          id  #endif -  let findModule m = findFileWithExtension [".chs.pp",".chs"] (map toPath srcDirs)+  let findModule m = findFileWithExtension [fromString ".chs.pp", fromString ".chs"] (map toPath srcDirs)                        (joinPath (components m))   mExpFiles <- mapM findModule expMods   mOthFiles <- mapM findModule othMods@@ -511,7 +512,7 @@  -- Extract the dependencies of this file. This is intentionally rather naive as it -- ignores CPP conditionals. We just require everything which means that the--- existance of a .chs module may not depend on some CPP condition.+-- existence of a .chs module may not depend on some CPP condition. extractDeps :: ModDep -> IO ModDep extractDeps md@ModDep { mdLocation = Nothing } = return md extractDeps md@ModDep { mdLocation = Just f } = withUTF8FileContents f $ \con -> do