[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Co...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Co... |
|
Date: |
Sun, 05 Jun 2011 14:03:49 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/06/05 14:03:48
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: Converter.pm HTML.pm
tp/t/results/coverage_braces: abbr_acronym.pl too_much_args.pl
tp/t/results/menu: formats_in_menu.pl
tp/t/results/plaintext_tests: at_commands_glued_in_example.pl
at_commands_glued_in_paragraph.pl
tp/t/results/sectioning: at_commands_in_refs.pl
Log message:
Improve handling of acronym and abbr in parser.
For mat those commands in html.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.257&r2=1.258
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/too_much_args.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.39&r2=1.40
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- Texinfo/Parser.pm 4 Jun 2011 17:02:22 -0000 1.257
+++ Texinfo/Parser.pm 5 Jun 2011 14:03:47 -0000 1.258
@@ -237,6 +237,12 @@
'macros' => {}, # the key is the user-defined macro name. The
# value is the reference on a macro element
# as obtained by parsing the @macro
+ 'explained_commands' => {}, # the key is a command name, either acronym
+ # or abbr, the value is a hash. The key hash
+ # is a normalized first argument of the
+ # corresponding command, the value is the
+ # contents array of the previous command with
+ # this first arg and a second arg.
'clickstyle' => 'arrow',
'kbdinputstyle' => 'distinct',
'sections_level' => 0, # modified by raise/lowersections
@@ -356,6 +362,7 @@
my %region_commands = %Texinfo::Common::region_commands;
my %code_style_commands = %Texinfo::Common::code_style_commands;
my %in_heading_commands = %Texinfo::Common::in_heading_commands;
+my %explained_commands = %Texinfo::Common::explained_commands;
my %keep_line_nr_brace_commands = %context_brace_commands;
foreach my $keep_line_nr_brace_command ('titlefont', 'anchor') {
@@ -665,6 +672,11 @@
foreach my $index (keys (%{$parser->{'index_names'}})) {
$parser->_register_index_commands($index);
}
+ foreach my $explained_command(keys(%explained_commands)) {
+ if (!defined($parser->{'explained_commands'}->{$explained_command})) {
+ $parser->{'explained_commands'}->{$explained_command} = {};
+ }
+ }
$parser->{'context_stack'} = [ $parser->{'context'} ];
$parser->{'regions_stack'} = [];
# turn the array to a hash for speed. Not sure it really matters for such
@@ -1337,7 +1349,6 @@
}
}
}
-
}
# close the current command, with error messages and give the parent.
@@ -4127,6 +4138,30 @@
Texinfo::Convert::Texinfo::convert($current)), $line_nr);
}
}
+ } elsif ($explained_commands{$current->{'parent'}->{'cmdname'}}) {
+ my $explained = $current->{'parent'};
+ if (address@hidden>{'args'}}
+ or address@hidden>{'extra'}->{'brace_command_contents'}}
+ or
!defined($explained->{'extra'}->{'brace_command_contents'}->[0])) {
+ $self->line_warning(
+ sprintf($self->__("address@hidden missing first argument"),
+ $explained->{'cmdname'}), $line_nr);
+ } else {
+ my $normalized_type
+ = Texinfo::Convert::NodeNameNormalization::normalize_node(
+ {'contents' =>
+
$explained->{'extra'}->{'brace_command_contents'}->[0]});
+ $explained->{'extra'}->{'normalized'} = $normalized_type;
+ if (!$explained->{'extra'}->{'brace_command_contents'}->[1]) {
+ if
($self->{'explained_commands'}->{$explained->{'cmdname'}}->{$normalized_type}) {
+ $explained->{'extra'}->{'explanation_contents'}
+ =
$self->{'explained_commands'}->{$explained->{'cmdname'}}->{$normalized_type};
+ }
+ } else {
+
$self->{'explained_commands'}->{$explained->{'cmdname'}}->{$normalized_type}
+ = $explained->{'extra'}->{'brace_command_contents'}->[1];
+ }
+ }
}
$self->_register_global_command($current->{'parent'}->{'cmdname'},
$current->{'parent'}, $line_nr);
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- Texinfo/Convert/Converter.pm 4 Jun 2011 17:02:22 -0000 1.21
+++ Texinfo/Convert/Converter.pm 5 Jun 2011 14:03:48 -0000 1.22
@@ -409,6 +409,7 @@
push @{$verbatiminclude->{'contents'}},
{'type' => 'raw', 'text' => $_ };
}
+ close (VERBINCLUDE);
}
} else {
$self->line_error (sprintf($self->__("address@hidden: Cannot find %s"),
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- Texinfo/Convert/HTML.pm 5 Jun 2011 10:01:35 -0000 1.83
+++ Texinfo/Convert/HTML.pm 5 Jun 2011 14:03:48 -0000 1.84
@@ -937,6 +937,11 @@
'itemx' => [[]],
);
+foreach my $explained_command (keys(%explained_commands)) {
+ $default_commands_args{$explained_command}
+ = [['normal'], ['string', 'normal']];
+}
+
# Default for the function references used for the formatting
# of commands.
my %default_commands_conversion;
@@ -1208,6 +1213,44 @@
$default_commands_conversion{'email'} = \&_convert_email_command;
+sub _convert_explained_command($$$$)
+{
+ my $self = shift;
+ my $cmdname = shift;
+ my $command = shift;
+ my $args = shift;
+
+ my $with_explanation;
+ my $explanation_string;
+ if ($args->[1] and defined($args->[1]->{'string'})
+ and $args->[1]->{'string'} =~ /\S/) {
+ $with_explanation = 1;
+ $explanation_string = $args->[1]->{'string'};
+ }
+ if ($command->{'extra'}->{'explanation_contents'}) {
+ $explanation_string = $self->convert_tree({'type' => '_string',
+ 'contents' => $command->{'extra'}->{'explanation_contents'}});
+ }
+ my $opening;
+ if (defined($explanation_string)) {
+ $opening = "<$cmdname title=\"$explanation_string\">";
+ } else {
+ $opening = "<$cmdname>";
+ }
+ if ($with_explanation) {
+ return $self->convert_tree ($self->gdt('{explained_string}
({explanation})',
+ {'explained_string' => {'type' => '_converted',
+ 'text' => $opening.$args->[0]->{'normal'}."</$cmdname>"},
+ 'explanation' => $args->[1]->{'tree'} }));
+ } else {
+ return $opening.$args->[0]->{'normal'}."</$cmdname>";
+ }
+}
+foreach my $explained_command (keys(%explained_commands)) {
+ $default_commands_conversion{$explained_command}
+ = \&_convert_explained_command;
+}
+
sub _convert_anchor_command($$$$)
{
my $self = shift;
@@ -1290,9 +1333,10 @@
my $text_arg = shift @args;
my $replacement_arg = shift @args;
- my $url = $url_arg->{'codestring'} if defined($url_arg);
- my $text = $text_arg->{'normal'} if defined($text_arg);
- my $replacement = $replacement_arg->{'normal'} if defined($replacement_arg);
+ my ($url, $text, $replacement);
+ $url = $url_arg->{'codestring'} if defined($url_arg);
+ $text = $text_arg->{'normal'} if defined($text_arg);
+ $replacement = $replacement_arg->{'normal'} if defined($replacement_arg);
$text = $replacement if (defined($replacement) and $replacement ne '');
$text = $url if (!defined($text) or $text eq '');
@@ -4430,7 +4474,8 @@
my $node_top;
$node_top = $self->{'labels'}->{'Top'} if ($self->{'labels'});
- my $section_top = $self->{'extra'}->{'top'} if ($self->{'extra'});
+ my $section_top;
+ $section_top = $self->{'extra'}->{'top'} if ($self->{'extra'});
if ($section_top) {
$self->{'global_target_elements'}->{'Top'} = $section_top->{'parent'};
} elsif ($node_top) {
@@ -4758,7 +4803,8 @@
if (!$self->{'structuring'} or
!$self->{'structuring'}->{'sectioning_root'});
my $section_root = $self->{'structuring'}->{'sectioning_root'};
- my $contents = 1 if ($cmdname eq 'contents');
+ my $contents;
+ $contents = 1 if ($cmdname eq 'contents');
my $root_level = $section_root->{'section_childs'}->[0]->{'level'};
foreach my $top_section(@{$section_root->{'section_childs'}}) {
@@ -5398,6 +5444,7 @@
$output .= _output_text($self->_convert($root), $fh);
}
$output .= _output_text(&{$self->{'end_file'}}($self), $fh);
+ return $output if ($self->get_conf('OUTFILE') eq '');
} else {
# output with pages
my %files;
@@ -5504,7 +5551,8 @@
return $text if ($self->in_preformatted());
- my $in_w = 1 if ($self->in_space_protected());
+ my $in_w;
+ $in_w = 1 if ($self->in_space_protected());
if ($in_w or $self->in_code()
and $self->get_conf('allowcodebreaks') eq 'false') {
Index: t/results/coverage_braces/abbr_acronym.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage_braces/abbr_acronym.pl 6 Mar 2011 14:44:00 -0000
1.5
+++ t/results/coverage_braces/abbr_acronym.pl 5 Jun 2011 14:03:48 -0000
1.6
@@ -41,7 +41,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => '_002d_002da'
},
'line_nr' => {
'file_name' => '',
@@ -75,7 +76,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => '_002d_002da'
},
'line_nr' => {
'file_name' => '',
@@ -153,7 +156,8 @@
{},
{}
]
- ]
+ ],
+ 'normalized' => '_002d_002da'
},
'line_nr' => {
'file_name' => '',
@@ -290,7 +294,8 @@
{},
{}
]
- ]
+ ],
+ 'normalized' => '_00c9_002d_002da_002e-_002cA_002e'
},
'line_nr' => {},
'parent' => {}
@@ -349,7 +354,9 @@
{},
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => '_00c9_002d_002da_002e-_002cA_002e'
},
'line_nr' => {
'file_name' => '',
@@ -381,6 +388,7 @@
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[2];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[2]{'extra'}{'explanation_contents'}
=
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'abbr_acronym'}{'contents'}[0];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'abbr_acronym'}{'contents'}[0];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -440,6 +448,7 @@
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][1]
=
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][2]
=
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][3]
=
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3];
+$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'explanation_contents'}
=
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'parent'} =
$result_trees{'abbr_acronym'}{'contents'}[0];
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[9]{'parent'} =
$result_trees{'abbr_acronym'}{'contents'}[0];
$result_trees{'abbr_acronym'}{'contents'}[0]{'parent'} =
$result_trees{'abbr_acronym'};
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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/coverage_braces/too_much_args.pl 6 Mar 2011 14:44:01 -0000
1.18
+++ t/results/coverage_braces/too_much_args.pl 5 Jun 2011 14:03:48 -0000
1.19
@@ -45,7 +45,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'AZE'
},
'line_nr' => {
'file_name' => '',
Index: t/results/menu/formats_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/menu/formats_in_menu.pl 4 Jun 2011 08:11:46 -0000 1.8
+++ t/results/menu/formats_in_menu.pl 5 Jun 2011 14:03:48 -0000 1.9
@@ -505,7 +505,8 @@
{},
{}
]
- ]
+ ],
+ 'normalized' => 'description-_002a-acronym_003a_003a'
},
'line_nr' => {
'file_name' => '',
Index: t/results/plaintext_tests/at_commands_glued_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/plaintext_tests/at_commands_glued_in_example.pl 4 Jun 2011
08:11:48 -0000 1.3
+++ t/results/plaintext_tests/at_commands_glued_in_example.pl 5 Jun 2011
14:03:48 -0000 1.4
@@ -126,7 +126,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'ABC'
},
'line_nr' => {
'file_name' => '',
@@ -164,7 +165,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'ABC'
},
'line_nr' => {
'file_name' => '',
@@ -621,6 +624,7 @@
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0];
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13];
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'parent'}
= $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[14]{'parent'}
= $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[15]{'parent'}
= $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1];
Index: t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 4 Jun 2011
08:11:48 -0000 1.3
+++ t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 5 Jun 2011
14:03:48 -0000 1.4
@@ -114,7 +114,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'ABC'
},
'line_nr' => {
'file_name' => '',
@@ -152,7 +153,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'ABC'
},
'line_nr' => {
'file_name' => '',
@@ -562,6 +565,7 @@
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'args'}[0];
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13];
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'parent'}
= $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0];
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[14]{'parent'}
= $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0];
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[15]{'parent'}
= $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0];
Index: t/results/sectioning/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- t/results/sectioning/at_commands_in_refs.pl 4 Jun 2011 08:11:51 -0000
1.39
+++ t/results/sectioning/at_commands_in_refs.pl 5 Jun 2011 14:03:48 -0000
1.40
@@ -2225,7 +2225,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'AAA'
},
'line_nr' => {
'file_name' => '',
@@ -2258,7 +2259,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'AAA'
},
'line_nr' => {},
'parent' => {}
@@ -2287,7 +2290,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'BBB'
},
'line_nr' => {},
'parent' => {}
@@ -2376,7 +2380,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'CCC'
},
'line_nr' => {
'file_name' => '',
@@ -2409,7 +2414,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'CCC'
},
'line_nr' => {},
'parent' => {}
@@ -2438,7 +2445,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'DDD'
},
'line_nr' => {},
'parent' => {}
@@ -7993,7 +8001,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'AAA'
},
'line_nr' => {
'file_name' => '',
@@ -8026,7 +8035,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'AAA'
},
'line_nr' => {},
'parent' => {}
@@ -8055,7 +8066,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'BBB'
},
'line_nr' => {},
'parent' => {}
@@ -8141,7 +8153,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'AAA'
},
'line_nr' => {
'file_name' => '',
@@ -8174,7 +8187,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'AAA'
},
'line_nr' => {},
'parent' => {}
@@ -8203,7 +8218,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'BBB'
},
'line_nr' => {},
'parent' => {}
@@ -8291,7 +8307,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'CCC'
},
'line_nr' => {
'file_name' => '',
@@ -8324,7 +8341,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'CCC'
},
'line_nr' => {},
'parent' => {}
@@ -8353,7 +8372,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'DDD'
},
'line_nr' => {},
'parent' => {}
@@ -8439,7 +8459,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'CCC'
},
'line_nr' => {
'file_name' => '',
@@ -8472,7 +8493,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'CCC'
},
'line_nr' => {},
'parent' => {}
@@ -8501,7 +8524,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'DDD'
},
'line_nr' => {},
'parent' => {}
@@ -13251,7 +13275,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'AAA'
},
'line_nr' => {
'file_name' => '',
@@ -13284,7 +13309,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'AAA'
},
'line_nr' => {},
'parent' => {}
@@ -13313,7 +13340,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'BBB'
},
'line_nr' => {},
'parent' => {}
@@ -13396,7 +13424,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'CCC'
},
'line_nr' => {
'file_name' => '',
@@ -13429,7 +13458,9 @@
[
{}
]
- ]
+ ],
+ 'explanation_contents' => [],
+ 'normalized' => 'CCC'
},
'line_nr' => {},
'parent' => {}
@@ -13458,7 +13489,8 @@
[
{}
]
- ]
+ ],
+ 'normalized' => 'DDD'
},
'line_nr' => {},
'parent' => {}
@@ -15322,6 +15354,7 @@
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2];
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'line_nr'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
@@ -15354,6 +15387,7 @@
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2];
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2]{'line_nr'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1];
@@ -16697,6 +16731,7 @@
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3];
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'line_nr'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
@@ -16728,6 +16763,7 @@
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3];
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'line_nr'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
@@ -16759,6 +16795,7 @@
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3];
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3]{'line_nr'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0];
@@ -16790,6 +16827,7 @@
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3];
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3]{'line_nr'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'at_commands_in_refs'}{'contents'}[32]{'args'}[0];
@@ -18024,6 +18062,7 @@
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2];
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'line_nr'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[16]{'args'}[0];
@@ -18058,6 +18097,7 @@
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2];
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'line_nr'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'at_commands_in_refs'}{'contents'}[50]{'contents'}[7]{'contents'}[18]{'args'}[0];