Allow an empty pair of parentheses in the innermost match. This fixes the

* tools/pm/GtkDefs.pm (read_defs): Allow an empty pair of
parentheses in the innermost match.  This fixes the problem of
gmmproc choking on "()" in the documentation strings.  This would
still break on unmatched parentheses, though.  Of course the
parser should just skip over quoted strings, but I wasn't able
to get that to work.
* glib/src/glib_enums.defs (GNormalizeMode): Manually fix the
improperly parsed value of G_NORMALIZE_NFD.  Fortunately this
doesn't change anything since the "#error" token was interpreted
as zero, which happens to be the right value.
* glib/src/glib_functions.defs (g_iconv): Manually convert to
a function definition, as it was improperly parsed as a method
with a zero-length name (!) of object GIConv.  This fixes the
annoying gmmproc warning about an allegedly unwrapped method.

4 files changed, 20 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 12606a81..cdadb9d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-11-28  Daniel Elstner  <danielk@openismus.com>
+
+	* tools/pm/GtkDefs.pm (read_defs): Allow an empty pair of
+	parentheses in the innermost match.  This fixes the problem of
+	gmmproc choking on "()" in the documentation strings.  This would
+	still break on unmatched parentheses, though.  Of course the
+	parser should just skip over quoted strings, but I wasn't able
+	to get that to work.
+	* glib/src/glib_enums.defs (GNormalizeMode): Manually fix the
+	improperly parsed value of G_NORMALIZE_NFD.  Fortunately this
+	doesn't change anything since the "#error" token was interpreted
+	as zero, which happens to be the right value.
+	* glib/src/glib_functions.defs (g_iconv): Manually convert to
+	a function definition, as it was improperly parsed as a method
+	with a zero-length name (!) of object GIConv.  This fixes the
+	annoying gmmproc warning about an allegedly unwrapped method.
+
 2006-11-27  Daniel Elstner  <danielk@openismus.com>
 
 	* tools/enum.pl (parse): Ignore whitespace in front of an enum
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs
index 29a8f52f..3a379676 100644
--- a/glib/src/glib_enums.defs
+++ b/glib/src/glib_enums.defs
@@ -577,7 +577,7 @@
   (c-name "GNormalizeMode")
   (values
     '("default" "G_NORMALIZE_DEFAULT" "0")
-    '("nfd" "G_NORMALIZE_NFD" "#error")
+    '("nfd" "G_NORMALIZE_NFD" "0")
     '("default-compose" "G_NORMALIZE_DEFAULT_COMPOSE" "1")
     '("nfc" "G_NORMALIZE_NFC" "1")
     '("all" "G_NORMALIZE_ALL" "2")
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index a7797ed5..58f949a2 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -1405,8 +1405,7 @@
   )
 )
 
-(define-method 
-  (of-object "GIConv")
+(define-function g_iconv
   (c-name "g_iconv")
   (return-type "size_t")
   (parameters
diff --git a/tools/pm/GtkDefs.pm b/tools/pm/GtkDefs.pm
index ebfb7d09..fbe1d1c2 100644
--- a/tools/pm/GtkDefs.pm
+++ b/tools/pm/GtkDefs.pm
@@ -104,7 +104,7 @@ sub read_defs($$;$)
             (?:
                 [^()]*
                 \(
-                [^()]+
+                [^()]*
                 \)
             )*
             [^()]*