[Gtk2hs-commit] gtk2hs/tools/c2hs/c CParser.hs,1.1,1.2

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11342/tools/c2hs/c

Modified Files:
	CParser.hs 
Log Message:
Allow c2hs to cope with (and ignore) multiple __atribute__ annotations.
Required for glib-2.6.


Index: CParser.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c/CParser.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CParser.hs	21 Nov 2004 21:05:27 -0000	1.1
+++ CParser.hs	14 Jan 2005 00:18:32 -0000	1.2
@@ -346,7 +346,7 @@
   list (
       ctoken_ (CTokGnuC GnuCExtTok) `opt` ()      -- ignore GCC's __extension__
   -*> parseCDeclSpec 
-  *-> optMaybe parseGnuCAttr			  -- ignore GCC's __attribute__
+  *-> list parseGnuCAttr			  -- ignore GCC's __attribute__
   )*> parseCDeclr 
   *> list parseCDecl 
   *> parseCCompStat
@@ -489,7 +489,7 @@
   list1 (
       ctoken_ (CTokGnuC GnuCExtTok) `opt` ()      -- ignore GCC's __extension__
   -*> parseCDeclSpec 
-  *-> optMaybe parseGnuCAttr			  -- ignore GCC's __attribute__
+  *-> list parseGnuCAttr			  -- ignore GCC's __attribute__
   )*> seplist comma_ parseCInitDecl *-> semic_
   `actionAttrs`
     (\(specs, declrs) -> 
@@ -681,7 +681,7 @@
       (pointer `opt` id)
   *>  base
   *>  many (flip (.)) id (arrayType <|> newStyleFun <|> oldStyleFun)
-  *-> optMaybe parseGnuCAttr			  -- ignore GCC's __attribute__
+  *-> list parseGnuCAttr			  -- ignore GCC's __attribute__
   `action`
     \((ptr, base), declrTrans) -> ptr . declrTrans $ base 
   where