[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/results/def/doub...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/results/def/doub... |
|
Date: |
Sat, 29 Oct 2011 14:44:50 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/10/29 14:44:50
Modified files:
tp/Texinfo : Parser.pm
tp/t/results/def: double_command.pl
tp/t/results/invalid_nestings: bad_style_nesting.pl
bad_tab_nesting.pl
cartouche_in_style_command.pl
center.pl def_in_style_command.pl
enumerate_in_style_command.pl
example_in_style_command.pl
float_in_style_command.pl
flushright_in_style_command.pl
item_in_ref.pl
menu_in_style_command.pl
multitable_in_style_command.pl
multitable_item_in_index.pl
on_itemize_line.pl
quotation_in_style_command.pl
style_not_closed_in_table_line.pl
style_not_closed_no_newline_root_commands.pl
tab_in_index.pl table_in_code.pl
verbatim_in_style_command.pl
tp/t/results/languages: multiple.pl
tp/t/results/macro: unknown_macro_on_line_command.pl
tp/t/results/raw: raw_in_brace_command.pl
Log message:
Warn for invalid nesting when processing the command not when finding
out that they are invalid.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.323&r2=1.324
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/double_command.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/bad_style_nesting.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/bad_tab_nesting.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/cartouche_in_style_command.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/center.pl?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_in_style_command.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/enumerate_in_style_command.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/example_in_style_command.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/float_in_style_command.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/flushright_in_style_command.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/item_in_ref.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/menu_in_style_command.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/multitable_in_style_command.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/multitable_item_in_index.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_itemize_line.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/quotation_in_style_command.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/tab_in_index.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_in_code.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/verbatim_in_style_command.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/multiple.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/unknown_macro_on_line_command.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_in_brace_command.pl?cvsroot=texinfo&r1=1.15&r2=1.16
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -b -r1.323 -r1.324
--- Texinfo/Parser.pm 29 Oct 2011 12:23:44 -0000 1.323
+++ Texinfo/Parser.pm 29 Oct 2011 14:44:48 -0000 1.324
@@ -32,7 +32,7 @@
use strict;
# debug
-#use Carp qw(cluck);
+use Carp qw(cluck);
use Data::Dumper;
@@ -1483,7 +1483,7 @@
}
} elsif ($current->{'type'}) {
if ($current->{'type'} eq 'bracketed') {
- # FIXME record the line number in the bracketed and use it
+ # FIXME record the line number in the bracketed and use it?
$self->line_error (sprintf($self->__("Misplaced %c"),
ord('{')), $line_nr);
$current = $current->{'parent'};
@@ -3169,6 +3169,20 @@
=~ /^[^\S\n]*/)))
}
+sub _register_and_warn_invalid($$$$)
+{
+ my $self = shift;
+ my $command = shift;
+ my $invalid_parent = shift;
+ my $line_nr = shift;
+ my $registered_as_invalid_command = shift;
+
+ if (defined($invalid_parent)) {
+ $self->line_warn (sprintf($self->__("address@hidden should not appear in
address@hidden"),
+ $command, $invalid_parent), $line_nr);
+ $registered_as_invalid_command->{'extra'}->{'invalid_nesting'} = 1;
+ }
+}
# the different types
#c 'menu_entry'
#c 'menu_entry'
@@ -3553,13 +3567,10 @@
}
# maybe a menu entry beginning: a * at the beginning of a menu line
} elsif ($line =~ /^\*/ and $current->{'type'}
- and (($current->{'type'} eq 'preformatted'
+ and $current->{'type'} eq 'preformatted'
and $current->{'parent'}->{'type'}
and ($current->{'parent'}->{'type'} eq 'menu_comment'
- # FIXME does menu_entry_description here work as
intended?
- or $current->{'parent'}->{'type'} eq
'menu_entry_description'))
- # FIXME remove the next condition
- or $current->{'type'} eq 'menu_entry_description')
+ or $current->{'parent'}->{'type'} eq
'menu_entry_description')
and @{$current->{'contents'}}
and $current->{'contents'}->[-1]->{'type'}
and $current->{'contents'}->[-1]->{'type'} eq 'empty_line'
@@ -3722,19 +3733,14 @@
$command), $line_nr);
}
- my $invalid;
+ my $invalid_parent;
# error messages for forbidden constructs, like @node in @r,
# block command on line command, @xref in @anchor or node...
if ($current->{'parent'}) {
if ($current->{'parent'}->{'cmdname'}) {
- # FIXME in all the cases below, there is an error message even if
- # the command is an unknown command
if ($accent_commands{$current->{'parent'}->{'cmdname'}}
and !$in_accent_commands{$command}) {
- $self->line_warn (sprintf($self->__("address@hidden should not
appear in address@hidden"),
- $command,
$current->{'parent'}->{'cmdname'}),
- $line_nr);
- $invalid = 1;
+ $invalid_parent = $current->{'parent'}->{'cmdname'};
} elsif ((!$in_simple_text_commands{$command}
and
($self->{'simple_text_commands'}->{$current->{'parent'}->{'cmdname'}}
# following conditions arise because we distinguish
@@ -3753,10 +3759,7 @@
and !$in_full_line_commands{$command})
or ($full_text_commands{$current->{'parent'}->{'cmdname'}}
and !$in_full_text_commands{$command})) {
- $self->line_warn (sprintf($self->__("address@hidden should not
appear in address@hidden"),
- $command,
$current->{'parent'}->{'cmdname'}),
- $line_nr);
- $invalid = 1;
+ $invalid_parent = $current->{'parent'}->{'cmdname'};
}
} elsif ($self->{'context_stack'}->[-1] eq 'def'
and !$in_simple_text_commands{$command}) {
@@ -3766,10 +3769,7 @@
$def_block = $def_block->{'parent'};
}
- $self->line_warn (sprintf($self->__("address@hidden should not
appear in address@hidden"),
- $command,
$def_block->{'parent'}->{'parent'}->{'cmdname'}),
- $line_nr);
- $invalid = 1;
+ $invalid_parent =
$def_block->{'parent'}->{'parent'}->{'cmdname'};
}
}
@@ -3814,6 +3814,7 @@
if ($arg_spec eq 'noarg') {
my $ignored = 0;
+ my $only_in_headings = 0;
if ($command eq 'insertcopying') {
my $parent = $current;
while ($parent) {
@@ -3828,14 +3829,16 @@
} elsif ($in_heading_commands{$command}) {
$self->line_error (sprintf($self->__("address@hidden should only
appear in heading or footing"),
$command), $line_nr);
- $invalid = 1;
+ $only_in_headings = 1;
}
unless ($ignored) {
$misc = {'cmdname' => $command,
'parent' => $current};
push @{$current->{'contents'}}, $misc;
}
- $misc->{'extra'}->{'invalid_nesting'} = 1 if ($invalid);
+ $self->_register_and_warn_invalid($command, $invalid_parent,
+ $line_nr, $misc);
+ $misc->{'extra'}->{'invalid_nesting'} = 1 if ($only_in_headings);
$self->_register_global_command($command, $misc, $line_nr);
# all the cases using the raw line
@@ -3872,7 +3875,8 @@
} elsif ($command eq 'novalidate') {
$self->{'novalidate'} = 1;
}
- $misc->{'extra'}->{'invalid_nesting'} = 1 if ($invalid);
+ $self->_register_and_warn_invalid($command, $invalid_parent,
+ $line_nr, $misc);
$self->_register_global_command($command, $misc, $line_nr);
last NEXT_LINE if ($command eq 'bye');
@@ -4044,7 +4048,8 @@
}
$line = _start_empty_line_after_command($line, $current, $misc);
}
- $misc->{'extra'}->{'invalid_nesting'} = 1 if ($invalid);
+ $self->_register_and_warn_invalid($command, $invalid_parent,
+ $line_nr, $misc);
if (!$self->_register_global_command($command, $misc, $line_nr)
and $command eq 'dircategory') {
@@ -4056,8 +4061,8 @@
my $macro = _parse_macro_command_line ($self, $command, $line,
$current, $line_nr);
push @{$current->{'contents'}}, $macro;
- $current->{'contents'}->[-1]->{'extra'}->{'invalid_nesting'} = 1
- if ($invalid);
+ $self->_register_and_warn_invalid($command, $invalid_parent,
+ $line_nr, $current->{'contents'}->[-1]);
$current = $current->{'contents'}->[-1];
last;
} elsif ($block_commands{$command} eq 'conditional') {
@@ -4160,8 +4165,6 @@
{'def_command' => $command,
'original_def_cmdname' =>
$command}
};
- $current->{'contents'}->[-1]->{'extra'}->{'invalid_nesting'} = 1
- if ($invalid);
} else {
$block = { 'cmdname' => $command,
'parent' => $current,
@@ -4219,7 +4222,8 @@
unless ($def_commands{$command});
}
$block->{'line_nr'} = $line_nr;
- $block->{'extra'}->{'invalid_nesting'} = 1 if ($invalid);
+ $self->_register_and_warn_invalid($command, $invalid_parent,
+ $line_nr, $block);
$self->_register_global_command($command, $block, $line_nr);
$line = _start_empty_line_after_command($line, $current, $block);
@@ -4232,8 +4236,8 @@
'contents' => [] };
$current->{'contents'}->[-1]->{'line_nr'} = $line_nr
if ($keep_line_nr_brace_commands{$command});
- $current->{'contents'}->[-1]->{'extra'}->{'invalid_nesting'} = 1
- if ($invalid);
+ $self->_register_and_warn_invalid($command, $invalid_parent,
+ $line_nr, $current->{'contents'}->[-1]);
$current = $current->{'contents'}->[-1];
if ($command eq 'click') {
$current->{'extra'}->{'clickstyle'} = $self->{'clickstyle'};
Index: t/results/def/double_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/double_command.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/def/double_command.pl 3 Sep 2011 21:51:32 -0000 1.30
+++ t/results/def/double_command.pl 29 Oct 2011 14:44:49 -0000 1.31
@@ -517,7 +517,6 @@
'key' => 'd--efvr_name',
'number' => 1
},
- 'invalid_nesting' => 1,
'original_def_cmdname' => 'defvr'
},
'line_nr' => {
@@ -784,22 +783,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':1: warning: @deffnx should not appear in @deffn
+ 'error_line' => ':1: Must be after address@hidden' to use address@hidden'
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => '@deffnx should not appear in @deffn',
- 'type' => 'warning'
+ 'text' => 'Must be after address@hidden' to use address@hidden'',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: Must be after address@hidden' to use address@hidden'
+ 'error_line' => ':1: warning: @deffnx should not appear in @deffn
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'Must be after address@hidden' to use address@hidden'',
- 'type' => 'error'
+ 'text' => '@deffnx should not appear in @deffn',
+ 'type' => 'warning'
},
{
'error_line' => ':1: Entry for index `fn\' outside of any node
Index: t/results/invalid_nestings/bad_style_nesting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/bad_style_nesting.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/invalid_nestings/bad_style_nesting.pl 3 Jul 2011 14:50:57
-0000 1.17
+++ t/results/invalid_nestings/bad_style_nesting.pl 29 Oct 2011 14:44:49
-0000 1.18
@@ -145,22 +145,22 @@
$result_errors{'bad_style_nesting'} = [
{
- 'error_line' => ':2: warning: @quotation should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@quotation should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @quotation should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@quotation should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':3: Misplaced }
Index: t/results/invalid_nestings/bad_tab_nesting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/bad_tab_nesting.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/invalid_nestings/bad_tab_nesting.pl 3 Sep 2011 22:40:56
-0000 1.22
+++ t/results/invalid_nestings/bad_tab_nesting.pl 29 Oct 2011 14:44:49
-0000 1.23
@@ -268,22 +268,22 @@
$result_errors{'bad_tab_nesting'} = [
{
- 'error_line' => ':3: warning: @tab should not appear in @code
+ 'error_line' => ':3: @code missing close brace
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@tab should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':3: @code missing close brace
+ 'error_line' => ':3: warning: @tab should not appear in @code
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@tab should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':3: Misplaced }
Index: t/results/invalid_nestings/cartouche_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/cartouche_in_style_command.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/cartouche_in_style_command.pl 3 Jul 2011
14:50:57 -0000 1.4
+++ t/results/invalid_nestings/cartouche_in_style_command.pl 29 Oct 2011
14:44:49 -0000 1.5
@@ -153,22 +153,22 @@
$result_errors{'cartouche_in_style_command'} = [
{
- 'error_line' => ':2: warning: @cartouche should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@cartouche should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @cartouche should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@cartouche should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':5: Misplaced }
Index: t/results/invalid_nestings/center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/invalid_nestings/center.pl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- t/results/invalid_nestings/center.pl 20 Oct 2011 20:51:08 -0000
1.44
+++ t/results/invalid_nestings/center.pl 29 Oct 2011 14:44:49 -0000
1.45
@@ -2248,22 +2248,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':15: warning: @center should not appear in @code
+ 'error_line' => ':15: @code missing close brace
',
'file_name' => '',
'line_nr' => 15,
'macro' => '',
- 'text' => '@center should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':15: @code missing close brace
+ 'error_line' => ':15: warning: @center should not appear in @code
',
'file_name' => '',
'line_nr' => 15,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':17: Misplaced }
@@ -2284,22 +2284,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':19: warning: @center should not appear in @code
+ 'error_line' => ':19: @code missing close brace
',
'file_name' => '',
'line_nr' => 19,
'macro' => '',
- 'text' => '@center should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':19: @code missing close brace
+ 'error_line' => ':19: warning: @center should not appear in @code
',
'file_name' => '',
'line_nr' => 19,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':19: Misplaced }
@@ -2311,22 +2311,22 @@
'type' => 'error'
},
{
- 'error_line' => ':22: warning: @item should not appear in @center
+ 'error_line' => ':22: @item outside of table or list
',
'file_name' => '',
'line_nr' => 22,
'macro' => '',
- 'text' => '@item should not appear in @center',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
},
{
- 'error_line' => ':22: @item outside of table or list
+ 'error_line' => ':22: warning: @item should not appear in @center
',
'file_name' => '',
'line_nr' => 22,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @center',
+ 'type' => 'warning'
},
{
'error_line' => ':21: warning: @table has text but no @item
@@ -2338,22 +2338,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':27: warning: @item should not appear in @center
+ 'error_line' => ':27: @item outside of table or list
',
'file_name' => '',
'line_nr' => 27,
'macro' => '',
- 'text' => '@item should not appear in @center',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
},
{
- 'error_line' => ':27: @item outside of table or list
+ 'error_line' => ':27: warning: @item should not appear in @center
',
'file_name' => '',
'line_nr' => 27,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @center',
+ 'type' => 'warning'
},
{
'error_line' => ':31: warning: @center should not appear in @center
@@ -2383,22 +2383,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':33: warning: @center should not appear in @samp
+ 'error_line' => ':33: @samp missing close brace
',
'file_name' => '',
'line_nr' => 33,
'macro' => '',
- 'text' => '@center should not appear in @samp',
- 'type' => 'warning'
+ 'text' => '@samp missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':33: @samp missing close brace
+ 'error_line' => ':33: warning: @center should not appear in @samp
',
'file_name' => '',
'line_nr' => 33,
'macro' => '',
- 'text' => '@samp missing close brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @samp',
+ 'type' => 'warning'
},
{
'error_line' => ':33: Misplaced }
@@ -2419,22 +2419,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':35: warning: @center should not appear in @samp
+ 'error_line' => ':35: @samp missing close brace
',
'file_name' => '',
'line_nr' => 35,
'macro' => '',
- 'text' => '@center should not appear in @samp',
- 'type' => 'warning'
+ 'text' => '@samp missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':35: @samp missing close brace
+ 'error_line' => ':35: warning: @center should not appear in @samp
',
'file_name' => '',
'line_nr' => 35,
'macro' => '',
- 'text' => '@samp missing close brace',
- 'type' => 'error'
+ 'text' => '@center should not appear in @samp',
+ 'type' => 'warning'
},
{
'error_line' => ':37: Misplaced }
@@ -2446,15 +2446,6 @@
'type' => 'error'
},
{
- 'error_line' => ':41: warning: @item should not appear in @center
-',
- 'file_name' => '',
- 'line_nr' => 41,
- 'macro' => '',
- 'text' => '@item should not appear in @center',
- 'type' => 'warning'
- },
- {
'error_line' => ':41: @item outside of table or list
',
'file_name' => '',
@@ -2464,12 +2455,12 @@
'type' => 'error'
},
{
- 'error_line' => ':41: warning: @tab should not appear in @center
+ 'error_line' => ':41: warning: @item should not appear in @center
',
'file_name' => '',
'line_nr' => 41,
'macro' => '',
- 'text' => '@tab should not appear in @center',
+ 'text' => '@item should not appear in @center',
'type' => 'warning'
},
{
@@ -2482,12 +2473,12 @@
'type' => 'error'
},
{
- 'error_line' => ':42: warning: @item should not appear in @center
+ 'error_line' => ':41: warning: @tab should not appear in @center
',
'file_name' => '',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => '',
- 'text' => '@item should not appear in @center',
+ 'text' => '@tab should not appear in @center',
'type' => 'warning'
},
{
@@ -2500,6 +2491,15 @@
'type' => 'error'
},
{
+ 'error_line' => ':42: warning: @item should not appear in @center
+',
+ 'file_name' => '',
+ 'line_nr' => 42,
+ 'macro' => '',
+ 'text' => '@item should not appear in @center',
+ 'type' => 'warning'
+ },
+ {
'error_line' => ':45: warning: @table should only appear at a line
beginning
',
'file_name' => '',
Index: t/results/invalid_nestings/def_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/def_in_style_command.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/invalid_nestings/def_in_style_command.pl 3 Sep 2011 21:51:35
-0000 1.10
+++ t/results/invalid_nestings/def_in_style_command.pl 29 Oct 2011 14:44:49
-0000 1.11
@@ -116,7 +116,6 @@
'key' => 'name',
'number' => 1
},
- 'invalid_nesting' => 1,
'original_def_cmdname' => 'defun'
},
'line_nr' => {
@@ -237,22 +236,22 @@
$result_errors{'def_in_style_command'} = [
{
- 'error_line' => ':2: warning: @defun should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@defun should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @defun should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@defun should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':2: Entry for index `fn\' outside of any node
Index: t/results/invalid_nestings/enumerate_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/enumerate_in_style_command.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/invalid_nestings/enumerate_in_style_command.pl 20 Aug 2011
22:26:57 -0000 1.6
+++ t/results/invalid_nestings/enumerate_in_style_command.pl 29 Oct 2011
14:44:49 -0000 1.7
@@ -197,22 +197,22 @@
$result_errors{'enumerate_in_style_command'} = [
{
- 'error_line' => ':2: warning: @enumerate should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@enumerate should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @enumerate should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@enumerate should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':5: Misplaced }
Index: t/results/invalid_nestings/example_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/example_in_style_command.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/example_in_style_command.pl 3 Jul 2011
14:50:57 -0000 1.4
+++ t/results/invalid_nestings/example_in_style_command.pl 29 Oct 2011
14:44:49 -0000 1.5
@@ -145,22 +145,22 @@
$result_errors{'example_in_style_command'} = [
{
- 'error_line' => ':2: warning: @example should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@example should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @example should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@example should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':5: Misplaced }
Index: t/results/invalid_nestings/float_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/float_in_style_command.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/invalid_nestings/float_in_style_command.pl 13 Jul 2011
14:49:11 -0000 1.5
+++ t/results/invalid_nestings/float_in_style_command.pl 29 Oct 2011
14:44:49 -0000 1.6
@@ -251,22 +251,22 @@
$result_errors{'float_in_style_command'} = [
{
- 'error_line' => ':2: warning: @float should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@float should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @float should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@float should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':6: Misplaced }
Index: t/results/invalid_nestings/flushright_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/flushright_in_style_command.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/flushright_in_style_command.pl 3 Jul 2011
14:50:57 -0000 1.4
+++ t/results/invalid_nestings/flushright_in_style_command.pl 29 Oct 2011
14:44:49 -0000 1.5
@@ -145,22 +145,22 @@
$result_errors{'flushright_in_style_command'} = [
{
- 'error_line' => ':2: warning: @flushright should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@flushright should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @flushright should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@flushright should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':5: Misplaced }
Index: t/results/invalid_nestings/item_in_ref.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/item_in_ref.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/invalid_nestings/item_in_ref.pl 3 Sep 2011 10:29:32 -0000
1.7
+++ t/results/invalid_nestings/item_in_ref.pl 29 Oct 2011 14:44:49 -0000
1.8
@@ -347,22 +347,22 @@
$result_errors{'item_in_ref'} = [
{
- 'error_line' => ':6: warning: @item should not appear in @ref
+ 'error_line' => ':5: @ref missing close brace
',
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => '',
- 'text' => '@item should not appear in @ref',
- 'type' => 'warning'
+ 'text' => '@ref missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':5: @ref missing close brace
+ 'error_line' => ':6: warning: @item should not appear in @ref
',
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 6,
'macro' => '',
- 'text' => '@ref missing close brace',
- 'type' => 'error'
+ 'text' => '@item should not appear in @ref',
+ 'type' => 'warning'
},
{
'error_line' => ':6: Misplaced }
Index: t/results/invalid_nestings/menu_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/menu_in_style_command.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/invalid_nestings/menu_in_style_command.pl 19 Aug 2011 23:09:43
-0000 1.8
+++ t/results/invalid_nestings/menu_in_style_command.pl 29 Oct 2011 14:44:49
-0000 1.9
@@ -338,22 +338,22 @@
$result_errors{'menu_in_style_command'} = [
{
- 'error_line' => ':4: warning: @menu should not appear in @code
+ 'error_line' => ':3: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => '@menu should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':3: @code missing close brace
+ 'error_line' => ':4: warning: @menu should not appear in @code
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 4,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@menu should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':7: Misplaced }
Index: t/results/invalid_nestings/multitable_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/multitable_in_style_command.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/invalid_nestings/multitable_in_style_command.pl 3 Sep 2011
22:40:56 -0000 1.6
+++ t/results/invalid_nestings/multitable_in_style_command.pl 29 Oct 2011
14:44:49 -0000 1.7
@@ -289,22 +289,22 @@
$result_errors{'multitable_in_style_command'} = [
{
- 'error_line' => ':3: warning: @multitable should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@multitable should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':3: warning: @multitable should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@multitable should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':6: Misplaced }
Index: t/results/invalid_nestings/multitable_item_in_index.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/multitable_item_in_index.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/invalid_nestings/multitable_item_in_index.pl 4 Sep 2011
12:14:05 -0000 1.25
+++ t/results/invalid_nestings/multitable_item_in_index.pl 29 Oct 2011
14:44:49 -0000 1.26
@@ -235,22 +235,22 @@
$result_errors{'multitable_item_in_index'} = [
{
- 'error_line' => ':2: warning: @item should not appear in @vindex
+ 'error_line' => ':2: @item outside of table or list
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => '@item should not appear in @vindex',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
},
{
- 'error_line' => ':2: @item outside of table or list
+ 'error_line' => ':2: warning: @item should not appear in @vindex
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @vindex',
+ 'type' => 'warning'
},
{
'error_line' => ':2: Entry for index `vr\' outside of any node
Index: t/results/invalid_nestings/on_itemize_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/on_itemize_line.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/invalid_nestings/on_itemize_line.pl 20 Aug 2011 22:26:58
-0000 1.28
+++ t/results/invalid_nestings/on_itemize_line.pl 29 Oct 2011 14:44:49
-0000 1.29
@@ -520,22 +520,22 @@
'type' => 'warning'
},
{
- 'error_line' => ':5: warning: @item should not appear in @itemize
+ 'error_line' => ':5: @item outside of table or list
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => '@item should not appear in @itemize',
- 'type' => 'warning'
+ 'text' => '@item outside of table or list',
+ 'type' => 'error'
},
{
- 'error_line' => ':5: @item outside of table or list
+ 'error_line' => ':5: warning: @item should not appear in @itemize
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => '@item outside of table or list',
- 'type' => 'error'
+ 'text' => '@item should not appear in @itemize',
+ 'type' => 'warning'
}
];
Index: t/results/invalid_nestings/quotation_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/quotation_in_style_command.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/quotation_in_style_command.pl 3 Jul 2011
14:50:58 -0000 1.4
+++ t/results/invalid_nestings/quotation_in_style_command.pl 29 Oct 2011
14:44:49 -0000 1.5
@@ -145,22 +145,22 @@
$result_errors{'quotation_in_style_command'} = [
{
- 'error_line' => ':2: warning: @quotation should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@quotation should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @quotation should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@quotation should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':5: Misplaced }
Index: t/results/invalid_nestings/style_not_closed_in_table_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/invalid_nestings/style_not_closed_in_table_line.pl 3 Sep
2011 10:29:33 -0000 1.25
+++ t/results/invalid_nestings/style_not_closed_in_table_line.pl 29 Oct
2011 14:44:50 -0000 1.26
@@ -299,22 +299,22 @@
$result_errors{'style_not_closed_in_table_line'} = [
{
- 'error_line' => ':4: warning: @item should not appear in @code
+ 'error_line' => ':4: @code missing close brace
',
'file_name' => '',
'line_nr' => 4,
'macro' => '',
- 'text' => '@item should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':4: @code missing close brace
+ 'error_line' => ':4: warning: @item should not appear in @code
',
'file_name' => '',
'line_nr' => 4,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@item should not appear in @code',
+ 'type' => 'warning'
}
];
Index: t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
19 Aug 2011 23:09:43 -0000 1.39
+++ t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
29 Oct 2011 14:44:50 -0000 1.40
@@ -537,6 +537,15 @@
$result_errors{'style_not_closed_no_newline_root_commands'} = [
{
+ 'error_line' => ':7: @code missing close brace
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
+ },
+ {
'error_line' => ':8: warning: @node should not appear in @code
',
'file_name' => '',
@@ -546,10 +555,10 @@
'type' => 'warning'
},
{
- 'error_line' => ':7: @code missing close brace
+ 'error_line' => ':11: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 11,
'macro' => '',
'text' => '@code missing close brace',
'type' => 'error'
@@ -562,15 +571,6 @@
'macro' => '',
'text' => '@bye should not appear in @code',
'type' => 'warning'
- },
- {
- 'error_line' => ':11: @code missing close brace
-',
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
}
];
Index: t/results/invalid_nestings/tab_in_index.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/tab_in_index.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/invalid_nestings/tab_in_index.pl 4 Sep 2011 12:14:05 -0000
1.28
+++ t/results/invalid_nestings/tab_in_index.pl 29 Oct 2011 14:44:50 -0000
1.29
@@ -326,22 +326,22 @@
$result_errors{'tab_in_index'} = [
{
- 'error_line' => ':3: warning: @tab should not appear in @vindex
+ 'error_line' => ':3: ignoring @tab outside of multitable
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@tab should not appear in @vindex',
- 'type' => 'warning'
+ 'text' => 'ignoring @tab outside of multitable',
+ 'type' => 'error'
},
{
- 'error_line' => ':3: ignoring @tab outside of multitable
+ 'error_line' => ':3: warning: @tab should not appear in @vindex
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => 'ignoring @tab outside of multitable',
- 'type' => 'error'
+ 'text' => '@tab should not appear in @vindex',
+ 'type' => 'warning'
},
{
'error_line' => ':3: Entry for index `vr\' outside of any node
Index: t/results/invalid_nestings/table_in_code.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_in_code.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/invalid_nestings/table_in_code.pl 3 Sep 2011 10:29:33 -0000
1.12
+++ t/results/invalid_nestings/table_in_code.pl 29 Oct 2011 14:44:50 -0000
1.13
@@ -260,22 +260,22 @@
$result_errors{'table_in_code'} = [
{
- 'error_line' => ':3: warning: @table should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@table should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':3: warning: @table should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@table should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':7: Misplaced }
Index: t/results/invalid_nestings/verbatim_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/verbatim_in_style_command.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/verbatim_in_style_command.pl 3 Jul 2011
14:50:58 -0000 1.4
+++ t/results/invalid_nestings/verbatim_in_style_command.pl 29 Oct 2011
14:44:50 -0000 1.5
@@ -101,22 +101,22 @@
$result_errors{'verbatim_in_style_command'} = [
{
- 'error_line' => ':2: warning: @verbatim should not appear in @code
+ 'error_line' => ':1: @code missing close brace
',
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 1,
'macro' => '',
- 'text' => '@verbatim should not appear in @code',
- 'type' => 'warning'
+ 'text' => '@code missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':1: @code missing close brace
+ 'error_line' => ':2: warning: @verbatim should not appear in @code
',
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => '@code missing close brace',
- 'type' => 'error'
+ 'text' => '@verbatim should not appear in @code',
+ 'type' => 'warning'
},
{
'error_line' => ':5: Misplaced }
Index: t/results/languages/multiple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/languages/multiple.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/languages/multiple.pl 1 Oct 2011 10:29:28 -0000 1.12
+++ t/results/languages/multiple.pl 29 Oct 2011 14:44:50 -0000 1.13
@@ -367,7 +367,15 @@
[
'category',
{
+ 'contents' => [
+ {
+ 'parent' => {
'contents' => [],
+ 'type' => 'bracketed'
+ },
+ 'text' => 'Instance Variable'
+ }
+ ],
'parent' => undef,
'type' => 'bracketed_def_content'
}
@@ -600,7 +608,15 @@
[
'category',
{
+ 'contents' => [
+ {
+ 'parent' => {
'contents' => [],
+ 'type' => 'bracketed'
+ },
+ 'text' => 'Instance Variable'
+ }
+ ],
'parent' => undef,
'type' => 'bracketed_def_content'
}
@@ -832,7 +848,7 @@
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}
=
$result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'};
+$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}{'contents'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'};
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
@@ -869,7 +885,7 @@
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0];
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0];
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
-$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}
=
$result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'};
+$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}{'contents'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'};
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
Index: t/results/macro/unknown_macro_on_line_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/unknown_macro_on_line_command.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/unknown_macro_on_line_command.pl 3 Jul 2011 14:50:59
-0000 1.5
+++ t/results/macro/unknown_macro_on_line_command.pl 29 Oct 2011 14:44:50
-0000 1.6
@@ -50,15 +50,6 @@
$result_errors{'unknown_macro_on_line_command'} = [
{
- 'error_line' => ':1: warning: @begin should not appear in @setfilename
-',
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => '',
- 'text' => '@begin should not appear in @setfilename',
- 'type' => 'warning'
- },
- {
'error_line' => ':1: Unknown command `begin\'
',
'file_name' => '',
Index: t/results/raw/raw_in_brace_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/raw_in_brace_command.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/raw/raw_in_brace_command.pl 26 Sep 2011 17:15:54 -0000
1.15
+++ t/results/raw/raw_in_brace_command.pl 29 Oct 2011 14:44:50 -0000
1.16
@@ -211,22 +211,22 @@
$result_errors{'raw_in_brace_command'} = [
{
- 'error_line' => ':8: warning: @verbatim should not appear in @samp
+ 'error_line' => ':7: @samp missing close brace
',
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => '',
- 'text' => '@verbatim should not appear in @samp',
- 'type' => 'warning'
+ 'text' => '@samp missing close brace',
+ 'type' => 'error'
},
{
- 'error_line' => ':7: @samp missing close brace
+ 'error_line' => ':8: warning: @verbatim should not appear in @samp
',
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 8,
'macro' => '',
- 'text' => '@samp missing close brace',
- 'type' => 'error'
+ 'text' => '@verbatim should not appear in @samp',
+ 'type' => 'warning'
},
{
'error_line' => ':11: Misplaced }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm t/results/def/doub...,
Patrice Dumas <=