texinfo/tp TODO Texinfo/Parser.pm t/results/def...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/05 00:12:38

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm 
        tp/t/results/def: empty_def_arguments.pl 
        tp/t/results/indices: empty_index_entry.pl 

Log message:
        Warn for empty name for deffn even if it is an empty bracketed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.212&r2=1.213
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.330&r2=1.331
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_arguments.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_index_entry.pl?cvsroot=texinfo&r1=1.15&r2=1.16

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -b -r1.212 -r1.213
--- TODO        4 Nov 2011 19:02:26 -0000       1.212
+++ TODO        5 Nov 2011 00:12:37 -0000       1.213
@@ -13,12 +13,6 @@
 the subsection that is both below and next the section, because it is 
 next in menu.  Bug or not?
 
-Missing warnings in
-t/19def.t empty_def_arguments
-for 
address@hidden {} {}
address@hidden {}
-
 t/30sectioning.t setfilename_on_top_and_after_node
 there could be a warning
  warning: @setfilename after the first element

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -b -r1.330 -r1.331
--- Texinfo/Parser.pm   2 Nov 2011 20:46:37 -0000       1.330
+++ Texinfo/Parser.pm   5 Nov 2011 00:12:37 -0000       1.331
@@ -2055,7 +2055,7 @@
 }
 
 # definition line parsing
