[7514] always contents and parent for @value

[gavinsmith0123]

Revision: 7514
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7514
Author:   gavin
Date:     2016-11-17 19:35:06 +0000 (Thu, 17 Nov 2016)
Log Message:
-----------
always contents and parent for @value

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/Texinfo/Report.pm
    trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
    trunk/tp/t/results/converters_tests/unknown_value.pl
    trunk/tp/t/results/value/bad_syntax.pl
    trunk/tp/t/results/value/set_form_feed.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-11-17 18:47:42 UTC (rev 7513)
+++ trunk/ChangeLog     2016-11-17 19:35:06 UTC (rev 7514)
@@ -1,3 +1,10 @@
+2016-11-17  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_parse_texi): Supply 'contents' and 
+       'parent' for empty @value element.
+       * tp/Texinfo/Report.pm (_substitute_element_array): Add a case
+       for values not defined.
+
 2016-11-15  Gavin Smith  <address@hidden>
 
        * tp/t/test_brace_count.t: Disable some tests.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-11-17 18:47:42 UTC (rev 7513)
+++ trunk/tp/Texinfo/Parser.pm  2016-11-17 19:35:06 UTC (rev 7514)
@@ -4220,7 +4220,9 @@
               # caller should expand something along 
               # gdt('@{No value for `{value}\'@}', {'value' => $value}, 
{'keep_texi'=> 1});
               push @{$current->{'contents'}}, { 'cmdname' => 'value',
-                                                'type' => $value };
+                                                'type' => $value,
+                                                'contents' => [],
+                                                'parent' => $current };
               $self->line_warn(
                   sprintf($self->__("undefined flag: %s"), $value), $line_nr);
             }

Modified: trunk/tp/Texinfo/Report.pm
===================================================================
--- trunk/tp/Texinfo/Report.pm  2016-11-17 18:47:42 UTC (rev 7513)
+++ trunk/tp/Texinfo/Report.pm  2016-11-17 19:35:06 UTC (rev 7514)
@@ -417,9 +417,11 @@
       my $name = $_->{'type'};
       $name =~ s/^_//;
       if (ref($context->{$name}) eq 'HASH') {
-        ( $context->{$name} );
+        $context->{$name};
       } elsif (ref($context->{$name}) eq 'ARRAY') {
         @{$context->{$name}};
+      } else {
+        (); # undefined - shouldn't happen?
       }
     } else {
       _substitute($_, $context);

Modified: trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_raw.pl   2016-11-17 
18:47:42 UTC (rev 7513)
+++ trunk/tp/t/results/converters_tests/at_commands_in_raw.pl   2016-11-17 
19:35:06 UTC (rev 7514)
@@ -387,6 +387,8 @@
         },
         {
           'cmdname' => 'value',
+          'contents' => [],
+          'parent' => {},
           'type' => 'flag'
         },
         {
@@ -964,6 +966,7 @@
 $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[8]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];
 $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[9]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];
 $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[10]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[11]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];
 
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[12];
 $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[12]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];
 $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[13]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[1];

Modified: trunk/tp/t/results/converters_tests/unknown_value.pl
===================================================================
--- trunk/tp/t/results/converters_tests/unknown_value.pl        2016-11-17 
18:47:42 UTC (rev 7513)
+++ trunk/tp/t/results/converters_tests/unknown_value.pl        2016-11-17 
19:35:06 UTC (rev 7514)
@@ -9,11 +9,14 @@
   'contents' => [
     {
       'cmdname' => 'value',
+      'contents' => [],
+      'parent' => {},
       'type' => 'unknown'
     }
   ],
   'type' => 'text_root'
 };
+$result_trees{'unknown_value'}{'contents'}[0]{'parent'} = 
$result_trees{'unknown_value'};
 
 $result_texis{'unknown_value'} = '@value{unknown}';
 

Modified: trunk/tp/t/results/value/bad_syntax.pl
===================================================================
--- trunk/tp/t/results/value/bad_syntax.pl      2016-11-17 18:47:42 UTC (rev 
7513)
+++ trunk/tp/t/results/value/bad_syntax.pl      2016-11-17 19:35:06 UTC (rev 
7514)
@@ -116,6 +116,8 @@
     },
     {
       'cmdname' => 'value',
+      'contents' => [],
+      'parent' => {},
       'type' => 'unknown'
     },
     {
@@ -141,6 +143,7 @@
 $result_trees{'bad_syntax'}{'contents'}[12]{'contents'}[0]{'parent'} = 
$result_trees{'bad_syntax'}{'contents'}[12];
 $result_trees{'bad_syntax'}{'contents'}[12]{'parent'} = 
$result_trees{'bad_syntax'};
 $result_trees{'bad_syntax'}{'contents'}[13]{'parent'} = 
$result_trees{'bad_syntax'};
+$result_trees{'bad_syntax'}{'contents'}[14]{'parent'} = 
$result_trees{'bad_syntax'};
 $result_trees{'bad_syntax'}{'contents'}[15]{'parent'} = 
$result_trees{'bad_syntax'};
 
 $result_texis{'bad_syntax'} = '

Modified: trunk/tp/t/results/value/set_form_feed.pl
===================================================================
--- trunk/tp/t/results/value/set_form_feed.pl   2016-11-17 18:47:42 UTC (rev 
7513)
+++ trunk/tp/t/results/value/set_form_feed.pl   2016-11-17 19:35:06 UTC (rev 
7514)
@@ -81,6 +81,8 @@
                 },
                 {
                   'cmdname' => 'value',
+                  'contents' => [],
+                  'parent' => {},
                   'type' => 'hh'
                 },
                 {
@@ -122,6 +124,7 @@
 $result_trees{'set_form_feed'}{'contents'}[2]{'parent'} = 
$result_trees{'set_form_feed'};
 $result_trees{'set_form_feed'}{'contents'}[3]{'parent'} = 
$result_trees{'set_form_feed'};
 
$result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0];
 $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[4];