gtk-doc r595 - in trunk: . tests/bugs/docs tests/bugs/src

[stefkost svn gnome org]

Author: stefkost
Date: Wed Jul 23 19:58:54 2008
New Revision: 595
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=595&view=rev

Log:
	* gtkdoc-mkdb.in:
	* gtkdoc-scan.in:
	* tests/bugs/docs/tester-sections.txt:
	* tests/bugs/src/tester.h:
	  Accept "char const *" as well. Fixes #544172.



Modified:
   trunk/ChangeLog
   trunk/gtkdoc-mkdb.in
   trunk/gtkdoc-scan.in
   trunk/tests/bugs/docs/tester-sections.txt
   trunk/tests/bugs/src/tester.h

Modified: trunk/gtkdoc-mkdb.in
==============================================================================
--- trunk/gtkdoc-mkdb.in	(original)
+++ trunk/gtkdoc-mkdb.in	Wed Jul 23 19:58:54 2008
@@ -1275,8 +1275,8 @@
     my $id = &CreateValidSGMLID ($symbol);
     my $condition = &MakeConditionDescription ($symbol);
 
-    # Take out the return type
-    $declaration =~ s/<RETURNS>\s*((const\s+|G_CONST_RETURN\s+|unsigned\s+|struct\s+|enum\s+)*)(\w+)\s*(\**\s*(const|G_CONST_RETURN)?\s*\**\s*(restrict)?\s*)<\/RETURNS>\n//;
+    # Take out the return type     $1                                                           $3   $4
+    $declaration =~ s/<RETURNS>\s*((const\s+|G_CONST_RETURN\s+|unsigned\s+|struct\s+|enum\s+)*)(\w+)(\s*\**\s*(const|G_CONST_RETURN)?\s*\**\s*(restrict)?\s*)<\/RETURNS>\n//;
     my $type_modifier = defined($1) ? $1 : "";
     my $type = $3;
     my $pointer = $4;
@@ -1290,6 +1290,7 @@
     # We output const rather than G_CONST_RETURN.
     $type_modifier =~ s/G_CONST_RETURN/const/g;
     $pointer =~ s/G_CONST_RETURN/const/g;
+    $pointer =~ s/^\s+/ /g;
 
     my $ret_type_len = length ($start) + length ($type_modifier)
 	+ length ($pointer) + length ($type);

Modified: trunk/gtkdoc-scan.in
==============================================================================
--- trunk/gtkdoc-scan.in	(original)
+++ trunk/gtkdoc-scan.in	Wed Jul 23 19:58:54 2008
@@ -353,12 +353,14 @@
 
 	    # TYPEDEF'D FUNCTIONS (i.e. user functions)
 
-	    } elsif (m/^\s*typedef\s+((const\s+|G_CONST_RETURN\s+)?\w+)\s*(\**)\s*\(\*\s*(\w+)\)\s*\(/) {
-		$ret_type = "$1 $3";
-		$symbol = $4;
+            #                        $1                                $3            $4             $5
+	    } elsif (m/^\s*typedef\s+((const\s+|G_CONST_RETURN\s+)?\w+)(\s+const)?\s*(\**)\s*\(\*\s*(\w+)\)\s*\(/) {
+		my $p3 = defined($3) ? $3 : "";
+		$ret_type = "$1$p3 $4";
+		$symbol = $5;
 		$decl = $';
 		$in_declaration = "user_function";
-                #print "DEBUG: user function: $symbol\n";
+		print "DEBUG: user function: $symbol\n";
 
 
 	    # ENUMS

Modified: trunk/tests/bugs/docs/tester-sections.txt
==============================================================================
--- trunk/tests/bugs/docs/tester-sections.txt	(original)
+++ trunk/tests/bugs/docs/tester-sections.txt	Wed Jul 23 19:58:54 2008
@@ -18,6 +18,7 @@
 bug_471014
 bug_477532
 bug_501038
+bug_544172
 <SUBSECTION Standard>
 <SUBSECTION Private>
 </SECTION>

Modified: trunk/tests/bugs/src/tester.h
==============================================================================
--- trunk/tests/bugs/src/tester.h	(original)
+++ trunk/tests/bugs/src/tester.h	Wed Jul 23 19:58:54 2008
@@ -118,5 +118,15 @@
  */
 #define BUG_530758 "dummy"
 
+/** 
+ * bug_544172:
+ * @self: object pointer.
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=544172
+ *
+ * Returns: result or %NULL.
+ **/
+typedef char const * (*bug_544172) (char const *self);
+
 #endif // GTKDOC_TESTER_H