-sub _parse_def ($$$)
+sub _parse_def($$$)
 {
   my $self = shift;
   my $command = shift;
@@ -2112,7 +2112,7 @@
     #print STDERR " contents ->".Texinfo::Convert::Texinfo::convert 
({'contents' => address@hidden);
     my ($spaces, $next) = $self->_next_bracketed_or_word(address@hidden);
     last if (!defined($next));
-    #print STDERR "NEXT ".Texinfo::Convert::Texinfo::convert($next)."\n";
+    #print STDERR "NEXT[$arg] ".Texinfo::Convert::Texinfo::convert($next)."\n";
     push @result, ['spaces', $spaces] if (defined($spaces));
     push @result, [$arg, $next];
   }
@@ -2437,7 +2437,7 @@
     die "BUG: def_context $def_context "._print_current($current) 
       if ($def_context ne 'def');
     my $def_command = $current->{'parent'}->{'extra'}->{'def_command'};
-    my $arguments = $self->_parse_def ($def_command, 
+    my $arguments = $self->_parse_def($def_command, 
                                        $current->{'contents'});
     if (scalar(@$arguments)) {
       $current->{'parent'}->{'extra'}->{'def_args'} = $arguments;
@@ -2459,7 +2459,18 @@
       }
       $current->{'parent'}->{'extra'}->{'def_parsed_hash'} = $def_parsed_hash;
       # do an standard index entry tree
-      my $index_entry = $def_parsed_hash->{'name'};
+      my $index_entry;
+      if (defined($def_parsed_hash->{'name'})) {
+        $index_entry = $def_parsed_hash->{'name'}
+         # empty bracketed
+          unless ($def_parsed_hash->{'name'}->{'type'}
+                  and $def_parsed_hash->{'name'}->{'type'} eq 
'bracketed_def_content'
+                  and (!$def_parsed_hash->{'name'}->{'contents'}
+                       or 
(!scalar(@{$def_parsed_hash->{'name'}->{'contents'}}))
+                       or (scalar(@{$def_parsed_hash->{'name'}->{'contents'}}) 
== 1
+                          and 
defined($def_parsed_hash->{'name'}->{'contents'}->[0]->{'text'})
+                          and 
$def_parsed_hash->{'name'}->{'contents'}->[0]->{'text'} !~ /\S/)));
+      }
       if (defined($index_entry)) {
         my $index_contents_normalized;
         if ($def_parsed_hash->{'class'}) {

Index: t/results/def/empty_def_arguments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_arguments.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/def/empty_def_arguments.pl        29 Oct 2011 16:38:05 -0000      
1.29
+++ t/results/def/empty_def_arguments.pl        5 Nov 2011 00:12:37 -0000       
1.30
@@ -365,21 +365,6 @@
               'category' => {},
               'name' => {}
             },
-            'index_entry' => {
-              'command' => {},
-              'content' => [
-                {}
-              ],
-              'content_normalized' => [
-                {}
-              ],
-              'in_code' => 1,
-              'index_at_command' => 'deffnx',
-              'index_name' => 'fn',
-              'index_prefix' => 'f',
-              'key' => '',
-              'number' => 2
-            },
             'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
@@ -508,21 +493,6 @@
               'category' => {},
               'name' => {}
             },
-            'index_entry' => {
-              'command' => {},
-              'content' => [
-                {}
-              ],
-              'content_normalized' => [
-                {}
-              ],
-              'in_code' => 1,
-              'index_at_command' => 'deffnx',
-              'index_name' => 'fn',
-              'index_prefix' => 'f',
-              'key' => '',
-              'number' => 3
-            },
             'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
@@ -646,21 +616,6 @@
               'category' => {},
               'name' => {}
             },
-            'index_entry' => {
-              'command' => {},
-              'content' => [
-                {}
-              ],
-              'content_normalized' => [
-                {}
-              ],
-              'in_code' => 1,
-              'index_at_command' => 'deffnx',
-              'index_name' => 'fn',
-              'index_prefix' => 'f',
-              'key' => '',
-              'number' => 4
-            },
             'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
@@ -773,9 +728,6 @@
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[2][1]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[0][1];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[2][1];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'line_nr'} 
= 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'empty_def_arguments'}{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0];
@@ -799,9 +751,6 @@
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[0][1];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'line_nr'} 
= 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'empty_def_arguments'}{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
@@ -825,9 +774,6 @@
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[2][1]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[0][1];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[2][1];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'line_nr'} 
= 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'empty_def_arguments'}{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[9];
@@ -902,13 +848,13 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':5: Entry for index `fn\' outside of any node
+    'error_line' => ':5: warning: Missing name for @deffnx
 ',
     'file_name' => '',
     'line_nr' => 5,
     'macro' => '',
-    'text' => 'Entry for index `fn\' outside of any node',
-    'type' => 'error'
+    'text' => 'Missing name for @deffnx',
+    'type' => 'warning'
   },
   {
     'error_line' => ':6: warning: Missing name for @deffnx
@@ -920,13 +866,13 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':7: Entry for index `fn\' outside of any node
+    'error_line' => ':7: warning: Missing name for @deffnx
 ',
     'file_name' => '',
     'line_nr' => 7,
     'macro' => '',
-    'text' => 'Entry for index `fn\' outside of any node',
-    'type' => 'error'
+    'text' => 'Missing name for @deffnx',
+    'type' => 'warning'
   },
   {
     'error_line' => ':8: warning: Missing name for @deffnx
@@ -938,13 +884,13 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':9: Entry for index `fn\' outside of any node
+    'error_line' => ':9: warning: Missing name for @deffnx
 ',
     'file_name' => '',
     'line_nr' => 9,
     'macro' => '',
-    'text' => 'Entry for index `fn\' outside of any node',
-    'type' => 'error'
+    'text' => 'Missing name for @deffnx',
+    'type' => 'warning'
   }
 ];
 

Index: t/results/indices/empty_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/indices/empty_index_entry.pl      1 Nov 2011 12:26:01 -0000       
1.15
+++ t/results/indices/empty_index_entry.pl      5 Nov 2011 00:12:38 -0000       
1.16
@@ -128,22 +128,6 @@
                   'category' => {},
                   'name' => {}
                 },
-                'index_entry' => {
-                  'command' => {},
-                  'content' => [
-                    {}
-                  ],
-                  'content_normalized' => [
-                    {}
-                  ],
-                  'in_code' => 1,
-                  'index_at_command' => 'deffn',
-                  'index_name' => 'fn',
-                  'index_prefix' => 'f',
-                  'key' => '',
-                  'node' => {},
-                  'number' => 1
-                },
                 'original_def_cmdname' => 'deffn'
               },
               'line_nr' => {},
@@ -287,10 +271,6 @@
 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
-$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_index_entry'}{'contents'}[1];
 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
@@ -356,7 +336,17 @@
   }
 };
 
-$result_errors{'empty_index_entry'} = [];
+$result_errors{'empty_index_entry'} = [
+  {
+    'error_line' => ':3: warning: Missing name for @deffn
+',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
+    'text' => 'Missing name for @deffn',
+    'type' => 'warning'
+  }
+];