[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5208] * tp/Texinfo/Parser.pm:
|
From: |
Patrice Dumas |
|
Subject: |
[5208] * tp/Texinfo/Parser.pm: |
|
Date: |
Mon, 25 Feb 2013 22:26:18 +0000 |
Revision: 5208
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5208
Author: pertusus
Date: 2013-02-25 22:26:17 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
* tp/Texinfo/Parser.pm:
Close line @-command with special @-commands if there is no comment
ending the line. Report from Eli Zaretskii on bug-texinfo,
24 Feb 2013 17:53:15.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/50value.t
trunk/tp/t/results/value/set_in_item_missing_line.pl
trunk/tp/t/results/value/set_on_item_line.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2013-02-25 21:35:30 UTC (rev 5207)
+++ trunk/ChangeLog 2013-02-25 22:26:17 UTC (rev 5208)
@@ -2,6 +2,9 @@
* tp/Texinfo/Parser.pm: use tell to find the position of the
beginning of the line.
+ Close line @-command with special @-commands if there is no comment
+ ending the line. Report from Eli Zaretskii on bug-texinfo,
+ 24 Feb 2013 17:53:15.
* configure.ac, tp/defs.in, tp/tests/run_parser_all.sh:
determine whether diff accepts -a and sets DIFF_A_OPTION to -a if so.
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2013-02-25 21:35:30 UTC (rev 5207)
+++ trunk/tp/Texinfo/Parser.pm 2013-02-25 22:26:17 UTC (rev 5208)
@@ -4331,10 +4331,11 @@
$misc = {'cmdname' => $command,
'parent' => $current};
my $args = [];
+ my $has_comment;
if ($arg_spec eq 'lineraw' or $arg_spec eq 'skipline') {
$args = [ $line ];
} elsif ($arg_spec eq 'special') {
- $args
+ ($args, $has_comment)
= $self->_parse_special_misc_command($line, $command,
$line_nr);
$misc->{'extra'}->{'arg_line'} = $line;
}
@@ -4398,7 +4399,7 @@
$line_nr, $misc);
$self->_register_global_command($command, $misc, $line_nr);
# the end of line is ignored for special commands
- if ($arg_spec ne 'special') {
+ if ($arg_spec ne 'special' or !$has_comment) {
$current = _end_line($self, $current, $line_nr);
}
@@ -5310,12 +5311,15 @@
my $line_nr = shift;
my $args = [];
+ my $has_comment = 0;
my $remaining;
if ($command eq 'set') {
# REVALUE
#if ($line =~ s/^\s+([\w\-]+)(\s+(.*?))\s*$//) {
if ($line =~
/^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\@(c|comment)((\@|\s+).*)?|\s+(.*?))?\s*$/) {
- $line =~ s/\@(c|comment)((\@|\s+).*)?$//;
+ if ($line =~ s/\@(c|comment)((\@|\s+).*)?$//) {
+ $has_comment = 1;
+ }
$line =~ /^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\s+(.*?))?\s*$/;
my $name = $1;
my $arg = $3;
@@ -5336,6 +5340,7 @@
$args = [$1];
delete $self->{'values'}->{$1}
unless(_ignore_global_commands($self));
+ $has_comment = 1 if (defined($3));
#$remaining = $line;
#$remaining =~ s/^\s+([\w\-]+)\s*(\@(c|comment)((\@|\s+).*)?)?//;
} elsif ($line !~ /\S/) {
@@ -5351,6 +5356,7 @@
$args = [$1];
delete $self->{'macros'}->{$1}
unless(_ignore_global_commands($self));
+ $has_comment = 1 if (defined($3));
print STDERR "UNMACRO $1\n" if ($self->{'DEBUG'});
} elsif ($line !~ /\S/) {
$self->line_error(sprintf($self->
@@ -5367,6 +5373,7 @@
unless(_ignore_global_commands($self));
$remaining = $line;
$remaining =~
s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
+ $has_comment = 1 if (defined($4));
} else {
$self->line_error (sprintf($self->__(
"address@hidden should only accept a address@hidden as
argument, not `%s'"),
@@ -5383,7 +5390,7 @@
$command, $remaining), $line_nr);
}
}
- return ($args);
+ return ($args, $has_comment);
}
sub _trim_spaces_comment_from_content($)
Modified: trunk/tp/t/50value.t
===================================================================
--- trunk/tp/t/50value.t 2013-02-25 21:35:30 UTC (rev 5207)
+++ trunk/tp/t/50value.t 2013-02-25 22:26:17 UTC (rev 5208)
@@ -300,12 +300,21 @@
'],
['set_on_item_line',
'@table @code
address@hidden @set a address@hidden
+item text
+in item
address@hidden jj @set address@hidden
+line
address@hidden vvv @set address@hidden
address@hidden table
+
address@hidden @code
@item @set a b
item text
in item
@item jj @set j
line
address@hidden vvv @set address@hidden
address@hidden vvv @set g
@end table
'],
['set_in_item_missing_line',
@@ -313,6 +322,11 @@
@item xx @set n
@item jj
@end table
+
address@hidden @code
address@hidden xx @set address@hidden
address@hidden jj
address@hidden table
']
);
Modified: trunk/tp/t/results/value/set_in_item_missing_line.pl
===================================================================
--- trunk/tp/t/results/value/set_in_item_missing_line.pl 2013-02-25
21:35:30 UTC (rev 5207)
+++ trunk/tp/t/results/value/set_in_item_missing_line.pl 2013-02-25
22:26:17 UTC (rev 5208)
@@ -55,9 +55,14 @@
},
{
'parent' => {},
- 'text' => 'xx '
+ 'text' => 'xx'
},
{
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -80,14 +85,235 @@
]
},
'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'misc_content' => [
+ {},
+ {},
+ {}
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'parent' => {},
+ 'text' => 'jj'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'table'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'table',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'table'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {},
+ 'end_command' => {},
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'code',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
'text' => ' ',
'type' => 'empty_spaces_after_command'
},
{
'parent' => {},
+ 'text' => 'xx '
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'n',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'arg_line' => ' address@hidden
+',
+ 'misc_args' => [
+ 'n',
+ ''
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
'text' => 'jj'
},
{
@@ -113,7 +339,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 7,
'macro' => ''
},
'parent' => {}
@@ -162,7 +388,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 9,
'macro' => ''
},
'parent' => {}
@@ -180,7 +406,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 6,
'macro' => ''
},
'parent' => {}
@@ -196,60 +422,112 @@
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[3]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'parent'} =
$result_trees{'set_in_item_missing_line'};
+$result_trees{'set_in_item_missing_line'}{'contents'}[1]{'parent'} =
$result_trees{'set_in_item_missing_line'};
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[3]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'extra'}{'end_command'}
= $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[2]{'parent'} =
$result_trees{'set_in_item_missing_line'};
$result_texis{'set_in_item_missing_line'} = '@table @code
@item xx @set n
address@hidden jj
address@hidden table
+
address@hidden @code
address@hidden xx @set address@hidden
jj
@end table
';
-$result_texts{'set_in_item_missing_line'} = 'xx jj
+$result_texts{'set_in_item_missing_line'} = 'xx
+jj
+
+xx jj
';
$result_errors{'set_in_item_missing_line'} = [
{
- 'error_line' => ':3: @item outside of table or list
+ 'error_line' => ':8: @item outside of table or list
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 8,
'macro' => '',
'text' => '@item outside of table or list',
'type' => 'error'
},
{
- 'error_line' => ':3: warning: @item should not appear in @item
+ 'error_line' => ':8: warning: @item should not appear in @item
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 8,
'macro' => '',
'text' => '@item should not appear in @item',
'type' => 'warning'
Modified: trunk/tp/t/results/value/set_on_item_line.pl
===================================================================
--- trunk/tp/t/results/value/set_on_item_line.pl 2013-02-25 21:35:30 UTC
(rev 5207)
+++ trunk/tp/t/results/value/set_on_item_line.pl 2013-02-25 22:26:17 UTC
(rev 5208)
@@ -68,7 +68,7 @@
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a b
+ 'arg_line' => ' a address@hidden
',
'misc_args' => [
'a',
@@ -167,7 +167,7 @@
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' j
+ 'arg_line' => ' address@hidden
',
'misc_args' => [
'j',
@@ -341,6 +341,363 @@
'macro' => ''
},
'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'code',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'a',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'b',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'arg_line' => ' a b
+',
+ 'misc_args' => [
+ 'a',
+ 'b'
+ ]
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'item text
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in item
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_item'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'jj'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'j',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'arg_line' => ' j
+',
+ 'misc_args' => [
+ 'j',
+ ''
+ ]
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'misc_content' => [
+ {},
+ {},
+ {}
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'line
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_item'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'vvv'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'g',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'arg_line' => ' g
+',
+ 'misc_args' => [
+ 'g',
+ ''
+ ]
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'misc_content' => [
+ {},
+ {},
+ {}
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'table'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'table',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'table'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {},
+ 'end_command' => {},
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'type' => 'text_root'
@@ -407,14 +764,90 @@
$result_trees{'set_on_item_line'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[3];
$result_trees{'set_on_item_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'set_on_item_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'set_on_item_line'}{'contents'}[0]{'parent'} =
$result_trees{'set_on_item_line'};
+$result_trees{'set_on_item_line'}{'contents'}[1]{'parent'} =
$result_trees{'set_on_item_line'};
+$result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'set_on_item_line'}{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'set_on_item_line'}{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'set_on_item_line'}{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'set_on_item_line'}{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'set_on_item_line'}{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'set_on_item_line'}{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'set_on_item_line'}{'contents'}[2];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'extra'}{'command_as_argument'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'extra'}{'end_command'} =
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'extra'}{'spaces_after_command'}
= $result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'parent'} =
$result_trees{'set_on_item_line'};
$result_texis{'set_on_item_line'} = '@table @code
address@hidden @set a address@hidden
+item text
+in item
address@hidden jj @set address@hidden
+line
address@hidden vvv @set address@hidden
address@hidden table
+
address@hidden @code
@item @set a b
item text
in item
@item jj @set j
line
address@hidden vvv @set address@hidden
address@hidden vvv @set g
@end table
';
@@ -423,6 +856,13 @@
in item
jj line
vvv
+
+
+item text
+in item
+jj
+line
+vvv
';
$result_errors{'set_on_item_line'} = [];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5208] * tp/Texinfo/Parser.pm:,
Patrice Dumas <=