[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/18itemize.t t/re...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/18itemize.t t/re... |
|
Date: |
Sun, 21 Nov 2010 23:36:09 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/11/21 23:36:09
Modified files:
tp/Texinfo : Parser.pm
tp/t : 18itemize.t
tp/t/results/invalid_nestings: formats_not_closed_in_example.pl
itemx_in_itemize_enumerate_in_table.pl
tp/t/results/itemize: headitem_itemx_in_enumerate.pl
Added files:
tp/t/results/itemize: bad_enumerate_arguments.pl
enumerate_argument.pl
Log message:
Parse @enumerate argument.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.152&r2=1.153
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/18itemize.t?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/headitem_itemx_in_enumerate.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/bad_enumerate_arguments.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/enumerate_argument.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- Texinfo/Parser.pm 21 Nov 2010 22:41:27 -0000 1.152
+++ Texinfo/Parser.pm 21 Nov 2010 23:36:08 -0000 1.153
@@ -1756,6 +1756,24 @@
if ($current->{'cmdname'}
and $block_item_commands{$current->{'cmdname'}}) {
+ if ($current->{'cmdname'} eq 'enumerate') {
+ my $spec = 0;
+ if ($current->{'extra'}->{'block_command_line_contents'}
+ and
defined($current->{'extra'}->{'block_command_line_contents'}->[0])) {
+ if
(scalar(@{$current->{'extra'}->{'block_command_line_contents'}->[0]}) > 1) {
+ _line_error ($self, sprintf($self->__("Superfluous argument to
address@hidden"),
+ $current->{'cmdname'}), $line_nr);
+ }
+ my $arg =
$current->{'extra'}->{'block_command_line_contents'}->[0]->[0];
+ if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) {
+ _line_error ($self, sprintf($self->
+ __("Bad argument to address@hidden"), $current->{'cmdname'}),
$line_nr);
+ } else {
+ $spec = $arg->{'text'};
+ }
+ }
+ $current->{'extra'}->{'enumerate_specification'} = $spec;
+ }
push @{$current->{'contents'}}, { 'type' => 'before_item',
'contents' => [], 'parent', $current };
$current = $current->{'contents'}->[-1];
Index: t/18itemize.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/18itemize.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/18itemize.t 24 Oct 2010 08:45:27 -0000 1.5
+++ t/18itemize.t 21 Nov 2010 23:36:09 -0000 1.6
@@ -19,6 +19,19 @@
@item item
@end itemize
'],
+['enumerate_argument',
+'@enumerate 1
address@hidden enumerate
+
address@hidden address@hidden comment
address@hidden enumerate
+
address@hidden z @c comment
address@hidden enumerate
+']
+);
+
+my @test_invalid = (
['not_closed_item',
'@itemize
@item in item
@@ -42,11 +55,31 @@
@itemx itemx enumerate
@headitem headitem enumerate
@end enumerate
+'],
+['bad_enumerate_arguments',
+'@enumerate a b
address@hidden enumerate
+
address@hidden !
address@hidden enumerate
+
address@hidden @code{a}
address@hidden enumerate
+
address@hidden a@@
address@hidden enumerate
+
address@hidden a0
address@hidden enumerate
']
);
+foreach my $test (@test_cases) {
+# $test->[2]->{'test_formats'} = ['plaintext'];
+}
+
our ($arg_test_case, $arg_generate, $arg_debug);
-run_all ('itemize', address@hidden, $arg_test_case,
+run_all ('itemize', address@hidden, @test_invalid], $arg_test_case,
$arg_generate, $arg_debug);
Index: t/results/invalid_nestings/formats_not_closed_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/invalid_nestings/formats_not_closed_in_example.pl 21 Nov 2010
22:41:27 -0000 1.11
+++ t/results/invalid_nestings/formats_not_closed_in_example.pl 21 Nov 2010
23:36:09 -0000 1.12
@@ -165,6 +165,9 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'enumerate_specification' => 0
+ },
'parent' => {}
}
],
Index: t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 20 Nov
2010 16:58:06 -0000 1.10
+++ t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 21 Nov
2010 23:36:09 -0000 1.11
@@ -163,6 +163,9 @@
'type' => 'before_item'
}
],
+ 'extra' => {
+ 'enumerate_specification' => 0
+ },
'parent' => {}
},
{
Index: t/results/itemize/headitem_itemx_in_enumerate.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/itemize/headitem_itemx_in_enumerate.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/itemize/headitem_itemx_in_enumerate.pl 21 Nov 2010 22:41:27
-0000 1.8
+++ t/results/itemize/headitem_itemx_in_enumerate.pl 21 Nov 2010 23:36:09
-0000 1.9
@@ -76,6 +76,9 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'enumerate_specification' => 0
+ },
'parent' => {}
},
{
Index: t/results/itemize/bad_enumerate_arguments.pl
===================================================================
RCS file: t/results/itemize/bad_enumerate_arguments.pl
diff -N t/results/itemize/bad_enumerate_arguments.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/itemize/bad_enumerate_arguments.pl 21 Nov 2010 23:36:09
-0000 1.1
@@ -0,0 +1,413 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted);
+
+$result_trees{'bad_enumerate_arguments'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'a b'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'enumerate_specification' => 0
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '!'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'enumerate_specification' => 0
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'enumerate_specification' => 0
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {},
+ {}
+ ]
+ ],
+ 'enumerate_specification' => 'a'
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'a0'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'enumerate_specification' => 0
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'bad_enumerate_arguments'}{'contents'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[1]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[2]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'bad_enumerate_arguments'}{'contents'}[3];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[3];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[3]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[4]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[5]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[1];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'bad_enumerate_arguments'}{'contents'}[6];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[6];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[1];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[6]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[7]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[8]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0]{'parent'} =
$result_trees{'bad_enumerate_arguments'}{'contents'}[9];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[9];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0]{'contents'}[1];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'extra'}{'block_command_line_contents'}[0][1]
=
$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[9]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[10]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[11]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'args'}[0];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'args'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[12];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'contents'}[0]{'parent'}
= $result_trees{'bad_enumerate_arguments'}{'contents'}[12];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'args'}[0]{'contents'}[1];
+$result_trees{'bad_enumerate_arguments'}{'contents'}[12]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+$result_trees{'bad_enumerate_arguments'}{'contents'}[13]{'parent'} =
$result_trees{'bad_enumerate_arguments'};
+
+$result_texis{'bad_enumerate_arguments'} = '@enumerate a b
address@hidden enumerate
+
address@hidden !
address@hidden enumerate
+
address@hidden @code{a}
address@hidden enumerate
+
address@hidden a@@
address@hidden enumerate
+
address@hidden a0
address@hidden enumerate
+';
+
+
+$result_texts{'bad_enumerate_arguments'} = '
+
+
+
+';
+
+$result_errors{'bad_enumerate_arguments'} = [
+ {
+ 'error_line' => ':1: Bad argument to @enumerate
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'Bad argument to @enumerate',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':4: Bad argument to @enumerate
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => 'Bad argument to @enumerate',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':7: Bad argument to @enumerate
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'Bad argument to @enumerate',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':10: Superfluous argument to @enumerate
+',
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => '',
+ 'text' => 'Superfluous argument to @enumerate',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':13: Bad argument to @enumerate
+',
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => '',
+ 'text' => 'Bad argument to @enumerate',
+ 'type' => 'error'
+ }
+];
+
+
+1;
Index: t/results/itemize/enumerate_argument.pl
===================================================================
RCS file: t/results/itemize/enumerate_argument.pl
diff -N t/results/itemize/enumerate_argument.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/itemize/enumerate_argument.pl 21 Nov 2010 23:36:09 -0000
1.1
@@ -0,0 +1,231 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted);
+
+$result_trees{'enumerate_argument'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '1'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'enumerate_specification' => '1'
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'A'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'enumerate_specification' => 'A'
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'z'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'space_at_end_block_command'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'enumerate',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'enumerate_specification' => 'z'
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'enumerate_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'enumerate_argument'}{'contents'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'enumerate_argument'}{'contents'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'enumerate_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'enumerate_argument'}{'contents'}[0]{'parent'} =
$result_trees{'enumerate_argument'};
+$result_trees{'enumerate_argument'}{'contents'}[1]{'parent'} =
$result_trees{'enumerate_argument'};
+$result_trees{'enumerate_argument'}{'contents'}[2]{'parent'} =
$result_trees{'enumerate_argument'};
+$result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'enumerate_argument'}{'contents'}[3];
+$result_trees{'enumerate_argument'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'enumerate_argument'}{'contents'}[3];
+$result_trees{'enumerate_argument'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'enumerate_argument'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'enumerate_argument'}{'contents'}[3]{'parent'} =
$result_trees{'enumerate_argument'};
+$result_trees{'enumerate_argument'}{'contents'}[4]{'parent'} =
$result_trees{'enumerate_argument'};
+$result_trees{'enumerate_argument'}{'contents'}[5]{'parent'} =
$result_trees{'enumerate_argument'};
+$result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0]{'contents'}[3];
+$result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'enumerate_argument'}{'contents'}[6];
+$result_trees{'enumerate_argument'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'enumerate_argument'}{'contents'}[6];
+$result_trees{'enumerate_argument'}{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'enumerate_argument'}{'contents'}[6]{'args'}[0]{'contents'}[1];
+$result_trees{'enumerate_argument'}{'contents'}[6]{'parent'} =
$result_trees{'enumerate_argument'};
+$result_trees{'enumerate_argument'}{'contents'}[7]{'parent'} =
$result_trees{'enumerate_argument'};
+
+$result_texis{'enumerate_argument'} = '@enumerate 1
address@hidden enumerate
+
address@hidden address@hidden comment
address@hidden enumerate
+
address@hidden z @c comment
address@hidden enumerate
+';
+
+
+$result_texts{'enumerate_argument'} = '
+
+';
+
+$result_errors{'enumerate_argument'} = [];
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm t/18itemize.t t/re...,
Patrice Dumas <=