diff --git a/ChangeLog b/ChangeLog index 3a2fd751c..d66109abb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-10 Mike Kestner + + * parser/gapi2xml.pl : class parsing regex needs to handle protected + comments too. + 2006-08-07 Mike Kestner * gtk/Gtk.metadata : remainder of new API massaging for existing diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index 2866211a9..7631100cd 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -970,13 +970,13 @@ sub addSignalElem return $class; } - if ($class =~ /;\s*(\/\*< public >\*\/)?(G_CONST_RETURN\s+)?(\w+\s*\**)\s*\(\s*\*\s*$method\)\s*\((.*?)\);/) { - $ret = $3; $parms = $4; + if ($class =~ /;\s*(\/\*< (public|protected) >\s*\*\/)?(G_CONST_RETURN\s+)?(\w+\s*\**)\s*\(\s*\*\s*$method\)\s*\((.*?)\);/) { + $ret = $4; $parms = $5; addReturnElem($sig_elem, $ret); if ($parms && ($parms ne "void")) { addParamsElem($sig_elem, split(/,/, $parms)); } - $class =~ s/;\s*(\/\*< public >\*\/)?(G_CONST_RETURN\s+)?\w+\s*\**\s*\(\s*\*\s*$method\)\s*\(.*?\);/;/; + $class =~ s/;\s*(\/\*< (public|protected) >\s*\*\/)?(G_CONST_RETURN\s+)?\w+\s*\**\s*\(\s*\*\s*$method\)\s*\(.*?\);/;/; } else { die "$method $class"; }