[gtk-doc] varargs: revert changing two of the regexps
- From: Stefan Kost <stefkost src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc] varargs: revert changing two of the regexps
- Date: Tue, 13 Nov 2012 17:19:42 +0000 (UTC)
commit 8f228828c6515076c55baed010db594936477894
Author: Stefan Sauer <ensonic users sf net>
Date: Tue Nov 13 18:18:52 2012 +0100
varargs: revert changing two of the regexps
These are the ones that parsing the tmpl or the actual code.
gtkdoc-common.pl.in | 2 +-
gtkdoc-mkdb.in | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in
index 3cd62e7..5175473 100644
--- a/gtkdoc-common.pl.in
+++ b/gtkdoc-common.pl.in
@@ -462,7 +462,7 @@ sub ParseMacroDeclaration {
$param =~ s/^\s+//;
$param =~ s/\s*$//;
# Allow varargs variations
- if ($param =~ m/^\.\.\.$/) {
+ if ($param =~ m/^.*\.\.\.$/) {
$param = "...";
}
if ($param =~ m/\S/) {
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index 611af81..19d9c76 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -4834,15 +4834,15 @@ sub ReadSignalsFile {
#############################################################################
# Function : ReadTemplateFile
# Description : This reads in the manually-edited documentation file
-# corresponding to the file currently being created, so we can
-# insert the documentation at the appropriate places.
-# It outputs %SymbolTypes, %SymbolDocs and %SymbolParams, which
-# is a hash of arrays.
-# NOTE: This function is duplicated in gtkdoc-mktmpl (but
-# slightly different).
+# corresponding to the file currently being created, so we can
+# insert the documentation at the appropriate places.
+# It outputs %SymbolTypes, %SymbolDocs and %SymbolParams, which
+# is a hash of arrays.
+# NOTE: This function is duplicated in gtkdoc-mktmpl (but
+# slightly different).
# Arguments : $docsfile - the template file to read in.
-# $skip_unused_params - 1 if the unused parameters should be
-# skipped.
+# $skip_unused_params - 1 if the unused parameters should be
+# skipped.
#############################################################################
sub ReadTemplateFile {
@@ -4947,7 +4947,7 @@ sub ReadTemplateFile {
$param_name = "Returns";
}
# Allow varargs variations
- if ($param_name =~ m/^\.\.\.$/) {
+ if ($param_name =~ m/^.*\.\.\.$/) {
$param_name = "...";
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]