[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/results/coverage...
From: |
Patrice Dumas |
Subject: |
texinfo/tp Texinfo/Parser.pm t/results/coverage... |
Date: |
Wed, 13 Oct 2010 23:21:40 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/13 23:21:40
Modified files:
tp/Texinfo : Parser.pm
tp/t/results/coverage: block_commands.pl commands.pl
tp/t/results/coverage_braces: nested_args.pl too_much_args.pl
tp/t/results/macro: expand_two_same.pl
tp/t/results/misc_commands: definfoenclose.pl
tp/t/results/paragraph: no_paragraph_commands.pl
tp/t/results/sectioning: node.pl
tp/t/results/value: value_in_node.pl value_node_directions.pl
Log message:
Also keep spaces after opening { and after a ,.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested_args.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/too_much_args.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/expand_two_same.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/definfoenclose.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_node.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_node_directions.pl?cvsroot=texinfo&r1=1.4&r2=1.5
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- Texinfo/Parser.pm 12 Oct 2010 19:15:24 -0000 1.65
+++ Texinfo/Parser.pm 13 Oct 2010 23:21:39 -0000 1.66
@@ -849,7 +849,7 @@
my $paragraph;
- my $no_merge_with_empty_line_after_command = 0;
+ my $no_merge_with_following_text = 0;
if ($text =~ /\S/) {
my $leading_spaces;
if ($text =~ /^(\s+)/) {
@@ -857,8 +857,9 @@
}
if ($current->{'contents'} and @{$current->{'contents'}}
and $current->{'contents'}->[-1]->{'type'}
- and $current->{'contents'}->[-1]->{'type'} eq
'empty_line_after_command') {
- $no_merge_with_empty_line_after_command = 1;
+ and ($current->{'contents'}->[-1]->{'type'} eq 'empty_line_after_command'
+ or $current->{'contents'}->[-1]->{'type'} eq
'empty_spaces_before_argument')) {
+ $no_merge_with_following_text = 1;
}
# Change this if you don't want to have preceding space added to
# the text out of the paragraph
@@ -875,7 +876,7 @@
if (@{$current->{'contents'}}
and exists($current->{'contents'}->[-1]->{'text'})
and $current->{'contents'}->[-1]->{'text'} !~ /\n/
- and !$no_merge_with_empty_line_after_command) {
+ and !$no_merge_with_following_text) {
$current->{'contents'}->[-1]->{'text'} .= $text;
print STDERR "MERGED TEXT: $text|||\n" if ($self->{'debug'});
}
@@ -1085,15 +1086,16 @@
$additional_text = '' if (!defined($additional_text));
if ($current->{'contents'} and @{$current->{'contents'}}
and $current->{'contents'}->[-1]->{'type'}
- and (($current->{'contents'}->[-1]->{'type'} eq 'empty_line') or
- $current->{'contents'}->[-1]->{'type'} eq 'empty_line_after_command'))
{
+ and ($current->{'contents'}->[-1]->{'type'} eq 'empty_line'
+ or $current->{'contents'}->[-1]->{'type'} eq
'empty_spaces_before_argument'
+ or $current->{'contents'}->[-1]->{'type'} eq
'empty_line_after_command')) {
print STDERR "ABORT EMPTY additional text $additional_text, current
$current->{'contents'}->[-1]->{'text'}|)\n" if ($self->{'debug'});
$current->{'contents'}->[-1]->{'text'} .= $additional_text;
if ($current->{'contents'}->[-1]->{'text'} eq '') {
pop @{$current->{'contents'}}
} elsif ($current->{'contents'}->[-1]->{'type'} eq 'empty_line') {
delete $current->{'contents'}->[-1]->{'type'};
- } else {
+ } elsif ($current->{'contents'}->[-1]->{'type'} eq
'empty_line_after_command') {
$current->{'contents'}->[-1]->{'type'} = 'empty_spaces_after_command';
}
return 1;
@@ -1979,8 +1981,6 @@
# the end of line?
last;
} else {
- # FIXME this won't work with macro expanded
- # $line =~ s/\s*//;
# the def command holds a line_def* which corresponds with the
# definition line. This allows to have a treatement similar
# with def*x.
@@ -2079,6 +2079,9 @@
push @{$self->{'context_stack'}},
$current->{'parent'}->{'cmdname'};
} else {
$current->{'type'} = 'brace_command_arg';
+ push @{$current->{'contents'}},
+ {'type' => 'empty_spaces_before_argument',
+ 'text' => '' } unless ($current->{'parent'}->{'cmdname'} eq
'verb');
}
print STDERR "OPENED address@hidden>{'parent'}->{'cmdname'},
remaining: $current->{'parent'}->{'remaining_args'}, "
.($current->{'type'} ? "type: $current->{'type'}" : '')."\n"
@@ -2112,6 +2115,7 @@
}
# first is the arg.
print STDERR "CLOSING address@hidden>{'parent'}->{'cmdname'}\n"
if ($self->{'debug'});
+ _abort_empty_line ($self, $current);
$current = $current->{'parent'}->{'parent'};
# footnote caption closing
} elsif ($context_brace_commands{$self->{'context_stack'}->[-1]}) {
@@ -2131,14 +2135,16 @@
}
} elsif ($separator eq ','
and $current->{'parent'}->{'remaining_args'}) {
- # FIXME this won't work if there is a user macro
- $line =~ s/^\s*//;
my $type = $current->{'type'};
+ _abort_empty_line ($self, $current);
$current = $current->{'parent'};
$current->{'remaining_args'}--;
push @{$current->{'args'}},
{ 'type' => $type, 'parent' => $current, 'contents' => [] };
$current = $current->{'args'}->[-1];
+ push @{$current->{'contents'}},
+ {'type' => 'empty_spaces_before_argument',
+ 'text' => '' };
# end of menu node (. must be followed by a space to stop the node).
} elsif (($separator =~ /[,\t.]/ and $current->{'type'}
and $current->{'type'} eq 'menu_entry_node')
@@ -2243,9 +2249,9 @@
die "bad args type (".ref($cmd->{'args'}).") $cmd->{'args'}\n"
if (ref($cmd->{'args'}) ne 'ARRAY');
foreach my $arg (@{$cmd->{'args'}}) {
- $result .= tree_to_texi ($arg) . ', ';
+ $result .= tree_to_texi ($arg) . ',';
}
- $result =~ s/, $//;
+ $result =~ s/,$//;
} elsif (defined($cmd->{'args'})) {
my $braces;
$braces = 1 if (($cmd->{'args'}->[0]->{'type'}
@@ -2263,7 +2269,7 @@
foreach my $arg (@{$cmd->{'args'}}) {
if (exists($brace_commands{$cmdname}) or ($cmd->{'type'}
and $cmd->{'type'} eq 'definfoenclose_command')) {
- $result .= ', ' if ($arg_nr);
+ $result .= ',' if ($arg_nr);
$arg_nr++;
}
$result .= tree_to_texi ($arg);
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/block_commands.pl 12 Oct 2010 09:59:14 -0000
1.4
+++ t/results/coverage/block_commands.pl 13 Oct 2010 23:21:39 -0000
1.5
@@ -101,6 +101,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'b float
'
@@ -208,7 +212,7 @@
$result_trees{'block_commands'}{'contents'}[6]{'parent'} =
$result_trees{'block_commands'};
$result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[0];
$result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
-$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[1];
+$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[1];
$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
$result_trees{'block_commands'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'contents'}[0];
$result_trees{'block_commands'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage/commands.pl 12 Oct 2010 16:45:07 -0000 1.6
+++ t/results/coverage/commands.pl 13 Oct 2010 23:21:39 -0000 1.7
@@ -139,6 +139,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'b'
}
@@ -281,7 +285,7 @@
$result_trees{'commands'}{'contents'}[0]{'contents'}[12]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[1];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[1];
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[1]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13];
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
$result_trees{'commands'}{'contents'}[0]{'contents'}[14]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
Index: t/results/coverage_braces/nested_args.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/nested_args.pl 4 Oct 2010 07:02:41 -0000
1.2
+++ t/results/coverage_braces/nested_args.pl 13 Oct 2010 23:21:39 -0000
1.3
@@ -41,6 +41,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'descr '
},
@@ -84,10 +88,10 @@
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0];
$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'nested_args'}{'contents'}[0];
$result_trees{'nested_args'}{'contents'}[0]{'parent'} =
$result_trees{'nested_args'};
Index: t/results/coverage_braces/too_much_args.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/too_much_args.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/too_much_args.pl 4 Oct 2010 07:02:41 -0000
1.2
+++ t/results/coverage_braces/too_much_args.pl 13 Oct 2010 23:21:39 -0000
1.3
@@ -19,6 +19,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'A truc Z b, E eep'
}
@@ -40,7 +44,7 @@
};
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
-$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
$result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'too_much_args'}{'contents'}[0];
$result_trees{'too_much_args'}{'contents'}[0]{'parent'} =
$result_trees{'too_much_args'};
Index: t/results/macro/expand_two_same.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/expand_two_same.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/expand_two_same.pl 12 Oct 2010 09:59:14 -0000 1.4
+++ t/results/macro/expand_two_same.pl 13 Oct 2010 23:21:39 -0000 1.5
@@ -64,9 +64,9 @@
{
'contents' => [
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_before_argument'
},
{
'parent' => {},
@@ -96,9 +96,9 @@
{
'contents' => [
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_before_argument'
},
{
'parent' => {},
@@ -167,13 +167,11 @@
$result_trees{'expand_two_same'}{'contents'}[1]{'parent'} =
$result_trees{'expand_two_same'};
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[2];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[2];
-$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2]{'args'}[0];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2]{'args'}[0];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[2];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[2];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[4]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[2];
-$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[5]{'args'}[0];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[5]{'args'}[0];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[5];
$result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[5]{'parent'} =
$result_trees{'expand_two_same'}{'contents'}[2];
Index: t/results/misc_commands/definfoenclose.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/definfoenclose.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/misc_commands/definfoenclose.pl 12 Oct 2010 16:45:08 -0000
1.6
+++ t/results/misc_commands/definfoenclose.pl 13 Oct 2010 23:21:39 -0000
1.7
@@ -255,8 +255,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' is it really strong? '
+ 'text' => 'is it really strong? '
}
],
'parent' => {},
@@ -322,7 +326,7 @@
$result_trees{'definfoenclose'}{'contents'}[11]{'args'}[0]{'parent'} =
$result_trees{'definfoenclose'}{'contents'}[11];
$result_trees{'definfoenclose'}{'contents'}[11]{'parent'} =
$result_trees{'definfoenclose'};
$result_trees{'definfoenclose'}{'contents'}[12]{'parent'} =
$result_trees{'definfoenclose'};
-$result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[0]{'args'}[0];
$result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[0];
$result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[0]{'parent'} =
$result_trees{'definfoenclose'}{'contents'}[13];
$result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[1]{'parent'} =
$result_trees{'definfoenclose'}{'contents'}[13];
Index: t/results/paragraph/no_paragraph_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/paragraph/no_paragraph_commands.pl 4 Oct 2010 07:02:41
-0000 1.2
+++ t/results/paragraph/no_paragraph_commands.pl 13 Oct 2010 23:21:40
-0000 1.3
@@ -120,7 +120,7 @@
$result_texts{'no_paragraph_commands'} = '@*
@titlefont{title font}
address@hidden, bb, cc, dd, ee}
address@hidden,bb,cc,dd,ee}
';
$result_errors{'no_paragraph_commands'} = [];
Index: t/results/sectioning/node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/node.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/sectioning/node.pl 12 Oct 2010 16:45:08 -0000 1.5
+++ t/results/sectioning/node.pl 13 Oct 2010 23:21:40 -0000 1.6
@@ -51,6 +51,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'two arg
'
@@ -84,6 +88,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'two arg'
}
@@ -94,6 +102,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'three arg
'
@@ -127,6 +139,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'two arg'
}
@@ -137,6 +153,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'three arg'
}
@@ -147,6 +167,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'four arg
'
@@ -180,6 +204,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'two arg'
}
@@ -190,6 +218,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'three arg'
}
@@ -200,6 +232,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'four arg'
}
@@ -210,6 +246,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'five arg
'
@@ -305,6 +345,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'args' => [
{
'parent' => {},
@@ -325,6 +369,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'args' => [
{
'contents' => [
@@ -377,37 +425,37 @@
$result_trees{'node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[2]{'args'}[0];
$result_trees{'node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[2]{'args'}[0];
$result_trees{'node'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[2];
-$result_trees{'node'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[2]{'args'}[1];
+$result_trees{'node'}{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[2]{'args'}[1];
$result_trees{'node'}{'contents'}[2]{'args'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[2];
$result_trees{'node'}{'contents'}[2]{'parent'} = $result_trees{'node'};
$result_trees{'node'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[3]{'args'}[0];
$result_trees{'node'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[3]{'args'}[0];
$result_trees{'node'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[3];
-$result_trees{'node'}{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[3]{'args'}[1];
+$result_trees{'node'}{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[3]{'args'}[1];
$result_trees{'node'}{'contents'}[3]{'args'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[3];
-$result_trees{'node'}{'contents'}[3]{'args'}[2]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[3]{'args'}[2];
+$result_trees{'node'}{'contents'}[3]{'args'}[2]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[3]{'args'}[2];
$result_trees{'node'}{'contents'}[3]{'args'}[2]{'parent'} =
$result_trees{'node'}{'contents'}[3];
$result_trees{'node'}{'contents'}[3]{'parent'} = $result_trees{'node'};
$result_trees{'node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[4]{'args'}[0];
$result_trees{'node'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[4]{'args'}[0];
$result_trees{'node'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[4];
-$result_trees{'node'}{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[4]{'args'}[1];
+$result_trees{'node'}{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[4]{'args'}[1];
$result_trees{'node'}{'contents'}[4]{'args'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[4];
-$result_trees{'node'}{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[4]{'args'}[2];
+$result_trees{'node'}{'contents'}[4]{'args'}[2]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[4]{'args'}[2];
$result_trees{'node'}{'contents'}[4]{'args'}[2]{'parent'} =
$result_trees{'node'}{'contents'}[4];
-$result_trees{'node'}{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[4]{'args'}[3];
+$result_trees{'node'}{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[4]{'args'}[3];
$result_trees{'node'}{'contents'}[4]{'args'}[3]{'parent'} =
$result_trees{'node'}{'contents'}[4];
$result_trees{'node'}{'contents'}[4]{'parent'} = $result_trees{'node'};
$result_trees{'node'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[0];
$result_trees{'node'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[0];
$result_trees{'node'}{'contents'}[5]{'args'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[5];
-$result_trees{'node'}{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[1];
+$result_trees{'node'}{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[1];
$result_trees{'node'}{'contents'}[5]{'args'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[5];
-$result_trees{'node'}{'contents'}[5]{'args'}[2]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[2];
+$result_trees{'node'}{'contents'}[5]{'args'}[2]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[2];
$result_trees{'node'}{'contents'}[5]{'args'}[2]{'parent'} =
$result_trees{'node'}{'contents'}[5];
-$result_trees{'node'}{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[3];
+$result_trees{'node'}{'contents'}[5]{'args'}[3]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[3];
$result_trees{'node'}{'contents'}[5]{'args'}[3]{'parent'} =
$result_trees{'node'}{'contents'}[5];
-$result_trees{'node'}{'contents'}[5]{'args'}[4]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[4];
+$result_trees{'node'}{'contents'}[5]{'args'}[4]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[5]{'args'}[4];
$result_trees{'node'}{'contents'}[5]{'args'}[4]{'parent'} =
$result_trees{'node'}{'contents'}[5];
$result_trees{'node'}{'contents'}[5]{'parent'} = $result_trees{'node'};
$result_trees{'node'}{'contents'}[6]{'parent'} = $result_trees{'node'};
@@ -424,16 +472,16 @@
$result_trees{'node'}{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[0];
$result_trees{'node'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[0];
$result_trees{'node'}{'contents'}[9]{'args'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[9];
-$result_trees{'node'}{'contents'}[9]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'node'}{'contents'}[9]{'args'}[1]{'contents'}[0];
-$result_trees{'node'}{'contents'}[9]{'args'}[1]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[1];
+$result_trees{'node'}{'contents'}[9]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'node'}{'contents'}[9]{'args'}[1]{'contents'}[1];
$result_trees{'node'}{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[1];
+$result_trees{'node'}{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[1];
$result_trees{'node'}{'contents'}[9]{'args'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[9];
-$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[0];
-$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[0]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[2];
+$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[1];
$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[1]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[2];
-$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[2];
$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[2]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[2];
+$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[3];
+$result_trees{'node'}{'contents'}[9]{'args'}[2]{'contents'}[3]{'parent'} =
$result_trees{'node'}{'contents'}[9]{'args'}[2];
$result_trees{'node'}{'contents'}[9]{'args'}[2]{'parent'} =
$result_trees{'node'}{'contents'}[9];
$result_trees{'node'}{'contents'}[9]{'parent'} = $result_trees{'node'};
Index: t/results/value/value_in_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_in_node.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/value/value_in_node.pl 12 Oct 2010 16:45:08 -0000 1.6
+++ t/results/value/value_in_node.pl 13 Oct 2010 23:21:40 -0000 1.7
@@ -48,6 +48,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => '(dir)'
}
@@ -58,6 +62,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => '(dir)'
}
@@ -68,6 +76,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => '(dir)
'
@@ -195,6 +207,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'Top'
}
@@ -205,6 +221,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'Top
'
@@ -351,13 +371,22 @@
'type' => 'misc_line_arg'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ }
+ ],
'parent' => {},
'type' => 'misc_line_arg'
},
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'Node 1'
}
@@ -368,6 +397,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'Node 1
'
@@ -425,11 +458,11 @@
$result_trees{'value_in_node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[2]{'args'}[0];
$result_trees{'value_in_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[2]{'args'}[0];
$result_trees{'value_in_node'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[2];
-$result_trees{'value_in_node'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[2]{'args'}[1];
+$result_trees{'value_in_node'}{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[2]{'args'}[1];
$result_trees{'value_in_node'}{'contents'}[2]{'args'}[1]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[2];
-$result_trees{'value_in_node'}{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[2]{'args'}[2];
+$result_trees{'value_in_node'}{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[2]{'args'}[2];
$result_trees{'value_in_node'}{'contents'}[2]{'args'}[2]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[2];
-$result_trees{'value_in_node'}{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[2]{'args'}[3];
+$result_trees{'value_in_node'}{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[2]{'args'}[3];
$result_trees{'value_in_node'}{'contents'}[2]{'args'}[3]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[2];
$result_trees{'value_in_node'}{'contents'}[2]{'parent'} =
$result_trees{'value_in_node'};
$result_trees{'value_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[3]{'args'}[0];
@@ -452,9 +485,9 @@
$result_trees{'value_in_node'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[8]{'args'}[0];
$result_trees{'value_in_node'}{'contents'}[8]{'args'}[0]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[8];
$result_trees{'value_in_node'}{'contents'}[8]{'args'}[1]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[8];
-$result_trees{'value_in_node'}{'contents'}[8]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[8]{'args'}[2];
+$result_trees{'value_in_node'}{'contents'}[8]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[8]{'args'}[2];
$result_trees{'value_in_node'}{'contents'}[8]{'args'}[2]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[8];
-$result_trees{'value_in_node'}{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[8]{'args'}[3];
+$result_trees{'value_in_node'}{'contents'}[8]{'args'}[3]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[8]{'args'}[3];
$result_trees{'value_in_node'}{'contents'}[8]{'args'}[3]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[8];
$result_trees{'value_in_node'}{'contents'}[8]{'parent'} =
$result_trees{'value_in_node'};
$result_trees{'value_in_node'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[9]{'args'}[0];
@@ -481,9 +514,9 @@
$result_trees{'value_in_node'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[16]{'args'}[0];
$result_trees{'value_in_node'}{'contents'}[16]{'args'}[0]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[16];
$result_trees{'value_in_node'}{'contents'}[16]{'args'}[1]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[16];
-$result_trees{'value_in_node'}{'contents'}[16]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[16]{'args'}[2];
+$result_trees{'value_in_node'}{'contents'}[16]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[16]{'args'}[2];
$result_trees{'value_in_node'}{'contents'}[16]{'args'}[2]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[16];
-$result_trees{'value_in_node'}{'contents'}[16]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[16]{'args'}[3];
+$result_trees{'value_in_node'}{'contents'}[16]{'args'}[3]{'contents'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[16]{'args'}[3];
$result_trees{'value_in_node'}{'contents'}[16]{'args'}[3]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[16];
$result_trees{'value_in_node'}{'contents'}[16]{'parent'} =
$result_trees{'value_in_node'};
$result_trees{'value_in_node'}{'contents'}[17]{'parent'} =
$result_trees{'value_in_node'};
@@ -502,7 +535,7 @@
* Node 1 ::
@end menu
address@hidden Node 1, , Top, Top
address@hidden Node 1,, Top, Top
@chapter Chapter 1
@set sec1 Section 1.1
Index: t/results/value/value_node_directions.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_node_directions.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/value/value_node_directions.pl 12 Oct 2010 16:45:08 -0000
1.4
+++ t/results/value/value_node_directions.pl 13 Oct 2010 23:21:40 -0000
1.5
@@ -48,6 +48,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'bar'
}
@@ -58,6 +62,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => '(dir)'
}
@@ -68,6 +76,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => '(dir)
'
@@ -140,6 +152,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'BarFoo'
}
@@ -150,6 +166,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'Top'
}
@@ -160,6 +180,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => '(dir)
'
@@ -219,13 +243,22 @@
'type' => 'misc_line_arg'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ }
+ ],
'parent' => {},
'type' => 'misc_line_arg'
},
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => 'bar'
}
@@ -236,6 +269,10 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
'text' => '(dir)
'
@@ -280,11 +317,11 @@
$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[0];
$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[0];
$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[2];
-$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[1];
+$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[1];
$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[1]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[2];
-$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[2];
+$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[2];
$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[2]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[2];
-$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[3];
+$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[3];
$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[3]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[2];
$result_trees{'value_node_directions'}{'contents'}[2]{'parent'} =
$result_trees{'value_node_directions'};
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[0];
@@ -297,11 +334,11 @@
$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[6]{'args'}[0];
$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[6]{'args'}[0];
$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[6];
-$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[6]{'args'}[1];
+$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[6]{'args'}[1];
$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[1]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[6];
-$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[6]{'args'}[2];
+$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[6]{'args'}[2];
$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[2]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[6];
-$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[6]{'args'}[3];
+$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[3]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[6]{'args'}[3];
$result_trees{'value_node_directions'}{'contents'}[6]{'args'}[3]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[6];
$result_trees{'value_node_directions'}{'contents'}[6]{'parent'} =
$result_trees{'value_node_directions'};
$result_trees{'value_node_directions'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[7]{'args'}[0];
@@ -313,9 +350,9 @@
$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[9]{'args'}[0];
$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[0]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[9];
$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[1]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[9];
-$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[9]{'args'}[2];
+$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[9]{'args'}[2];
$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[2]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[9];
-$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[9]{'args'}[3];
+$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[3]{'contents'}[1]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[9]{'args'}[3];
$result_trees{'value_node_directions'}{'contents'}[9]{'args'}[3]{'parent'} =
$result_trees{'value_node_directions'}{'contents'}[9];
$result_trees{'value_node_directions'}{'contents'}[9]{'parent'} =
$result_trees{'value_node_directions'};
$result_trees{'value_node_directions'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'value_node_directions'}{'contents'}[10]{'args'}[0];