From: Matthias Clasen <maclas@gmx.de>
Date: Fri, 27 Feb 2004 00:49:56 +0000 (+0000)
Subject: Support parsing of intializers containing macros with arguments. (#129717)
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5c57631f690d07bd4aaf990c3bee54d4c479ea4d;p=dana%2Fcg-glib.git

Support parsing of intializers containing macros with arguments. (#129717)

Fri Feb 27 01:49:22 2004  Matthias Clasen  <maclas@gmx.de>

	* glib-mkenums.in: Support parsing of intializers containing
	macros with arguments.  (#129717)
---

diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index 1643fd62..969c84a2 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -83,7 +83,9 @@ sub parse_entries {
         if (m@^\s*
               (\w+)\s*                   # name
               (?:=(                      # value
-                   (?:[^,/]|/(?!\*))*
+		   \s*\w+\s*\(.*\)\s*       # macro with multiple args
+		   |                        # OR
+                   (?:[^,/]|/(?!\*))*       # anything but a comma or comment
                   ))?,?\s*
               (?:/\*<                    # options
                 (([^*]|\*(?!/))*)