From: Juerg Billeter <j@bitron.ch>
Date: Tue, 7 Aug 2007 20:35:01 +0000 (+0000)
Subject: improve class and signal parsing, patch by Marcelo Lira, fixes bug 464388
X-Git-Tag: VALA_0_1_3~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98cfc097a5b4c7e09b95f09fa1f4e4ea86354e62;p=thirdparty%2Fvala.git

improve class and signal parsing, patch by Marcelo Lira, fixes bug 464388

2007-08-07  Juerg Billeter  <j@bitron.ch>

	* vapigen/gidlgen/gapi2xml.pl: improve class and signal parsing,
	  patch by Marcelo Lira, fixes bug 464388

svn path=/trunk/; revision=439
---

diff --git a/ChangeLog b/ChangeLog
index 8a1028bb0..acf93363c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-07  Jürg Billeter  <j@bitron.ch>
+
+	* vapigen/gidlgen/gapi2xml.pl: improve class and signal parsing,
+	  patch by Marcelo Lira, fixes bug 464388
+
 2007-08-07  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
 
 	* vapi/glib-2.0.vala: fix the C name of Process.close_pid
diff --git a/vapigen/gidlgen/gapi2xml.pl b/vapigen/gidlgen/gapi2xml.pl
index 4221c2e2a..cc294c6e6 100755
--- a/vapigen/gidlgen/gapi2xml.pl
+++ b/vapigen/gidlgen/gapi2xml.pl
@@ -327,6 +327,9 @@ foreach $type (sort(keys(%ifaces))) {
 foreach $type (sort(keys(%objects))) {
 	($inst, $class) = split(/:/, $objects{$type});
 	$class = $inst . "Class" if (!$class);
+
+	next if ($inst eq "");
+
 	$initfunc = $pedefs{lc($inst)};
 	$typefunc = $typefuncs{lc($inst)};
 	$insttype = delete $types{$inst};
@@ -975,7 +978,7 @@ sub addSignalElem
 	$sig_elem = $doc->createElement('signal');
 	$node->appendChild($sig_elem);
 
-	if ($spec =~ /\(\"([\w\-]+)\"/) {
+	if ($spec =~ /[\s]*\([\s]*\"([\w\-]+)\"/) {
 		my $cname = $1;
 		$cname =~ s/-/_/g;
 		$sig_elem->setAttribute('name', $cname);