[22195] trunk/dports/devel/c2hs/files

[source_changes at macosforge.org]

Revision: 22195
          http://trac.macosforge.org/projects/macports/changeset/22195
Author:   gwright at macports.org
Date:     2007-02-21 07:15:40 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
Add the patches needed to make c2hs build with ghc 6.6.

Added Paths:
-----------
    trunk/dports/devel/c2hs/files/patch-CLexer.hs
    trunk/dports/devel/c2hs/files/patch-CParser.hs

Added: trunk/dports/devel/c2hs/files/patch-CLexer.hs
===================================================================
--- trunk/dports/devel/c2hs/files/patch-CLexer.hs	                        (rev 0)
+++ trunk/dports/devel/c2hs/files/patch-CLexer.hs	2007-02-21 15:15:40 UTC (rev 22195)
@@ -0,0 +1,38 @@
+--- c2hs/c/CLexer.hs.sav	2007-02-19 06:07:54.000000000 -0500
++++ c2hs/c/CLexer.hs	2007-02-19 06:08:25.000000000 -0500
+@@ -13,7 +13,7 @@
+ import Idents    (Ident, lexemeToIdent, identToLexeme)
+ 
+ import Data.Set  (Set)
+-import qualified Data.Set as Set (mkSet, addToSet, elementOf)
++import qualified Data.Set as Set (fromList, insert, member)
+ 
+ 
+ #if __GLASGOW_HASKELL__ >= 603
+@@ -413,7 +413,7 @@
+   name <- getNewName
+   tdefs <- getTypedefs
+   let ident = lexemeToIdent pos cs name
+-  if ident `Set.elementOf` tdefs
++  if ident `Set.member` tdefs
+     then return (CTokTyIdent pos ident)
+     else return (CTokIdent   pos ident)
+ 
+@@ -526,7 +526,7 @@
+ 	  alex_inp = input,
+ 	  alex_last = interr "CLexer.execParser: Touched undefined token!",
+ 	  alex_names = names,
+-	  alex_tdefs = Set.mkSet builtins
++	  alex_tdefs = Set.fromList builtins
+         }
+ 
+ {-# INLINE returnP #-}
+@@ -571,7 +571,7 @@
+ 
+ addTypedef :: Ident -> P ()
+ addTypedef ident = (P $ \s at PState{alex_tdefs=tdefs} ->
+-                             POk s{alex_tdefs = tdefs `Set.addToSet` ident} ())
++                             POk s{alex_tdefs = ident `Set.insert` tdefs} ())
+ 
+ getInput :: P AlexInput
+ getInput = P $ \s at PState{alex_pos=p, alex_inp=i} -> POk s (p,i)

Added: trunk/dports/devel/c2hs/files/patch-CParser.hs
===================================================================
--- trunk/dports/devel/c2hs/files/patch-CParser.hs	                        (rev 0)
+++ trunk/dports/devel/c2hs/files/patch-CParser.hs	2007-02-21 15:15:40 UTC (rev 22195)
@@ -0,0 +1,11 @@
+--- c2hs/c/CParser.hs.sav	2007-02-19 06:17:04.000000000 -0500
++++ c2hs/c/CParser.hs	2007-02-19 06:18:17.000000000 -0500
+@@ -5,7 +5,7 @@
+ import Maybe      (catMaybes)
+ 
+ import Common     (Position, Pos(..), nopos)
+-import Data.Set	  (Set, mkSet, union, elementOf)
++import Data.Set	  (Set, fromList, union, member)
+ import Utils      (Tag(tag))
+ import UNames     (Name, NameSupply, names)
+ import Idents     (Ident)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070221/b0ccccf9/attachment.html