[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/02coverage.t t/r...
From: |
Patrice Dumas |
Subject: |
texinfo/tp Texinfo/Parser.pm t/02coverage.t t/r... |
Date: |
Mon, 04 Oct 2010 23:20:31 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/04 23:20:31
Modified files:
tp/Texinfo : Parser.pm
tp/t : 02coverage.t
tp/t/results/coverage: accents.pl
Log message:
Don't let accent commands swallow end of lines.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/02coverage.t?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/accents.pl?cvsroot=texinfo&r1=1.1&r2=1.2
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- Texinfo/Parser.pm 4 Oct 2010 23:14:51 -0000 1.45
+++ Texinfo/Parser.pm 4 Oct 2010 23:20:17 -0000 1.46
@@ -1219,7 +1219,8 @@
} elsif ($accent_commands{$current->{'cmdname'}}) {
if ($line =~ /^\s/ and $line !~ /^\n/) {
if ($current->{'cmdname'} =~ /^[a-zA-Z]/) {
- $line =~ s/^\s+//;
+ # could also be \s+ but then it may swallow end of line
+ $line =~ s/^\s//;
} else {
_line_warn ($self, sprintf($self->
__("Accent command address@hidden' must not be followed by
whitespace"),
Index: t/02coverage.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/02coverage.t,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/02coverage.t 4 Oct 2010 23:14:51 -0000 1.12
+++ t/02coverage.t 4 Oct 2010 23:20:21 -0000 1.13
@@ -16,9 +16,12 @@
accent at end of line @ringaccent
accent at end of line and spaces @ringaccent
+accent followed by @@ @address@hidden
accent character with spaces @~ following.
accent character at end of line @~
+accent character followed by @@ @address@hidden
+
'],
['block_commands','
Index: t/results/coverage/accents.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/accents.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage/accents.pl 4 Oct 2010 23:14:51 -0000 1.1
+++ t/results/coverage/accents.pl 4 Oct 2010 23:20:26 -0000 1.2
@@ -54,6 +54,37 @@
'cmdname' => 'ringaccent',
'contents' => [],
'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'accent followed by '
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => '.',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
}
],
'parent' => {},
@@ -94,6 +125,32 @@
'parent' => {},
'text' => '
'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'accent character followed by '
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '~',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => '.',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
}
],
'parent' => {},
@@ -104,6 +161,12 @@
'text' => '
',
'type' => 'normal_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'normal_line'
}
]
};
@@ -117,6 +180,13 @@
$result_trees{'accents'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
$result_trees{'accents'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
$result_trees{'accents'}{'contents'}[2]{'contents'}[4]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
+$result_trees{'accents'}{'contents'}[2]{'contents'}[5]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
+$result_trees{'accents'}{'contents'}[2]{'contents'}[6]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
+$result_trees{'accents'}{'contents'}[2]{'contents'}[7]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
+$result_trees{'accents'}{'contents'}[2]{'contents'}[8]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
+$result_trees{'accents'}{'contents'}[2]{'contents'}[9]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
+$result_trees{'accents'}{'contents'}[2]{'contents'}[10]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
+$result_trees{'accents'}{'contents'}[2]{'contents'}[11]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
$result_trees{'accents'}{'contents'}[2]{'parent'} = $result_trees{'accents'};
$result_trees{'accents'}{'contents'}[3]{'parent'} = $result_trees{'accents'};
$result_trees{'accents'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
@@ -125,15 +195,26 @@
$result_trees{'accents'}{'contents'}[4]{'contents'}[3]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
$result_trees{'accents'}{'contents'}[4]{'contents'}[4]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
$result_trees{'accents'}{'contents'}[4]{'contents'}[5]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
+$result_trees{'accents'}{'contents'}[4]{'contents'}[6]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
+$result_trees{'accents'}{'contents'}[4]{'contents'}[7]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
+$result_trees{'accents'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
+$result_trees{'accents'}{'contents'}[4]{'contents'}[9]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
+$result_trees{'accents'}{'contents'}[4]{'contents'}[10]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
+$result_trees{'accents'}{'contents'}[4]{'contents'}[11]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
$result_trees{'accents'}{'contents'}[4]{'parent'} = $result_trees{'accents'};
$result_trees{'accents'}{'contents'}[5]{'parent'} = $result_trees{'accents'};
+$result_trees{'accents'}{'contents'}[6]{'parent'} = $result_trees{'accents'};
$result_texts{'accents'} = '@ringaccent a
accent at end of line @ringaccent
accent at end of line and spaces @ringaccent
+accent followed by @@ @address@hidden
+
accent character with spaces @~ following.
accent character at end of line @~
+accent character followed by @@ @address@hidden
+
';
@@ -157,22 +238,40 @@
'type' => 'warning'
},
{
- 'error_line' => ':6: warning: Accent command address@hidden' must not be
followed by whitespace
+ 'error_line' => ':5: Use braces to give a command as an argument to
@ringaccent
',
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => 'Use braces to give a command as an argument to @ringaccent',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':7: warning: Accent command address@hidden' must not be
followed by whitespace
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
'macro' => '',
'text' => 'Accent command address@hidden' must not be followed by
whitespace',
'type' => 'warning'
},
{
- 'error_line' => ':7: warning: Accent command address@hidden' must not be
followed by new line
+ 'error_line' => ':8: warning: Accent command address@hidden' must not be
followed by new line
',
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 8,
'macro' => '',
'text' => 'Accent command address@hidden' must not be followed by new
line',
'type' => 'warning'
+ },
+ {
+ 'error_line' => ':9: Use braces to give a command as an argument to @~
+',
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => '',
+ 'text' => 'Use braces to give a command as an argument to @~',
+ 'type' => 'error'
}
];