[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7557] _parse_def always bracket preprended text
|
From: |
gavinsmith0123 |
|
Subject: |
[7557] _parse_def always bracket preprended text |
|
Date: |
Mon, 19 Dec 2016 20:53:13 +0000 (UTC) |
Revision: 7557
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7557
Author: gavin
Date: 2016-12-19 20:53:13 +0000 (Mon, 19 Dec 2016)
Log Message:
-----------
_parse_def always bracket preprended text
Modified Paths:
--------------
trunk/tp/Texinfo/Common.pm
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/converters_tests/complex_nestings.pl
trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
trunk/tp/t/results/def/all_commands.pl
trunk/tp/t/results/def/all_commands_delimiters.pl
trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
trunk/tp/t/results/def/all_commands_printindex.pl
trunk/tp/t/results/def/def_defx_mismatch.pl
trunk/tp/t/results/def/empty_deftype.pl
trunk/tp/t/results/def/not_closed.pl
trunk/tp/t/results/indices/empty_string_index_entry.pl
trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
trunk/tp/t/results/preformatted/def_in_example.pl
trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm 2016-12-18 16:31:18 UTC (rev 7556)
+++ trunk/tp/Texinfo/Common.pm 2016-12-19 20:53:13 UTC (rev 7557)
@@ -697,13 +697,13 @@
# shortcuts
'defun', {'deffn' => gdt('Function')},
'defmac', {'deffn' => gdt('Macro')},
- 'defspec', {'deffn' => '{'.gdt('Special Form').'}'},
+ 'defspec', {'deffn' => gdt('Special Form')},
'defvar', {'defvr' => gdt('Variable')},
- 'defopt', {'defvr' => '{'.gdt('User Option').'}'},
+ 'defopt', {'defvr' => gdt('User Option')},
'deftypefun', {'deftypefn' => gdt('Function')},
'deftypevar', {'deftypevr' => gdt('Variable')},
- 'defivar', {'defcv' => '{'.gdt('Instance Variable').'}'},
- 'deftypeivar', {'deftypecv' => '{'.gdt('Instance Variable').'}'},
+ 'defivar', {'defcv' => gdt('Instance Variable')},
+ 'deftypeivar', {'deftypecv' => gdt('Instance Variable')},
'defmethod', {'defop' => gdt('Method')},
'deftypemethod', {'deftypeop' => gdt('Method')},
);
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-12-18 16:31:18 UTC (rev 7556)
+++ trunk/tp/Texinfo/Parser.pm 2016-12-19 20:53:13 UTC (rev 7557)
@@ -2357,26 +2357,13 @@
my $prepended = $def_map{$command}->{$real_command};
my @prepended_content;
- my $text;
- my $in_bracketed;
- if ($prepended =~ /^\{/) {
- $text = $prepended;
- $text =~ s/\{([^\}]+)\}/$1/;
- $in_bracketed = 1;
- } else {
- $text = $prepended;
+ my $tree = $self->gdt($prepended);
+ my $bracketed = { 'type' => 'bracketed' };
+ $bracketed->{'contents'} = $tree->{'contents'};
+ foreach my $content (@{$tree->{'contents'}}) {
+ $content->{'parent'} = $bracketed;
}
- my $tree = $self->gdt($text);
- if ($in_bracketed or @{$tree->{'contents'}} > 1) {
- my $bracketed = { 'type' => 'bracketed' };
- $bracketed->{'contents'} = $tree->{'contents'};
- foreach my $content (@{$tree->{'contents'}}) {
- $content->{'parent'} = $bracketed;
- }
- @prepended_content = ($bracketed);
- } else {
- @prepended_content = (@{$tree->{'contents'}});
- }
+ @prepended_content = ($bracketed);
push @prepended_content, { 'text' => ' ' };
unshift @contents, @prepended_content;
Modified: trunk/tp/t/results/converters_tests/complex_nestings.pl
===================================================================
--- trunk/tp/t/results/converters_tests/complex_nestings.pl 2016-12-18
16:31:18 UTC (rev 7556)
+++ trunk/tp/t/results/converters_tests/complex_nestings.pl 2016-12-19
20:53:13 UTC (rev 7557)
@@ -154,7 +154,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -274,7 +280,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -544,7 +556,13 @@
[
'category',
{
- 'text' => 'Variable'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Variable'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -660,7 +678,13 @@
[
'category',
{
- 'text' => 'Variable'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Variable'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -1256,6 +1280,7 @@
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1]
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[6][1]
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[8][1]
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5];
@@ -1273,6 +1298,7 @@
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
+$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_args'}[0][1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_args'}[2][1]
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_args'}[0][1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
@@ -1309,6 +1335,7 @@
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
@@ -1327,6 +1354,7 @@
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1];
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
@@ -1592,12 +1620,12 @@
<example endspaces=" ">
<pre xml:space="preserve">deffs
-</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">my def</indexterm><defcategory automatic="on">Function</defcategory>
<deffunction bracketed="on">my def</deffunction> <defparam>args</defparam>
<defparam><var>arg</var></defparam> <defparam>&dots;</defparam></definitionterm>
-<defunx spaces=" "><definitionterm><indexterm index="fn" number="2">other
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction
bracketed="on">other def</deffunction> <defparam>no</defparam>
<defparam>args</defparam></definitionterm></defunx>
+</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">my def</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deffunction bracketed="on">my
def</deffunction> <defparam>args</defparam> <defparam><var>arg</var></defparam>
<defparam>&dots;</defparam></definitionterm>
+<defunx spaces=" "><definitionterm><indexterm index="fn" number="2">other
def</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deffunction bracketed="on">other
def</deffunction> <defparam>no</defparam>
<defparam>args</defparam></definitionterm></defunx>
<definitionitem><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="3">name</indexterm><defcategory
bracketed="on">type</defcategory> <deffunction
bracketed="on">name</deffunction> <defparam>and</defparam>
<defparam>now</defparam> <defparam>the</defparam>
<defparam>args</defparam></definitionterm>
-<definitionitem><defvar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr" number="1">variables</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable
bracketed="on">variables</defvariable>
<defparam>variable-name</defparam></definitionterm>
+<definitionitem><defvar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr" number="1">variables</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <defvariable
bracketed="on">variables</defvariable>
<defparam>variable-name</defparam></definitionterm>
<pre xml:space="preserve">
-</pre><defvarx spaces=" "><definitionterm><indexterm index="vr"
number="2">variables too</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable bracketed="on">variables
too</defvariable> <defparam>other-variable</defparam></definitionterm></defvarx>
+</pre><defvarx spaces=" "><definitionterm><indexterm index="vr"
number="2">variables too</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <defvariable bracketed="on">variables
too</defvariable> <defparam>other-variable</defparam></definitionterm></defvarx>
<definitionitem><pre xml:space="preserve">THis is the defvar
A table within the def
Modified: trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
===================================================================
--- trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
2016-12-18 16:31:18 UTC (rev 7556)
+++ trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
2016-12-19 20:53:13 UTC (rev 7557)
@@ -125,7 +125,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -499,7 +505,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -833,6 +845,7 @@
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -896,6 +909,7 @@
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -1071,7 +1085,7 @@
<deftypefnnewline value="on" line=" on"></deftypefnnewline>
<node name="Top" spaces=" "><nodename>Top</nodename><nodeup
automatic="on">(dir)</nodeup></node>
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">name</indexterm><defcategory automatic="on">Function</defcategory>
<deftype>data-type</deftype> <deffunction>name</deffunction>
<defparamtype>arguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>data-type</deftype>
<deffunction>name</deffunction>
<defparamtype>arguments...</defparamtype></definitionterm>
<definitionitem><para>aaa
</para></definitionitem></deftypefun>
@@ -1081,7 +1095,7 @@
<deftypefnnewline value="off" line=" off"></deftypefnnewline>
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="3">name2</indexterm><defcategory automatic="on">Function</defcategory>
<deftype>data-type2</deftype> <deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="3">name2</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>data-type2</deftype>
<deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
<definitionitem><para>aaa2
</para></definitionitem></deftypefun>
Modified: trunk/tp/t/results/def/all_commands.pl
===================================================================
--- trunk/tp/t/results/def/all_commands.pl 2016-12-18 16:31:18 UTC (rev
7556)
+++ trunk/tp/t/results/def/all_commands.pl 2016-12-19 20:53:13 UTC (rev
7557)
@@ -1232,7 +1232,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -1394,7 +1400,13 @@
[
'category',
{
- 'text' => 'Macro'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Macro'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -1724,7 +1736,13 @@
[
'category',
{
- 'text' => 'Variable'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Variable'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -2028,7 +2046,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -2204,7 +2228,13 @@
[
'category',
{
- 'text' => 'Variable'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Variable'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -2735,7 +2765,13 @@
[
'category',
{
- 'text' => 'Method'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Method'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -2919,7 +2955,13 @@
[
'category',
{
- 'text' => 'Method'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Method'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -3280,6 +3322,7 @@
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[14]{'contents'}[0];
+$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands'}{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'all_commands'}{'contents'}[14]{'contents'}[0];
@@ -3306,6 +3349,7 @@
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[16]{'contents'}[0];
+$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands'}{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'all_commands'}{'contents'}[16]{'contents'}[0];
@@ -3359,6 +3403,7 @@
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[20]{'contents'}[0];
+$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'all_commands'}{'contents'}[20]{'contents'}[0];
@@ -3412,6 +3457,7 @@
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[24]{'contents'}[0];
+$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'all_commands'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -3439,6 +3485,7 @@
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[26]{'contents'}[0];
+$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'all_commands'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -3527,6 +3574,7 @@
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0];
+$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
@@ -3556,6 +3604,7 @@
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0];
+$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
Modified: trunk/tp/t/results/def/all_commands_delimiters.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters.pl 2016-12-18 16:31:18 UTC
(rev 7556)
+++ trunk/tp/t/results/def/all_commands_delimiters.pl 2016-12-19 20:53:13 UTC
(rev 7557)
@@ -8049,7 +8049,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -14745,6 +14751,7 @@
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0];
+$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'all_commands_delimiters'}{'contents'}[52]{'contents'}[0];
Modified: trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
2016-12-18 16:31:18 UTC (rev 7556)
+++ trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
2016-12-19 20:53:13 UTC (rev 7557)
@@ -8109,7 +8109,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -15146,6 +15152,7 @@
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0];
Modified: trunk/tp/t/results/def/all_commands_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_printindex.pl 2016-12-18 16:31:18 UTC
(rev 7556)
+++ trunk/tp/t/results/def/all_commands_printindex.pl 2016-12-19 20:53:13 UTC
(rev 7557)
@@ -1273,7 +1273,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -1436,7 +1442,13 @@
[
'category',
{
- 'text' => 'Macro'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Macro'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -1768,7 +1780,13 @@
[
'category',
{
- 'text' => 'Variable'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Variable'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -2074,7 +2092,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -2251,7 +2275,13 @@
[
'category',
{
- 'text' => 'Variable'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Variable'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -2785,7 +2815,13 @@
[
'category',
{
- 'text' => 'Method'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Method'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -2970,7 +3006,13 @@
[
'category',
{
- 'text' => 'Method'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Method'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -3633,6 +3675,7 @@
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
@@ -3660,6 +3703,7 @@
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
@@ -3715,6 +3759,7 @@
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
@@ -3770,6 +3815,7 @@
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -3798,6 +3844,7 @@
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[4][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -3889,6 +3936,7 @@
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
@@ -3919,6 +3967,7 @@
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
Modified: trunk/tp/t/results/def/def_defx_mismatch.pl
===================================================================
--- trunk/tp/t/results/def/def_defx_mismatch.pl 2016-12-18 16:31:18 UTC (rev
7556)
+++ trunk/tp/t/results/def/def_defx_mismatch.pl 2016-12-19 20:53:13 UTC (rev
7557)
@@ -91,7 +91,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -414,6 +420,7 @@
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
= $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
= $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0];
+$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]
=
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]
=
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1]
=
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
Modified: trunk/tp/t/results/def/empty_deftype.pl
===================================================================
--- trunk/tp/t/results/def/empty_deftype.pl 2016-12-18 16:31:18 UTC (rev
7556)
+++ trunk/tp/t/results/def/empty_deftype.pl 2016-12-19 20:53:13 UTC (rev
7557)
@@ -47,7 +47,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -257,7 +263,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -473,7 +485,13 @@
[
'category',
{
- 'text' => 'Method'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Method'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -705,7 +723,13 @@
[
'category',
{
- 'text' => 'Method'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Method'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -901,6 +925,7 @@
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]
=
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1];
@@ -930,6 +955,7 @@
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0];
+$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_deftype'}{'contents'}[2]{'contents'}[0];
@@ -958,6 +984,7 @@
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0];
+$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[4][1]
=
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -990,6 +1017,7 @@
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0];
+$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
=
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[4][1];
Modified: trunk/tp/t/results/def/not_closed.pl
===================================================================
--- trunk/tp/t/results/def/not_closed.pl 2016-12-18 16:31:18 UTC (rev
7556)
+++ trunk/tp/t/results/def/not_closed.pl 2016-12-19 20:53:13 UTC (rev
7557)
@@ -218,7 +218,13 @@
[
'category',
{
- 'text' => 'Variable'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Variable'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -337,6 +343,7 @@
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
Modified: trunk/tp/t/results/indices/empty_string_index_entry.pl
===================================================================
--- trunk/tp/t/results/indices/empty_string_index_entry.pl 2016-12-18
16:31:18 UTC (rev 7556)
+++ trunk/tp/t/results/indices/empty_string_index_entry.pl 2016-12-19
20:53:13 UTC (rev 7557)
@@ -361,7 +361,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -497,7 +503,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -754,6 +766,7 @@
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1]
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[4][1]
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[6][1]
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5];
@@ -779,6 +792,7 @@
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1]
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[4][1]
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[6][1]
=
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[5];
Modified: trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
===================================================================
--- trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
2016-12-18 16:31:18 UTC (rev 7556)
+++ trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
2016-12-19 20:53:13 UTC (rev 7557)
@@ -117,7 +117,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -206,7 +212,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -1113,6 +1125,7 @@
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0];
@@ -1124,6 +1137,7 @@
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_args'}[0][1];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_args'}[0][1];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_args'}[2][1];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
Modified:
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
===================================================================
---
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
2016-12-18 16:31:18 UTC (rev 7556)
+++
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
2016-12-19 20:53:13 UTC (rev 7557)
@@ -117,7 +117,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -206,7 +212,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -1085,6 +1097,7 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0];
@@ -1096,6 +1109,7 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_args'}[0][1];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_args'}[0][1];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_args'}[2][1];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
Modified: trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
===================================================================
--- trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
2016-12-18 16:31:18 UTC (rev 7556)
+++ trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
2016-12-19 20:53:13 UTC (rev 7557)
@@ -366,7 +366,13 @@
[
'category',
{
- 'text' => 'Variable'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Variable'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -605,6 +611,7 @@
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
Modified: trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2016-12-18
16:31:18 UTC (rev 7556)
+++ trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2016-12-19
20:53:13 UTC (rev 7557)
@@ -66,7 +66,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -204,6 +210,7 @@
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0];
+$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'def_in_style_command'}{'contents'}[1]{'contents'}[0];
Modified: trunk/tp/t/results/preformatted/def_in_example.pl
===================================================================
--- trunk/tp/t/results/preformatted/def_in_example.pl 2016-12-18 16:31:18 UTC
(rev 7556)
+++ trunk/tp/t/results/preformatted/def_in_example.pl 2016-12-19 20:53:13 UTC
(rev 7557)
@@ -49,7 +49,13 @@
[
'category',
{
- 'text' => 'Function'
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'type' => 'bracketed_def_content'
}
],
[
@@ -237,6 +243,7 @@
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
=
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -316,7 +323,7 @@
$result_converted{'xml'}->{'def_in_example'} = '<example endspaces=" ">
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">name</indexterm><defcategory automatic="on">Function</defcategory>
<deffunction>name</deffunction> <defparam>arg</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deffunction>name</deffunction>
<defparam>arg</defparam></definitionterm>
<definitionitem><pre xml:space="preserve">in defun
</pre></definitionitem></defun>
</example>
Modified: trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
2016-12-18 16:31:18 UTC (rev 7556)
+++ trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
2016-12-19 20:53:13 UTC (rev 7557)
@@ -1174,11 +1174,11 @@
<definitionitem><para>d&textndash;eftp
</para></definitionitem></deftp>
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="26">d--efun_name</indexterm><defcategory
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="26">d--efun_name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deffunction>d--efun_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efun
</para></definitionitem></defun>
-<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="27">d--efmac_name</indexterm><defcategory
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="27">d--efmac_name</indexterm><defcategory automatic="on"
bracketed="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efmac
</para></definitionitem></defmac>
@@ -1186,7 +1186,7 @@
<definitionitem><para>d&textndash;efspec
</para></definitionitem></defspec>
-<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="4">d--efvar_name</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable>
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="4">d--efvar_name</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable>
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
<definitionitem><para>d&textndash;efvar
</para></definitionitem></defvar>
@@ -1194,11 +1194,11 @@
<definitionitem><para>d&textndash;efopt
</para></definitionitem></defopt>
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="29">d--eftypefun_name</indexterm><defcategory
automatic="on">Function</defcategory> <deftype>t--ype</deftype>
<deffunction>d--eftypefun_name</deffunction>
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="29">d--eftypefun_name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>t--ype</deftype>
<deffunction>d--eftypefun_name</deffunction>
<defparamtype>a--rguments...</defparamtype></definitionterm>
<definitionitem><para>d&textndash;eftypefun
</para></definitionitem></deftypefun>
-<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="6">d--eftypevar_name</indexterm><defcategory
automatic="on">Variable</defcategory> <deftype>t--ype</deftype>
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="6">d--eftypevar_name</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <deftype>t--ype</deftype>
<defvariable>d--eftypevar_name</defvariable></definitionterm>
<definitionitem><para>d&textndash;eftypevar
</para></definitionitem></deftypevar>
@@ -1210,11 +1210,11 @@
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="30">d--efmethod_name on c--lass</indexterm><defcategory
automatic="on">Method</defcategory> <defclass>c--lass</defclass>
<defoperation>d--efmethod_name</defoperation>
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="30">d--efmethod_name on c--lass</indexterm><defcategory automatic="on"
bracketed="on">Method</defcategory> <defclass>c--lass</defclass>
<defoperation>d--efmethod_name</defoperation>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efmethod
</para></definitionitem></defmethod>
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="31">d--eftypemethod_name on c--lass</indexterm><defcategory
automatic="on">Method</defcategory> <defclass>c--lass</defclass>
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation>
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="31">d--eftypemethod_name on c--lass</indexterm><defcategory
automatic="on" bracketed="on">Method</defcategory> <defclass>c--lass</defclass>
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation>
<defparamtype>a--rguments...</defparamtype></definitionterm>
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
@@ -1774,11 +1774,11 @@
<definitionitem><para>d&textndash;eftp
</para></definitionitem></deftp>
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="59">d--efun_name</indexterm><defcategory
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="59">d--efun_name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deffunction>d--efun_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efun
</para></definitionitem></defun>
-<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="60">d--efmac_name</indexterm><defcategory
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="60">d--efmac_name</indexterm><defcategory automatic="on"
bracketed="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efmac
</para></definitionitem></defmac>
@@ -1786,7 +1786,7 @@
<definitionitem><para>d&textndash;efspec
</para></definitionitem></defspec>
-<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="14">d--efvar_name</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable>
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="14">d--efvar_name</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable>
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
<definitionitem><para>d&textndash;efvar
</para></definitionitem></defvar>
@@ -1794,11 +1794,11 @@
<definitionitem><para>d&textndash;efopt
</para></definitionitem></defopt>
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="62">d--eftypefun_name</indexterm><defcategory
automatic="on">Function</defcategory> <deftype>t--ype</deftype>
<deffunction>d--eftypefun_name</deffunction>
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="62">d--eftypefun_name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>t--ype</deftype>
<deffunction>d--eftypefun_name</deffunction>
<defparamtype>a--rguments...</defparamtype></definitionterm>
<definitionitem><para>d&textndash;eftypefun
</para></definitionitem></deftypefun>
-<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="16">d--eftypevar_name</indexterm><defcategory
automatic="on">Variable</defcategory> <deftype>t--ype</deftype>
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="16">d--eftypevar_name</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <deftype>t--ype</deftype>
<defvariable>d--eftypevar_name</defvariable></definitionterm>
<definitionitem><para>d&textndash;eftypevar
</para></definitionitem></deftypevar>
@@ -1810,11 +1810,11 @@
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="63">d--efmethod_name on c--lass</indexterm><defcategory
automatic="on">Method</defcategory> <defclass>c--lass</defclass>
<defoperation>d--efmethod_name</defoperation>
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="63">d--efmethod_name on c--lass</indexterm><defcategory automatic="on"
bracketed="on">Method</defcategory> <defclass>c--lass</defclass>
<defoperation>d--efmethod_name</defoperation>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efmethod
</para></definitionitem></defmethod>
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="64">d--eftypemethod_name on c--lass</indexterm><defcategory
automatic="on">Method</defcategory> <defclass>c--lass</defclass>
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation>
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="64">d--eftypemethod_name on c--lass</indexterm><defcategory
automatic="on" bracketed="on">Method</defcategory> <defclass>c--lass</defclass>
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation>
<defparamtype>a--rguments...</defparamtype></definitionterm>
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
@@ -2374,11 +2374,11 @@
<definitionitem><para>d&textndash;eftp
</para></definitionitem></deftp>
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="92">d--efun_name</indexterm><defcategory
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="92">d--efun_name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deffunction>d--efun_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efun
</para></definitionitem></defun>
-<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="93">d--efmac_name</indexterm><defcategory
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="93">d--efmac_name</indexterm><defcategory automatic="on"
bracketed="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efmac
</para></definitionitem></defmac>
@@ -2386,7 +2386,7 @@
<definitionitem><para>d&textndash;efspec
</para></definitionitem></defspec>
-<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="24">d--efvar_name</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable>
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="24">d--efvar_name</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable>
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
<definitionitem><para>d&textndash;efvar
</para></definitionitem></defvar>
@@ -2394,11 +2394,11 @@
<definitionitem><para>d&textndash;efopt
</para></definitionitem></defopt>
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="95">d--eftypefun_name</indexterm><defcategory
automatic="on">Function</defcategory> <deftype>t--ype</deftype>
<deffunction>d--eftypefun_name</deffunction>
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="95">d--eftypefun_name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>t--ype</deftype>
<deffunction>d--eftypefun_name</deffunction>
<defparamtype>a--rguments...</defparamtype></definitionterm>
<definitionitem><para>d&textndash;eftypefun
</para></definitionitem></deftypefun>
-<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="26">d--eftypevar_name</indexterm><defcategory
automatic="on">Variable</defcategory> <deftype>t--ype</deftype>
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="26">d--eftypevar_name</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <deftype>t--ype</deftype>
<defvariable>d--eftypevar_name</defvariable></definitionterm>
<definitionitem><para>d&textndash;eftypevar
</para></definitionitem></deftypevar>
@@ -2410,11 +2410,11 @@
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="96">d--efmethod_name on c--lass</indexterm><defcategory
automatic="on">Method</defcategory> <defclass>c--lass</defclass>
<defoperation>d--efmethod_name</defoperation>
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="96">d--efmethod_name on c--lass</indexterm><defcategory automatic="on"
bracketed="on">Method</defcategory> <defclass>c--lass</defclass>
<defoperation>d--efmethod_name</defoperation>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efmethod
</para></definitionitem></defmethod>
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="97">d--eftypemethod_name on c--lass</indexterm><defcategory
automatic="on">Method</defcategory> <defclass>c--lass</defclass>
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation>
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="97">d--eftypemethod_name on c--lass</indexterm><defcategory
automatic="on" bracketed="on">Method</defcategory> <defclass>c--lass</defclass>
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation>
<defparamtype>a--rguments...</defparamtype></definitionterm>
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
@@ -2968,11 +2968,11 @@
<definitionitem><pre xml:space="preserve">d--eftp
</pre></definitionitem></deftp>
<pre xml:space="preserve">
-</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="125">d--efun_name</indexterm><defcategory
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="125">d--efun_name</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deffunction>d--efun_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><pre xml:space="preserve">d--efun
</pre></definitionitem></defun>
<pre xml:space="preserve">
-</pre><defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="126">d--efmac_name</indexterm><defcategory
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="126">d--efmac_name</indexterm><defcategory automatic="on"
bracketed="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><pre xml:space="preserve">d--efmac
</pre></definitionitem></defmac>
<pre xml:space="preserve">
@@ -2980,7 +2980,7 @@
<definitionitem><pre xml:space="preserve">d--efspec
</pre></definitionitem></defspec>
<pre xml:space="preserve">
-</pre><defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="34">d--efvar_name</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable>
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+</pre><defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr"
number="34">d--efvar_name</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable>
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
<definitionitem><pre xml:space="preserve">d--efvar
</pre></definitionitem></defvar>
<pre xml:space="preserve">
@@ -2988,11 +2988,11 @@
<definitionitem><pre xml:space="preserve">d--efopt
</pre></definitionitem></defopt>
<pre xml:space="preserve">
-</pre><deftypefun spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="128">d--eftypefun_name</indexterm><defcategory
automatic="on">Function</defcategory> <deftype>t--ype</deftype>
<deffunction>d--eftypefun_name</deffunction>
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypefun spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="128">d--eftypefun_name</indexterm><defcategory
automatic="on" bracketed="on">Function</defcategory> <deftype>t--ype</deftype>
<deffunction>d--eftypefun_name</deffunction>
<defparamtype>a--rguments...</defparamtype></definitionterm>
<definitionitem><pre xml:space="preserve">d--eftypefun
</pre></definitionitem></deftypefun>
<pre xml:space="preserve">
-</pre><deftypevar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr" number="36">d--eftypevar_name</indexterm><defcategory
automatic="on">Variable</defcategory> <deftype>t--ype</deftype>
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+</pre><deftypevar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr" number="36">d--eftypevar_name</indexterm><defcategory automatic="on"
bracketed="on">Variable</defcategory> <deftype>t--ype</deftype>
<defvariable>d--eftypevar_name</defvariable></definitionterm>
<definitionitem><pre xml:space="preserve">d--eftypevar
</pre></definitionitem></deftypevar>
<pre xml:space="preserve">
@@ -3004,11 +3004,11 @@
<definitionitem><pre xml:space="preserve">d--eftypeivar
</pre></definitionitem></deftypeivar>
<pre xml:space="preserve">
-</pre><defmethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="129">d--efmethod_name on c--lass</indexterm><defcategory
automatic="on">Method</defcategory> <defclass>c--lass</defclass>
<defoperation>d--efmethod_name</defoperation>
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defmethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="129">d--efmethod_name on c--lass</indexterm><defcategory
automatic="on" bracketed="on">Method</defcategory> <defclass>c--lass</defclass>
<defoperation>d--efmethod_name</defoperation>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><pre xml:space="preserve">d--efmethod
</pre></definitionitem></defmethod>
<pre xml:space="preserve">
-</pre><deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="130">d--eftypemethod_name on c--lass</indexterm><defcategory
automatic="on">Method</defcategory> <defclass>c--lass</defclass>
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation>
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="130">d--eftypemethod_name on c--lass</indexterm><defcategory
automatic="on" bracketed="on">Method</defcategory> <defclass>c--lass</defclass>
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation>
<defparamtype>a--rguments...</defparamtype></definitionterm>
<definitionitem><pre xml:space="preserve">d--eftypemethod
</pre></definitionitem></deftypemethod>
<pre xml:space="preserve">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7557] _parse_def always bracket preprended text,
gavinsmith0123 <=