[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/results/coverage...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/results/coverage... |
|
Date: |
Fri, 11 Nov 2011 15:16:11 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/11/11 15:16:11
Modified files:
tp/Texinfo : Parser.pm
tp/t/results/coverage: symbol_after_block.pl
tp/t/results/macro: space_macro_after_end.pl
tp/t/results/raw: misc_raw.pl misc_raw_comments.pl
tp/t/results/test_count: expanded_tex.pl
Log message:
Match a @end in raw command only if there are only spaces at the
beginning
of lines.
Better warning for spurious @-comands on raw @end command lines.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.332&r2=1.333
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_block.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/space_macro_after_end.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/misc_raw.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/misc_raw_comments.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/expanded_tex.pl?cvsroot=texinfo&r1=1.2&r2=1.3
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -b -r1.332 -r1.333
--- Texinfo/Parser.pm 5 Nov 2011 09:30:10 -0000 1.332
+++ Texinfo/Parser.pm 11 Nov 2011 15:16:09 -0000 1.333
@@ -3329,13 +3329,13 @@
'extra' => {'line' => $line }};
$current = $current->{'contents'}->[-1];
last;
- # FIXME(Karl) accept only a command at the line beginning?
- # FIXME(Karl) accept only one space after @end?
- } elsif ($line =~ /^(.*?)address@hidden([a-zA-Z][\w-]*)/
+ # FIXME(Karl) accept also not spaces at the line beginning?
+ #} elsif ($line =~ /^(.*?)address@hidden([a-zA-Z][\w-]*)/
+ } elsif ($line =~ /^(\s*?)address@hidden([a-zA-Z][\w-]*)/
and ($2 eq $current->{'cmdname'})) {
my $end_command = $2;
my $raw_command = $current;
- $line =~ s/^(.*?)(address@hidden>{'cmdname'})//;
+ $line =~ s/^(\s*?)(address@hidden>{'cmdname'})//;
if ($1 eq '') {
# FIXME exclude other formats, like @macro, @ifset, @ignore?
if ($current->{'cmdname'} ne 'verbatim'
@@ -3353,13 +3353,12 @@
$self->line_warn (sprintf($self->__("address@hidden %s should only
appear at a line beginning"),
$end_command), $line_nr);
}
- # the condition $line !~ /^\s*@/ leads to no warning when followed by
- # any @-command. This is in order to avoid warnings for correct
- # constructs, like @comment after @end raw
+ # if there is a user defined macro that expandes to spaces, there
+ # will be a spurious warning.
$self->line_warn (sprintf($self->
__("Superfluous argument to address@hidden %s: %s"), 'end',
$end_command,
$line), $line_nr)
- if ($line =~ /\S/ and $line !~ /^\s*@/);
+ if ($line =~ /\S/ and $line !~ /address@hidden(omment)?\b/);
# store toplevel macro specification
if (($end_command eq 'macro' or $end_command eq 'rmacro')
and (! $current->{'parent'}
@@ -3443,8 +3442,7 @@
# this mostly happens in the following cases:
# after expansion of user defined macro that doesn't end with EOL
# after a protection of @\n in @def* line
- while ($line eq '')
- {
+ while ($line eq '') {
print STDERR "END OF TEXT not at end of line\n"
if ($self->{'DEBUG'});
($line, $line_nr) = _next_text($self, $line_nr);
Index: t/results/coverage/symbol_after_block.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/coverage/symbol_after_block.pl 26 Sep 2011 17:15:47 -0000
1.11
+++ t/results/coverage/symbol_after_block.pl 11 Nov 2011 15:16:09 -0000
1.12
@@ -2183,6 +2183,15 @@
'type' => 'warning'
},
{
+ 'error_line' => ':7: warning: Superfluous argument to @end html: @@ On the
line.
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'Superfluous argument to @end html: @@ On the line.',
+ 'type' => 'warning'
+ },
+ {
'error_line' => ':13: warning: Superfluous argument to @end verbatim: ;
',
'file_name' => '',
@@ -2192,6 +2201,15 @@
'type' => 'warning'
},
{
+ 'error_line' => ':17: warning: Superfluous argument to @end verbatim: @@
+',
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => '',
+ 'text' => 'Superfluous argument to @end verbatim: @@',
+ 'type' => 'warning'
+ },
+ {
'error_line' => ':24: Superfluous argument to @end table: +
',
'file_name' => '',
Index: t/results/macro/space_macro_after_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/space_macro_after_end.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/macro/space_macro_after_end.pl 26 Sep 2011 17:15:53 -0000
1.20
+++ t/results/macro/space_macro_after_end.pl 11 Nov 2011 15:16:10 -0000
1.21
@@ -126,7 +126,17 @@
$result_texts{'space_macro_after_end'} = '
';
-$result_errors{'space_macro_after_end'} = [];
+$result_errors{'space_macro_after_end'} = [
+ {
+ 'error_line' => ':7: warning: Superfluous argument to @end html: @spaces{}
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'Superfluous argument to @end html: @spaces{}',
+ 'type' => 'warning'
+ }
+];
1;
Index: t/results/raw/misc_raw.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/misc_raw.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/raw/misc_raw.pl 15 Oct 2011 15:57:09 -0000 1.25
+++ t/results/raw/misc_raw.pl 11 Nov 2011 15:16:10 -0000 1.26
@@ -27,117 +27,65 @@
},
{
'parent' => {},
- 'text' => 'in html <br> ',
+ 'text' => 'in html <br> @end html
+',
'type' => 'raw'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
},
{
- 'extra' => {
- 'command' => {}
- },
'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'raw'
},
{
'parent' => {},
- 'text' => '
+ 'text' => '@tex in tex
',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'tex',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'in tex',
'type' => 'raw'
},
{
'parent' => {},
- 'text' => '
+ 'text' => '@end tex
',
- 'type' => 'last_raw_newline'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'raw'
},
{
- 'extra' => {
- 'command' => {}
- },
'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'raw'
},
{
'parent' => {},
- 'text' => '
+ 'text' => '@verbatim
',
- 'type' => 'empty_line'
+ 'type' => 'raw'
},
{
- 'cmdname' => 'verbatim',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
'parent' => {},
- 'text' => '
+ 'text' => 'in v---erbatim`` <>
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'raw'
},
{
'parent' => {},
- 'text' => 'in v---erbatim`` <>
+ 'text' => 'in verbatim2
',
'type' => 'raw'
},
{
'parent' => {},
- 'text' => 'in verbatim2
+ 'text' => '@end verbatim
',
'type' => 'raw'
}
],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 2,
'macro' => ''
},
'parent' => {}
- },
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
}
],
'type' => 'text_root'
@@ -146,25 +94,15 @@
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[1];
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
$result_trees{'misc_raw'}{'contents'}[1]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[2]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[3]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[4];
-$result_trees{'misc_raw'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[4];
-$result_trees{'misc_raw'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[4];
-$result_trees{'misc_raw'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[4];
-$result_trees{'misc_raw'}{'contents'}[4]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[4];
-$result_trees{'misc_raw'}{'contents'}[5]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[6]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[7]{'contents'}[0]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[7];
-$result_trees{'misc_raw'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[7];
-$result_trees{'misc_raw'}{'contents'}[7]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[7];
-$result_trees{'misc_raw'}{'contents'}[7]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[7];
-$result_trees{'misc_raw'}{'contents'}[7]{'parent'} = $result_trees{'misc_raw'};
-$result_trees{'misc_raw'}{'contents'}[8]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[7];
-$result_trees{'misc_raw'}{'contents'}[8]{'parent'} = $result_trees{'misc_raw'};
$result_texis{'misc_raw'} = '
@html
@@ -177,32 +115,26 @@
in v---erbatim`` <>
in verbatim2
@end verbatim
-';
address@hidden html';
$result_texts{'misc_raw'} = '
-
-
-in v---erbatim`` <>
-in verbatim2
';
$result_errors{'misc_raw'} = [
{
- 'error_line' => ':3: warning: @end html should only appear at a line
beginning
+ 'error_line' => ':11: No matching address@hidden html\'
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 11,
'macro' => '',
- 'text' => '@end html should only appear at a line beginning',
- 'type' => 'warning'
+ 'text' => 'No matching address@hidden html\'',
+ 'type' => 'error'
}
];
-$result_converted{'plaintext'}->{'misc_raw'} = 'in v---erbatim`` <>
-in verbatim2
-';
+$result_converted{'plaintext'}->{'misc_raw'} = '';
1;
Index: t/results/raw/misc_raw_comments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/misc_raw_comments.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/raw/misc_raw_comments.pl 15 Oct 2011 15:57:09 -0000 1.24
+++ t/results/raw/misc_raw_comments.pl 11 Nov 2011 15:16:10 -0000 1.25
@@ -32,102 +32,39 @@
},
{
'parent' => {},
- 'text' => 'in html ',
- 'type' => 'raw'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' comment no space
+ 'text' => 'in html @end address@hidden comment no space
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'parent' => {}
+ 'type' => 'raw'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'empty_line'
- },
- {
- 'cmdname' => 'tex',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'in tex',
'type' => 'raw'
},
{
'parent' => {},
- 'text' => '
+ 'text' => '@tex in tex
',
- 'type' => 'last_raw_newline'
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
+ 'type' => 'raw'
},
{
- 'args' => [
- {
'parent' => {},
- 'text' => ' comment after end tex
+ 'text' => '@end tex @c comment after end tex
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'parent' => {}
+ 'type' => 'raw'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'raw'
},
{
- 'cmdname' => 'verbatim',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
'parent' => {},
- 'text' => '
+ 'text' => '@verbatim
',
- 'type' => 'empty_line_after_command'
+ 'type' => 'raw'
},
{
'parent' => {},
@@ -140,23 +77,20 @@
'text' => 'in verbatim2
',
'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => '@end verbatim
+',
+ 'type' => 'raw'
}
],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 2,
'macro' => ''
},
'parent' => {}
- },
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
}
],
'type' => 'text_root'
@@ -166,27 +100,15 @@
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[10]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
$result_trees{'misc_raw_comments'}{'contents'}[1]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[2];
-$result_trees{'misc_raw_comments'}{'contents'}[2]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[3]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[4];
-$result_trees{'misc_raw_comments'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[4];
-$result_trees{'misc_raw_comments'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[4];
-$result_trees{'misc_raw_comments'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[4];
-$result_trees{'misc_raw_comments'}{'contents'}[4]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'command'} =
$result_trees{'misc_raw_comments'}{'contents'}[4];
-$result_trees{'misc_raw_comments'}{'contents'}[5]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[6];
-$result_trees{'misc_raw_comments'}{'contents'}[6]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[7]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[8]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[8];
-$result_trees{'misc_raw_comments'}{'contents'}[8]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[8];
-$result_trees{'misc_raw_comments'}{'contents'}[8]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[8];
-$result_trees{'misc_raw_comments'}{'contents'}[8]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[8];
-$result_trees{'misc_raw_comments'}{'contents'}[8]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[9]{'extra'}{'command'} =
$result_trees{'misc_raw_comments'}{'contents'}[8];
-$result_trees{'misc_raw_comments'}{'contents'}[9]{'parent'} =
$result_trees{'misc_raw_comments'};
$result_texis{'misc_raw_comments'} = '
@html @c comment space
@@ -199,32 +121,26 @@
in verbatim @c in verbatim
in verbatim2
@end verbatim
-';
address@hidden html';
$result_texts{'misc_raw_comments'} = '
-
-
-in verbatim @c in verbatim
-in verbatim2
';
$result_errors{'misc_raw_comments'} = [
{
- 'error_line' => ':3: warning: @end html should only appear at a line
beginning
+ 'error_line' => ':11: No matching address@hidden html\'
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 11,
'macro' => '',
- 'text' => '@end html should only appear at a line beginning',
- 'type' => 'warning'
+ 'text' => 'No matching address@hidden html\'',
+ 'type' => 'error'
}
];
-$result_converted{'plaintext'}->{'misc_raw_comments'} = 'in verbatim @c in
verbatim
-in verbatim2
-';
+$result_converted{'plaintext'}->{'misc_raw_comments'} = '';
1;
Index: t/results/test_count/expanded_tex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/expanded_tex.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/test_count/expanded_tex.pl 7 Nov 2011 22:20:18 -0000
1.2
+++ t/results/test_count/expanded_tex.pl 11 Nov 2011 15:16:11 -0000
1.3
@@ -101,7 +101,14 @@
},
{
'parent' => {},
- 'text' => 'GGG ',
+ 'text' => 'GGG @end tex
+',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'After2.
+',
'type' => 'raw'
}
],
@@ -111,20 +118,6 @@
'macro' => ''
},
'parent' => {}
- },
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'After2.
-'
}
],
'parent' => {},
@@ -150,10 +143,8 @@
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[2];
-$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
-$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[2];
-$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[2];
$result_trees{'expanded_tex'}{'contents'}[2]{'parent'} =
$result_trees{'expanded_tex'};
$result_texis{'expanded_tex'} = 'AAA
@@ -167,25 +158,24 @@
@tex FFF
GGG @end tex
After2.
-';
address@hidden tex';
$result_texts{'expanded_tex'} = 'AAA
After
second
-After2.
';
$result_errors{'expanded_tex'} = [
{
- 'error_line' => ':10: warning: @end tex should only appear at a line
beginning
+ 'error_line' => ':11: No matching address@hidden tex\'
',
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 11,
'macro' => '',
- 'text' => '@end tex should only appear at a line beginning',
- 'type' => 'warning'
+ 'text' => 'No matching address@hidden tex\'',
+ 'type' => 'error'
}
];
@@ -220,15 +210,13 @@
[15] (31,6)
[16] (31,6) :raw:text|FFF\\n|
[16] (35,7)
- [17] (35,7) :raw:text|GGG |
- [17] (35,7)
- [14] (35,7)
- [18] (35,7) :empty_line_after_command:text|\\n|
- [18] (35,7)
- [19] (35,7) :text|After2.\\n|
- [19] (46,7)
- [12] (47,8)
- [1] (47,8)
+ [17] (35,7) :raw:text|GGG @end tex\\n|
+ [17] (48,8)
+ [18] (48,8) :raw:text|After2.\\n|
+ [18] (56,9)
+ [14] (56,9)
+ [12] (56,9)
+ [1] (56,9)
AAA
TTT
GGG
@@ -236,7 +224,8 @@
second
FFF
-GGG After2.
+GGG @end tex
+After2.
';
1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm t/results/coverage...,
Patrice Dumas <=