gtk-doc r548 - in trunk: . tests/bugs/src

[stefkost svn gnome org]

Author: stefkost
Date: Fri Feb  1 11:35:10 2008
New Revision: 548
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=548&view=rev

Log:
	* gtkdoc-common.pl.in:
	* gtkdoc-mkdb.in:
	* gtkdoc-mktmpl.in:
	* tests/bugs/src/tester.h:
	  Improve tmpl parsing and add some more logging. Fixes #512154.



Modified:
   trunk/ChangeLog
   trunk/gtkdoc-common.pl.in
   trunk/gtkdoc-mkdb.in
   trunk/gtkdoc-mktmpl.in
   trunk/tests/bugs/src/tester.h

Modified: trunk/gtkdoc-common.pl.in
==============================================================================
--- trunk/gtkdoc-common.pl.in	(original)
+++ trunk/gtkdoc-common.pl.in	Fri Feb  1 11:35:10 2008
@@ -146,9 +146,6 @@
 
         last if $line =~ /^\s*\}\s*\w*\s*$/;
 
-	# FIXME: The regexes here are the same as in OutputFunction; 
-	#        this functionality should be separated out.
-
         # Try to match structure members which are functions
 	if ($line =~ m/^
 		 (const\s+|G_CONST_RETURN\s+|unsigned\s+|signed\s+|long\s+|short\s+)*(struct\s+|enum\s+)?  # mod1
@@ -184,7 +181,7 @@
 
 	# Try to match normal struct fields of comma-separated variables/
 	} elsif ($line =~ m/^
-	    ((?:const\s+|unsigned\s+|volatile\s+|signed\s+|short\s+|long\s+)*)(struct\+|enum\s+)? # mod1
+	    ((?:const\s+|volatile\s+|unsigned\s+|signed\s+|short\s+|long\s+)?)(struct\s+|enum\s+)? # mod1
 	    (\w+)\s*                            # type
 	    (\** \s* const\s+)?                 # mod2
 	    (.*)				# variables
@@ -197,6 +194,8 @@
 	    my $mod2 = defined($4) ? " " . $4 : "";
 	    my $list = $5;
 
+            #print "'$mod1' '$type' '$mod2' '$list' \n";
+
 	    $mod1 =~ s/ / /g;
 	    $mod2 =~ s/ / /g;
 

Modified: trunk/gtkdoc-mkdb.in
==============================================================================
--- trunk/gtkdoc-mkdb.in	(original)
+++ trunk/gtkdoc-mkdb.in	Fri Feb  1 11:35:10 2008
@@ -3480,6 +3480,7 @@
 		} else {
                     my $params = $SourceSymbolParams{$symbol};
                     my $j;
+                    #print "Merge needed for $symbol, tmpl_params: ",$#$tmpl_params,", source_params: ",$#$params," \n";
                     for ($j = 0; $j <= $#$tmpl_params; $j += 2) {
                         my $tmpl_param_name = $$tmpl_params[$j];
 

Modified: trunk/gtkdoc-mktmpl.in
==============================================================================
--- trunk/gtkdoc-mktmpl.in	(original)
+++ trunk/gtkdoc-mktmpl.in	Fri Feb  1 11:35:10 2008
@@ -349,7 +349,7 @@
     my ($type, $symbol, $declaration) = @_;
     my ($output) = "";
 
-#    print "Outputting $type: $symbol\n";
+    #print "Outputting $type: $symbol\n";
 
     # See if symbol already has a description.
     my ($symbol_desc) = $SymbolDocs{$symbol};
@@ -435,7 +435,6 @@
 	    $param_num++;
 	}
 
-
 	if ($ret_type ne "void" || $ret_type_modifier || $ret_type_pointer) {
 	    $output .= &OutputParam ($symbol, "Returns", $template_exists, 1,
 				     "");

Modified: trunk/tests/bugs/src/tester.h
==============================================================================
--- trunk/tests/bugs/src/tester.h	(original)
+++ trunk/tests/bugs/src/tester.h	Fri Feb  1 11:35:10 2008
@@ -106,7 +106,7 @@
  * http://bugzilla.gnome.org/show_bug.cgi?id=512154
  */
 typedef struct {
-  unsigned long        index;
+  unsigned long index;
 } Bug512154;
 
 #endif // GTKDOC_TESTER_H