[7155] avoid undef label

[gavinsmith0123]

Revision: 7155
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7155
Author:   gavin
Date:     2016-05-08 14:50:13 +0000 (Sun, 08 May 2016)
Log Message:
-----------
avoid undef label

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Structuring.pm
    trunk/tp/t/results/info_tests/novalidate_empty_refs.pl
    trunk/tp/t/results/multitable/ref_in_multitable.pl
    trunk/tp/t/results/sectioning/novalidate.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-08 14:27:45 UTC (rev 7154)
+++ trunk/ChangeLog     2016-05-08 14:50:13 UTC (rev 7155)
@@ -1,5 +1,11 @@
 2016-05-08  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Structuring.pm (associate_internal_references): 
+       Avoid adding an undefined 'label' value under certain 
+       circumstances.
+
+2016-05-08  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_abort_empty_line): Remove a 
        'spaces_after_command' empty extra value, just as an empty
        'spaces_before_argument' value is removed.  This stops an 

Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm     2016-05-08 14:27:45 UTC (rev 7154)
+++ trunk/tp/Texinfo/Structuring.pm     2016-05-08 14:50:13 UTC (rev 7155)
@@ -1315,12 +1315,13 @@
   $refs = $self->internal_references_information() if (!defined($refs));
   return if (!defined($refs));
   foreach my $ref (@$refs) {
-    if (!defined($labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}})
-         and !$self->{'novalidate'}) {
-      $self->line_error(sprintf($self->__("address@hidden reference to 
nonexistent node `%s'"),
-              $ref->{'cmdname'}, 
-              node_extra_to_texi($ref->{'extra'}->{'node_argument'})), 
-                        $ref->{'line_nr'})
+    if (!defined($labels->{$ref->{'extra'}{'node_argument'}{'normalized'}})) {
+      if (!$self->{'novalidate'}) {
+        $self->line_error(sprintf($self->__("address@hidden reference to 
nonexistent node `%s'"),
+                $ref->{'cmdname'}, 
+                node_extra_to_texi($ref->{'extra'}->{'node_argument'})), 
+                          $ref->{'line_nr'})
+      }
     } else {
       my $node_target 
         = $labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}};

Modified: trunk/tp/t/results/info_tests/novalidate_empty_refs.pl
===================================================================
--- trunk/tp/t/results/info_tests/novalidate_empty_refs.pl      2016-05-08 
14:27:45 UTC (rev 7154)
+++ trunk/tp/t/results/info_tests/novalidate_empty_refs.pl      2016-05-08 
14:50:13 UTC (rev 7155)
@@ -100,7 +100,6 @@
                     {}
                   ]
                 ],
-                'label' => undef,
                 'node_argument' => {
                   'node_content' => [
                     {}
@@ -159,7 +158,6 @@
                     {}
                   ]
                 ],
-                'label' => undef,
                 'node_argument' => {
                   'node_content' => [
                     {}

Modified: trunk/tp/t/results/multitable/ref_in_multitable.pl
===================================================================
--- trunk/tp/t/results/multitable/ref_in_multitable.pl  2016-05-08 14:27:45 UTC 
(rev 7154)
+++ trunk/tp/t/results/multitable/ref_in_multitable.pl  2016-05-08 14:50:13 UTC 
(rev 7155)
@@ -59,7 +59,6 @@
                 {}
               ]
             ],
-            'label' => undef,
             'node_argument' => {
               'node_content' => [
                 {},
@@ -227,7 +226,6 @@
                                 {}
                               ]
                             ],
-                            'label' => undef,
                             'node_argument' => {
                               'node_content' => [
                                 {}
@@ -340,7 +338,6 @@
                                 {}
                               ]
                             ],
-                            'label' => undef,
                             'node_argument' => {
                               'node_content' => [
                                 {}
@@ -431,7 +428,6 @@
                                             {}
                                           ]
                                         ],
-                                        'label' => undef,
                                         'node_argument' => {
                                           'node_content' => [
                                             {},
@@ -609,7 +605,6 @@
                 {}
               ]
             ],
-            'label' => undef,
             'node_argument' => {
               'node_content' => [
                 {},

Modified: trunk/tp/t/results/sectioning/novalidate.pl
===================================================================
--- trunk/tp/t/results/sectioning/novalidate.pl 2016-05-08 14:27:45 UTC (rev 
7154)
+++ trunk/tp/t/results/sectioning/novalidate.pl 2016-05-08 14:50:13 UTC (rev 
7155)
@@ -243,7 +243,6 @@
                     {}
                   ]
                 ],
-                'label' => undef,
                 'node_argument' => {
                   'node_content' => [
                     {}