[7510] _count_opened_tree_braces don' t check for parentheses in args or contents

[gavinsmith0123]

Revision: 7510
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7510
Author:   gavin
Date:     2016-11-14 23:35:16 +0000 (Mon, 14 Nov 2016)
Log Message:
-----------
_count_opened_tree_braces don't check for parentheses in args or contents

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Common.pm
    trunk/tp/t/results/sectioning/node_nested_parentheses.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-11-13 19:35:32 UTC (rev 7509)
+++ trunk/ChangeLog     2016-11-14 23:35:16 UTC (rev 7510)
@@ -1,3 +1,11 @@
+2016-11-14  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Common.pm (_count_opened_tree_braces): Don't
+       check for parentheses in the arguments or contents when 
+       balancing parentheses.
+       (parse_node_manual): If parentheses do not balance, consider the 
+       whole argument to be the node name.
+
 2016-11-13  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_abort_empty_line): Include element type

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2016-11-13 19:35:32 UTC (rev 7509)
+++ trunk/tp/Texinfo/Common.pm  2016-11-14 23:35:16 UTC (rev 7510)
@@ -1390,18 +1390,6 @@
     ($before, $after, $braces_count) = _find_end_brace($current->{'text'},
                                                           $braces_count);
   }
-  if ($current->{'args'}) {
-    foreach my $arg (@{$current->{'args'}}) {
-      $braces_count = _count_opened_tree_braces($arg, $braces_count);
-      return $braces_count if ($braces_count == 0);
-    }
-  }
-  if ($current->{'contents'}) {
-    foreach my $content (@{$current->{'contents'}}) {
-      $braces_count = _count_opened_tree_braces($content, $braces_count);
-      return $braces_count if ($braces_count == 0);
-    }
-  }
   return $braces_count;
 }
 
@@ -1459,7 +1447,11 @@
         }
       }
     }
-    $result->{'manual_content'} = $manual if (defined($manual));
+    if ($braces_count == 0) {
+      $result->{'manual_content'} = $manual if (defined($manual));
+    } else {
+      @contents = @$manual;
+    }
   }
   if (@contents) {
     $result->{'node_content'} = address@hidden;

Modified: trunk/tp/t/results/sectioning/node_nested_parentheses.pl
===================================================================
--- trunk/tp/t/results/sectioning/node_nested_parentheses.pl    2016-11-13 
19:35:32 UTC (rev 7509)
+++ trunk/tp/t/results/sectioning/node_nested_parentheses.pl    2016-11-14 
23:35:16 UTC (rev 7510)
@@ -254,12 +254,15 @@
                 'menu_entry_description' => {},
                 'menu_entry_node' => {
                   'manual_content' => [
-                    {},
+                    {}
+                  ],
+                  'node_content' => [
                     {
                       'parent' => {},
-                      'text' => ') close'
+                      'text' => 'close)'
                     }
-                  ]
+                  ],
+                  'normalized' => 'close_0029'
                 }
               },
               'line_nr' => {},
@@ -335,13 +338,11 @@
               'extra' => {
                 'menu_entry_description' => {},
                 'menu_entry_node' => {
-                  'manual_content' => [
-                    {}
-                  ],
                   'node_content' => [
+                    {},
                     {}
                   ],
-                  'normalized' => '-error'
+                  'normalized' => '_0029_0029_0029-error'
                 }
               },
               'line_nr' => {},
@@ -468,7 +469,7 @@
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[1]{'parent'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
@@ -483,8 +484,8 @@
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'manual_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
@@ -585,7 +586,17 @@
   }
 };
 
-$result_errors{'node_nested_parentheses'} = [];
+$result_errors{'node_nested_parentheses'} = [
+  {
+    'error_line' => ':7: @menu reference to nonexistent node 
address@hidden)))} error\'
+',
+    'file_name' => '',
+    'line_nr' => 7,
+    'macro' => '',
+    'text' => '@menu reference to nonexistent node address@hidden)))} error\'',
+    'type' => 'error'
+  }
+];
 
 
 1;