summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Elstner <daniel.kitta@gmail.com>2009-09-11 03:26:27 +0200
committerDaniel Elstner <daniel.kitta@gmail.com>2009-09-11 03:26:27 +0200
commit6c4bb98918c39b9ca2d0cf501b66536a9d560b60 (patch)
tree45af0bc4cd72b9aef1ddbb6331d8a433ba582301
parentea3d93146ea1259652fcb3b443279d31b8e1b008 (diff)
downloadglibmm-6c4bb98918c39b9ca2d0cf501b66536a9d560b60.tar.gz
Correctly quote the extracted comment for M4
* tools/pm/WrapParser.pm (extract_preceding_documentation): Add M4 quotes around the extracted comment, since it may contain sequences of end-quote + macro + start-quote.
-rw-r--r--ChangeLog8
-rw-r--r--tools/pm/WrapParser.pm4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d1e0aa2f..983e9b19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-09-11 Daniel Elstner <danielk@openismus.com>
+ Correctly quote the extracted comment for M4
+
+ * tools/pm/WrapParser.pm (extract_preceding_documentation): Add M4
+ quotes around the extracted comment, since it may contain sequences
+ of end-quote + macro + start-quote.
+
+2009-09-11 Daniel Elstner <danielk@openismus.com>
+
Slightly clean up gross Perl code in gmmproc.in
* tools/gmmproc.in: Try not to abuse Perl too much, and get rid of
diff --git a/tools/pm/WrapParser.pm b/tools/pm/WrapParser.pm
index cebb294a..05f82e15 100644
--- a/tools/pm/WrapParser.pm
+++ b/tools/pm/WrapParser.pm
@@ -821,8 +821,8 @@ sub extract_preceding_documentation ($)
if (m#\A/\s*\*(?:\*`|`!)(.+)'\*/\s*\z#s or m#\A\s*//`[/!](.+)'\s*\z#s)
{
- $comment = $1;
- $comment =~ s/\s+$//;
+ $comment = '`' . $1;
+ $comment =~ s/\s*$/'/;
}
else
{