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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/24 16:22:02

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm 
        tp/t/results/def: all_commands.pl empty_deftype.pl 

Log message:
        No need for braces for Function as a def category

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftype.pl?cvsroot=texinfo&r1=1.3&r2=1.4

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- TODO        24 Oct 2010 10:14:49 -0000      1.39
+++ TODO        24 Oct 2010 16:22:02 -0000      1.40
@@ -2,13 +2,7 @@
 top of the tree, not when it should be closed theoretically.
 Then it could be possible to come back to the place where the command
 should be closed and give an error message.
-
-Karl idea to keep the information on the exact location of the @mymacro:
-(pertusus had the same idea).
-here's a crazy idea that just popped into my head: what if we kept track
-of column numbers as well as line numbers?  Then whether the macro was
-involved would be a matter of checking if the column number was < or >
-the place where the error occurred.
+This is certainly only an issue for @footnote and similar not a general issue.
 
 Following should be an error:
 @example

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- Texinfo/Parser.pm   24 Oct 2010 15:08:47 -0000      1.103
+++ Texinfo/Parser.pm   24 Oct 2010 16:22:02 -0000      1.104
@@ -307,7 +307,7 @@
     'defspec', {'deffn' => '{Special Form}'},
     'defvar', {'defvr' => 'Variable'},
     'defopt', {'defvr' => '{User Option}'},
-    'deftypefun', {'deftypefn' => '{Function}'},
+    'deftypefun', {'deftypefn' => 'Function'},
     'deftypevar', {'deftypevr' => 'Variable'},
     'defivar', {'defcv' => '{Instance Variable}'},
     'deftypeivar', {'deftypecv' => '{Instance Variable}'},
@@ -323,6 +323,7 @@
   $misc_commands{$def_command.'x'} = 'line';
   $def_commands{$def_command} = 1;
   $def_commands{$def_command.'x'} = 1;
+
   # prepare what will be prepended when the def command is an alias
   if (ref($def_map{$def_command}) eq 'HASH') {
     my ($real_command) = keys (%{$def_map{$def_command}});
@@ -1037,9 +1038,6 @@
       # silently close containers and @-commands without brace nor @end
       $current = $current->{'parent'};
     }
-
-    # FIXME could there still be a paragraph to close?
-    #$current = _end_paragraph($self, $current, $line_nr);
   }
 
   if ($command and $current->{'cmdname'} 
@@ -2583,7 +2581,7 @@
                                       'contents' => [], 
                                       'parent' => $current } ];
               # @node is the only misc command with args separated with comma
-              # FIXME a 4 lingering here deep into the code may not
+              # FIXME a 3 lingering here deep into the code may not
               # be very wise...
               $current->{'remaining_args'} = 3 if ($command eq 'node');
               $current = $current->{'args'}->[-1];

Index: t/results/def/all_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/def/all_commands.pl       23 Oct 2010 20:22:25 -0000      1.3
+++ t/results/def/all_commands.pl       24 Oct 2010 16:22:02 -0000      1.4
@@ -1111,15 +1111,9 @@
               [
                 'category',
                 {
-                  'contents' => [
-                    {
-                      'parent' => {},
                       'text' => 'Function'
                     }
                   ],
-                  'type' => 'bracketed'
-                }
-              ],
               [
                 'spaces',
                 {
@@ -1805,7 +1799,6 @@
 
$result_trees{'all_commands'}{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[36]{'contents'}[0]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[36]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[36]{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[36]{'contents'}[0]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[36];
-$result_trees{'all_commands'}{'contents'}[36]{'contents'}[0]{'special'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[36]{'contents'}[0]{'special'}{'def_args'}[0][1];
 
$result_trees{'all_commands'}{'contents'}[36]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[36]{'contents'}[1];
 $result_trees{'all_commands'}{'contents'}[36]{'contents'}[1]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[36];
 $result_trees{'all_commands'}{'contents'}[36]{'parent'} = 
$result_trees{'all_commands'};

Index: t/results/def/empty_deftype.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_deftype.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/def/empty_deftype.pl      23 Oct 2010 20:22:25 -0000      1.3
+++ t/results/def/empty_deftype.pl      24 Oct 2010 16:22:02 -0000      1.4
@@ -35,15 +35,9 @@
               [
                 'category',
                 {
-                  'contents' => [
-                    {
-                      'parent' => {},
                       'text' => 'Function'
                     }
                   ],
-                  'type' => 'bracketed'
-                }
-              ],
               [
                 'spaces',
                 {
@@ -584,7 +578,6 @@
 
$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]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'special'}{'def_args'}[0][1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'special'}{'def_args'}[0][1];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'special'}{'def_args'}[2][1]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[1];
 $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];