texinfo/tp TODO Texinfo/Parser.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/10/29 12:23:44

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm 

Log message:
        Stricter regexp for cpp line directives.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.194&r2=1.195
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.322&r2=1.323

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- TODO        22 Oct 2011 13:15:31 -0000      1.194
+++ TODO        29 Oct 2011 12:23:43 -0000      1.195
@@ -2,7 +2,7 @@
 perl -w t/02coverage.t -o
 xmllint --nonet --noout --valid commands.xml
 
-Handling of #line.
+Test for the handling of #line.
 
 In xml output, as can be seen in xtable/table_nested macro output do
 not begin with an end of line

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -b -r1.322 -r1.323
--- Texinfo/Parser.pm   29 Oct 2011 11:31:56 -0000      1.322
+++ Texinfo/Parser.pm   29 Oct 2011 12:23:44 -0000      1.323
@@ -1684,7 +1684,7 @@
       while (defined($line)) {
         $line =~ s/\x{7F}.*\s*//;
         if ($self->{'CPP_LINE_DIRECTIVES'}
-            and $line =~ /^\s*#\s*(line)? (\d+)( "([^"]+)")?(\s+\d+)*/) {
+            and $line =~ /^\s*#\s*(line)? (\d+)( "([^"]+)")?(\s+\d+)*\s*$/) {
           $current->{'line_nr'} = $2;
           if (defined($4)) {
             $current->{'name'} = $4;