By default, etags produces unqualified Perl tag names

* lib-src/etags.c (Perl_functions): Produce unqualified names,
unless -Q was specified.
(print_help): Update the description of -Q.

* doc/man/etags.1: Update the documentation of -Q.

* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/CTAGS.good: Adapt the expected test results to the
changed Perl functionality.

diff --git a/doc/man/etags.1 b/doc/man/etags.1
index fc247f758a30b6ac859d6000cc6f4330e0c60b9e..83b970f906cf023a7ac1d2bd5d9ccb1d8726df21 100644 (file)
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -145,10 +145,10 @@ May be used (only once) in place of a file name on the command line.
 \fBetags\fP will read from standard input and mark the produced tags
 as belonging to the file \fBFILE\fP.
 .TP
-\fB\-\-class\-qualify\fP
-Qualify tag names with their class name in C++, ObjC, and Java.
+\fB \-Q, \-\-class\-qualify\fP
+Qualify tag names with their class name in C++, ObjC, Java, and Perl.
 This produces tag names of the form \fIclass\fP\fB::\fP\fImember\fP
-for C++,
+for C++ and Perl,
 \fIclass\fP\fB(\fP\fIcategory\fP\fB)\fP for Objective C, and \fIclass\fP\fB.\fP\fImember\fP for Java.
 For Objective C, this also produces class methods qualified with
 their arguments, as in \fIfoo\fP\fB:\fP\fIbar\fP\fB:\fP\fIbaz\fP\fB:\fP\fImore\fP.

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 182cb4cc876e468c1214f40dfa03ada004206c07..e8e1576960632702f3272af4274aabdadc7413b7 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -971,11 +971,12 @@ Relative ones are stored relative to the output file's directory.\n");
        in some languages.");
 
   puts ("-Q, --class-qualify\n\
-        Qualify tag names with their class name in C++, ObjC, and Java.\n\
+        Qualify tag names with their class name in C++, ObjC, Java, and Perl.\n\
         This produces tag names of the form \"class::member\" for C++,\n\
         \"class(category)\" for Objective C, and \"class.member\" for Java.\n\
         For Objective C, this also produces class methods qualified with\n\
-        their arguments, as in \"foo:bar:baz:more\".");
+        their arguments, as in \"foo:bar:baz:more\".\n\
+        For Perl, this produces \"package::member\".");
   puts ("-r REGEXP, --regex=REGEXP or --regex=@regexfile\n\
         Make a tag for each line matching a regular expression pattern\n\
        in the following files.  {LANGUAGE}REGEXP uses REGEXP for LANGUAGE\n\
@@ -4534,10 +4535,21 @@ Perl_functions (FILE *inf)
            continue;           /* nothing found */
          pos = strchr (sp, ':');
          if (pos && pos < cp && pos[1] == ':')
-           /* The name is already qualified. */
-           make_tag (sp, cp - sp, true,
-                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
-         else
+           {
+             /* The name is already qualified. */
+             if (!class_qualify)
+               {
+                 char *q = pos + 2, *qpos;
+                 while ((qpos = strchr (q, ':')) != NULL
+                        && qpos < cp
+                        && qpos[1] == ':')
+                   q = qpos + 2;
+                 sp = q;
+               }
+             make_tag (sp, cp - sp, true,
+                       lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
+           }
+         else if (class_qualify)
            /* Qualify it. */
            {
              char savechar, *name;
@@ -4550,6 +4562,9 @@ Perl_functions (FILE *inf)
                        lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
              free (name);
            }
+         else
+           make_tag (sp, cp - sp, true,
+                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
        }
       else if (LOOKING_AT (cp, "use constant")
               || LOOKING_AT (cp, "use constant::defer"))

diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good
index ebde715272aa945c9ebdb308c6ee3f41d86c85ab..19bc0bef6576bb0bbd2de0d890dcd8556acd1a8a 100644 (file)
--- a/test/etags/CTAGS.good
+++ b/test/etags/CTAGS.good
@@ -305,8 +305,6 @@ BUFFER_OBJFWDP      c-src/emacs/src/lisp.h  /^BUFFER_OBJFWDP (union Lisp_Fwd *a)$/
 BYTE_MARK_STACK        c-src/emacs/src/lisp.h  3181
 Bar    lua-src/test.lua        /^function Square.something:Bar ()$/
 Bar    perl-src/kai-test.pl    /^package Bar;$/
-Bar::f4        perl-src/kai-test.pl    /^sub Bar::f4 {$/
-Bar::f5        perl-src/kai-test.pl    /^sub f5 {$/
 Barrier_Function_Pointer/t     ada-src/etags-test-for.ada      /^   type Barrier_Function_Pointer is access$/
 Bidule/b       ada-src/etags-test-for.ada      /^  protected body Bidule is$/
 Bidule/b       ada-src/waroquiers.ada  /^  protected body Bidule is$/
@@ -614,8 +612,6 @@ Finalize_TAS_Cell/p ada-src/2ataspri.ads    /^   procedure Finalize_TAS_Cell   (Cel
 First100Chars  pas-src/common.pas      /^procedure First100Chars; (*($/
 Foo    perl-src/kai-test.pl    /^package Foo;$/
 Foo::Bar       perl-src/kai-test.pl    /^package Foo::Bar;$/
-Foo::Bar::f6   perl-src/kai-test.pl    /^sub f6 {$/
-Foo::f3        perl-src/kai-test.pl    /^sub f3 {$/
 Forth_help     c-src/etags.c   573
 Forth_suffixes c-src/etags.c   571
 Forth_words    c-src/etags.c   /^Forth_words (FILE *inf)$/
@@ -2931,7 +2927,14 @@ f        cp-src/c.C      /^     void f() {}$/
 f      cp-src/fail.C   /^              int f() { return 5; }$/
 f      cp-src/fail.C   /^int A::B::f() { return 2; }$/
 f1     c.c     /^     f1 () { \/* Do something. *\/; }$/
+f1     perl-src/kai-test.pl    /^sub f1 {$/
 f2     c.c     /^void f2 () { \/* Do something. *\/; }$/
+f2     perl-src/kai-test.pl    /^sub main::f2 {$/
+f3     perl-src/kai-test.pl    /^sub f3 {$/
+f4     perl-src/kai-test.pl    /^sub Bar::f4 {$/
+f5     perl-src/kai-test.pl    /^sub f5 {$/
+f6     perl-src/kai-test.pl    /^sub f6 {$/
+f7     perl-src/kai-test.pl    /^sub f7 {$/
 fast_string_match_ignore_case  c-src/emacs/src/lisp.h  /^fast_string_match_ignore_case (Lisp_Object regexp,/
 fastctags      make-src/Makefile       /^fastctags:$/
 fastetags      make-src/Makefile       /^fastetags:$/
@@ -2952,6 +2955,7 @@ fignore   c-src/etags.c   2416
 file-of-tag    el-src/emacs/lisp/progmodes/etags.el    /^(defun file-of-tag (&optional relative)$/
 file-of-tag-function   el-src/emacs/lisp/progmodes/etags.el    /^(defvar file-of-tag-function nil$/
 fileJoin       php-src/lce_functions.php       /^  function fileJoin()$/
+file_end       perl-src/htlmify-cystic /^sub file_end ()$/
 file_index     perl-src/htlmify-cystic 33
 file_tocs      perl-src/htlmify-cystic 30
 filename_is_absolute   c-src/etags.c   /^filename_is_absolute (char *fn)$/
@@ -2978,6 +2982,10 @@ find-tag-tag-order       el-src/emacs/lisp/progmodes/etags.el    /^(defvar find-tag-tag-o
 find_entries   c-src/etags.c   /^find_entries (FILE *inf)$/
 find_user_signal_name  c-src/emacs/src/keyboard.c      /^find_user_signal_name (int sig)$/
 findcats       prol-src/natded.prolog  /^findcats([],Left,Left).$/
+finish_appendices      perl-src/htlmify-cystic /^sub finish_appendices ()$/
+finish_sections        perl-src/htlmify-cystic /^sub finish_sections ()$/
+finish_subsections     perl-src/htlmify-cystic /^sub finish_subsections ()$/
+finish_subsubsections  perl-src/htlmify-cystic /^sub finish_subsubsections ()$/
 finlist        c-src/etags.c   2414
 first  c-src/emacs/src/gmalloc.c       151
 fitchtreelist  prol-src/natded.prolog  /^fitchtreelist([]).$/
@@ -3085,6 +3093,7 @@ get_layer_by_name lua-src/allegro.lua     /^local function get_layer_by_name (sprite
 get_tag        c-src/etags.c   /^get_tag (register char *bp, char **namepp)$/
 get_word       c-src/tab.c     /^static char           *get_word(char **str, char delim)$/
 getcjmp        c-src/emacs/src/keyboard.c      147
+getopt perl-src/yagrip.pl      /^sub getopt {$/
 getopt.o       make-src/Makefile       /^getopt.o: emacs\/lib-src\/getopt.c$/
 getopt1.o      make-src/Makefile       /^getopt1.o: emacs\/lib-src\/getopt1.c$/
 getptys        objc-src/Subprocess.m   /^getptys (int *master, int *slave)$/
@@ -3419,23 +3428,6 @@ mach_reply_port  c-src/machsyscalls.h    /^SYSCALL (mach_reply_port, -26,$/
 mach_task_self c-src/machsyscalls.h    /^SYSCALL (mach_task_self, -28,$/
 mach_thread_self       c-src/machsyscalls.h    /^SYSCALL (mach_thread_self, -27,$/
 magic  c-src/emacs/src/gmalloc.c       1863
-main::f1       perl-src/kai-test.pl    /^sub f1 {$/
-main::f2       perl-src/kai-test.pl    /^sub main::f2 {$/
-main::f7       perl-src/kai-test.pl    /^sub f7 {$/
-main::file_end perl-src/htlmify-cystic /^sub file_end ()$/
-main::finish_appendices        perl-src/htlmify-cystic /^sub finish_appendices ()$/
-main::finish_sections  perl-src/htlmify-cystic /^sub finish_sections ()$/
-main::finish_subsections       perl-src/htlmify-cystic /^sub finish_subsections ()$/
-main::finish_subsubsections    perl-src/htlmify-cystic /^sub finish_subsubsections ()$/
-main::getopt   perl-src/yagrip.pl      /^sub getopt {$/
-main::read_toc perl-src/htlmify-cystic /^sub read_toc ()$/
-main::section_href     perl-src/htlmify-cystic /^sub section_href ($)$/
-main::section_name     perl-src/htlmify-cystic /^sub section_name ($)$/
-main::section_url      perl-src/htlmify-cystic /^sub section_url ()$/
-main::section_url_base perl-src/htlmify-cystic /^sub section_url_base ()$/
-main::section_url_name perl-src/htlmify-cystic /^sub section_url_name ()$/
-main::toc_line perl-src/htlmify-cystic /^sub toc_line ($)$/
-main::usage    perl-src/yagrip.pl      /^sub usage {$/
 maintaining.info       make-src/Makefile       /^maintaining.info: maintaining.texi$/
 make-abbrev-table      c-src/abbrev.c  /^DEFUN ("make-abbrev-table", Fmake_abbrev_table, Sm/
 make_C_tag     c-src/etags.c   /^make_C_tag (bool isfun)$/
@@ -3922,6 +3914,7 @@ read_key_sequence_cmd     c-src/emacs/src/keyboard.c      232
 read_key_sequence_remapped     c-src/emacs/src/keyboard.c      233
 read_key_sequence_vs   c-src/emacs/src/keyboard.c      /^read_key_sequence_vs (Lisp_Object prompt, Lisp_Obj/
 read_menu_command      c-src/emacs/src/keyboard.c      /^read_menu_command (void)$/
+read_toc       perl-src/htlmify-cystic /^sub read_toc ()$/
 readable_events        c-src/emacs/src/keyboard.c      /^readable_events (int flags)$/
 readline       c-src/etags.c   /^readline (linebuffer *lbp, FILE *stream)$/
 readline_internal      c-src/etags.c   /^readline_internal (linebuffer *lbp, register FILE /
@@ -4027,8 +4020,13 @@ scroll_bar_parts c-src/emacs/src/keyboard.c      5189
 sec=\relax     tex-src/texinfo.tex     /^\\let\\appendixsec=\\relax$/
 section        perl-src/htlmify-cystic 25
 section=\relax tex-src/texinfo.tex     /^\\let\\appendixsection=\\relax$/
+section_href   perl-src/htlmify-cystic /^sub section_href ($)$/
 section_name   perl-src/htlmify-cystic 12
+section_name   perl-src/htlmify-cystic /^sub section_name ($)$/
 section_toc    perl-src/htlmify-cystic 15
+section_url    perl-src/htlmify-cystic /^sub section_url ()$/
+section_url_base       perl-src/htlmify-cystic /^sub section_url_base ()$/
+section_url_name       perl-src/htlmify-cystic /^sub section_url_name ()$/
 select prol-src/natded.prolog  /^select(X,[X|Xs],Xs).$/
 select-tags-table      el-src/emacs/lisp/progmodes/etags.el    /^(defun select-tags-table ()$/
 select-tags-table-mode el-src/emacs/lisp/progmodes/etags.el    /^(define-derived-mode select-tags-table-mode specia/
@@ -4324,6 +4322,7 @@ timers_run        c-src/emacs/src/keyboard.c      320
 tinbody        c-src/etags.c   2431
 tkeyseen       c-src/etags.c   2429
 tnone  c-src/etags.c   2428
+toc_line       perl-src/htlmify-cystic /^sub toc_line ($)$/
 toggleDescription      objc-src/PackInsp.m     /^-toggleDescription$/
 tok    c-src/etags.c   2491
 token  c-src/etags.c   2508
@@ -4396,6 +4395,7 @@ unsignedp cccp.y  113
 unsignedp      y-src/cccp.y    112
 uprintmax_t    c-src/emacs/src/lisp.h  149
 uprintmax_t    c-src/emacs/src/lisp.h  154
+usage  perl-src/yagrip.pl      /^sub usage {$/
 usecharno      c-src/etags.c   210
 used   c-src/emacs/src/regex.h 347
 used_syntax    c-src/emacs/src/regex.h 398

diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1
index d2550863428add2c1f15f16df08dbe940f5f8e69..58661bbf600b839531b9cb73cbaa734098ad596e 100644 (file)
--- a/test/etags/ETAGS.good_1
+++ b/test/etags/ETAGS.good_1
@@ -2665,7 +2665,7 @@ define("TEST"\7fTEST\ 11,0
 test \7f4,26
 foo(\7f16,200
 \f
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;\7fsection_name\ 112,236
 my @appendix_name;\7fappendix_name\ 113,254
 my @section_toc;\7fsection_toc\ 115,274
@@ -2683,7 +2683,7 @@ my $output_file;\7foutput_file\ 135,556
 my $line;\7fline\ 137,574
 my $subsection_marker;\7fsubsection_marker\ 1161,3883
 my $new;\7fnew\ 1163,3907
-sub read_toc \7fmain::read_toc\ 1165,3917
+sub read_toc \7f165,3917
          my $entry \7fentry\ 1218,5621
          my $entry \7fentry\ 1234,6077
              my $entry \7fentry\ 1245,6351
@@ -2692,38 +2692,38 @@ sub read_toc \7fmain::read_toc\ 1165,3917
              my $entry \7fentry\ 1276,7204
          my $entry \7fentry\ 1281,7328
       my $entry \7fentry\ 1296,7698
-sub finish_subsubsections \7fmain::finish_subsubsections\ 1302,7805
-sub finish_subsections \7fmain::finish_subsections\ 1309,7987
-sub finish_sections \7fmain::finish_sections\ 1320,8310
-sub finish_appendices \7fmain::finish_appendices\ 1331,8599
-sub section_url_base \7fmain::section_url_base\ 1337,8724
-sub section_url_name \7fmain::section_url_name\ 1342,8922
-sub section_url \7fmain::section_url\ 1355,9284
+sub finish_subsubsections \7f302,7805
+sub finish_subsections \7f309,7987
+sub finish_sections \7f320,8310
+sub finish_appendices \7f331,8599
+sub section_url_base \7f337,8724
+sub section_url_name \7f342,8922
+sub section_url \7f355,9284
   my $name \7fname\ 1357,9336
-sub section_href \7fmain::section_href\ 1364,9452
-sub section_name \7fmain::section_name\ 1368,9551
-sub toc_line \7fmain::toc_line\ 1372,9655
-sub file_end \7fmain::file_end\ 1375,9750
+sub section_href \7f364,9452
+sub section_name \7f368,9551
+sub toc_line \7f372,9655
+sub file_end \7f375,9750
 \f
-perl-src/yagrip.pl,258
-sub getopt \7fmain::getopt\ 17,156
+perl-src/yagrip.pl,233
+sub getopt \7f7,156
        local($_,$flag,$opt,$f,$r,@temp)\7f($_,$flag,$opt,$f,$r,@temp\ 18,169
-sub usage \7fmain::usage\ 138,856
+sub usage \7f38,856
        local($prog,$_,@list)\7f($prog,$_,@list\ 139,868
        local($string,$flag,@string,@temp,@last)\7f($string,$flag,@string,@temp,@last\ 140,897
 \f
-perl-src/kai-test.pl,244
-sub f1 \7fmain::f1\ 12,16
-sub main::f2 \7f6,50
+perl-src/kai-test.pl,203
+sub f1 \7f2,16
+sub main::f2 \7ff2\ 16,50
 package Foo;\7f10,90
-sub f3 \7fFoo::f3\ 112,104
-sub Bar::f4 \7f16,138
+sub f3 \7f12,104
+sub Bar::f4 \7ff4\ 116,138
 package Bar;\7f20,177
-sub f5 \7fBar::f5\ 122,191
+sub f5 \7f22,191
 package Foo::Bar;\7f26,225
-sub f6 \7fFoo::Bar::f6\ 128,244
+sub f6 \7f28,244
 package main;\7f32,278
-sub f7 \7fmain::f7\ 134,293
+sub f7 \7f34,293
 \f
 ps-src/rfc1245.ps,2478
 /FMversion \7f12,311

diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2
index 9eb1d4297c863ab603d708163360dbcc65d83b53..ecfa7d19885a22a56624710db5a021a079f6b25e 100644 (file)
--- a/test/etags/ETAGS.good_2
+++ b/test/etags/ETAGS.good_2
@@ -3235,7 +3235,7 @@ define("TEST"\7fTEST\ 11,0
 test \7f4,26
 foo(\7f16,200
 \f
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;\7fsection_name\ 112,236
 my @appendix_name;\7fappendix_name\ 113,254
 my @section_toc;\7fsection_toc\ 115,274
@@ -3253,7 +3253,7 @@ my $output_file;\7foutput_file\ 135,556
 my $line;\7fline\ 137,574
 my $subsection_marker;\7fsubsection_marker\ 1161,3883
 my $new;\7fnew\ 1163,3907
-sub read_toc \7fmain::read_toc\ 1165,3917
+sub read_toc \7f165,3917
          my $entry \7fentry\ 1218,5621
          my $entry \7fentry\ 1234,6077
              my $entry \7fentry\ 1245,6351
@@ -3262,38 +3262,38 @@ sub read_toc \7fmain::read_toc\ 1165,3917
              my $entry \7fentry\ 1276,7204
          my $entry \7fentry\ 1281,7328
       my $entry \7fentry\ 1296,7698
-sub finish_subsubsections \7fmain::finish_subsubsections\ 1302,7805
-sub finish_subsections \7fmain::finish_subsections\ 1309,7987
-sub finish_sections \7fmain::finish_sections\ 1320,8310
-sub finish_appendices \7fmain::finish_appendices\ 1331,8599
-sub section_url_base \7fmain::section_url_base\ 1337,8724
-sub section_url_name \7fmain::section_url_name\ 1342,8922
-sub section_url \7fmain::section_url\ 1355,9284
+sub finish_subsubsections \7f302,7805
+sub finish_subsections \7f309,7987
+sub finish_sections \7f320,8310
+sub finish_appendices \7f331,8599
+sub section_url_base \7f337,8724
+sub section_url_name \7f342,8922
+sub section_url \7f355,9284
   my $name \7fname\ 1357,9336
-sub section_href \7fmain::section_href\ 1364,9452
-sub section_name \7fmain::section_name\ 1368,9551
-sub toc_line \7fmain::toc_line\ 1372,9655
-sub file_end \7fmain::file_end\ 1375,9750
+sub section_href \7f364,9452
+sub section_name \7f368,9551
+sub toc_line \7f372,9655
+sub file_end \7f375,9750
 \f
-perl-src/yagrip.pl,258
-sub getopt \7fmain::getopt\ 17,156
+perl-src/yagrip.pl,233
+sub getopt \7f7,156
        local($_,$flag,$opt,$f,$r,@temp)\7f($_,$flag,$opt,$f,$r,@temp\ 18,169
-sub usage \7fmain::usage\ 138,856
+sub usage \7f38,856
        local($prog,$_,@list)\7f($prog,$_,@list\ 139,868
        local($string,$flag,@string,@temp,@last)\7f($string,$flag,@string,@temp,@last\ 140,897
 \f
-perl-src/kai-test.pl,244
-sub f1 \7fmain::f1\ 12,16
-sub main::f2 \7f6,50
+perl-src/kai-test.pl,203
+sub f1 \7f2,16
+sub main::f2 \7ff2\ 16,50
 package Foo;\7f10,90
-sub f3 \7fFoo::f3\ 112,104
-sub Bar::f4 \7f16,138
+sub f3 \7f12,104
+sub Bar::f4 \7ff4\ 116,138
 package Bar;\7f20,177
-sub f5 \7fBar::f5\ 122,191
+sub f5 \7f22,191
 package Foo::Bar;\7f26,225
-sub f6 \7fFoo::Bar::f6\ 128,244
+sub f6 \7f28,244
 package main;\7f32,278
-sub f7 \7fmain::f7\ 134,293
+sub f7 \7f34,293
 \f
 ps-src/rfc1245.ps,2478
 /FMversion \7f12,311

diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3
index 1f5a34272e3dc7322018361a1e2cfbf1f1d9efde..5f84aa9a0c66ff43dae1b19fd18af266b6f486de 100644 (file)
--- a/test/etags/ETAGS.good_3
+++ b/test/etags/ETAGS.good_3
@@ -3012,7 +3012,7 @@ test \7f4,26
        var $test\7f12,176
 foo(\7f16,200
 \f
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;\7fsection_name\ 112,236
 my @appendix_name;\7fappendix_name\ 113,254
 my @section_toc;\7fsection_toc\ 115,274
@@ -3030,7 +3030,7 @@ my $output_file;\7foutput_file\ 135,556
 my $line;\7fline\ 137,574
 my $subsection_marker;\7fsubsection_marker\ 1161,3883
 my $new;\7fnew\ 1163,3907
-sub read_toc \7fmain::read_toc\ 1165,3917
+sub read_toc \7f165,3917
          my $entry \7fentry\ 1218,5621
          my $entry \7fentry\ 1234,6077
              my $entry \7fentry\ 1245,6351
@@ -3039,38 +3039,38 @@ sub read_toc \7fmain::read_toc\ 1165,3917
              my $entry \7fentry\ 1276,7204
          my $entry \7fentry\ 1281,7328
       my $entry \7fentry\ 1296,7698
-sub finish_subsubsections \7fmain::finish_subsubsections\ 1302,7805
-sub finish_subsections \7fmain::finish_subsections\ 1309,7987
-sub finish_sections \7fmain::finish_sections\ 1320,8310
-sub finish_appendices \7fmain::finish_appendices\ 1331,8599
-sub section_url_base \7fmain::section_url_base\ 1337,8724
-sub section_url_name \7fmain::section_url_name\ 1342,8922
-sub section_url \7fmain::section_url\ 1355,9284
+sub finish_subsubsections \7f302,7805
+sub finish_subsections \7f309,7987
+sub finish_sections \7f320,8310
+sub finish_appendices \7f331,8599
+sub section_url_base \7f337,8724
+sub section_url_name \7f342,8922
+sub section_url \7f355,9284
   my $name \7fname\ 1357,9336
-sub section_href \7fmain::section_href\ 1364,9452
-sub section_name \7fmain::section_name\ 1368,9551
-sub toc_line \7fmain::toc_line\ 1372,9655
-sub file_end \7fmain::file_end\ 1375,9750
+sub section_href \7f364,9452
+sub section_name \7f368,9551
+sub toc_line \7f372,9655
+sub file_end \7f375,9750
 \f
-perl-src/yagrip.pl,258
-sub getopt \7fmain::getopt\ 17,156
+perl-src/yagrip.pl,233
+sub getopt \7f7,156
        local($_,$flag,$opt,$f,$r,@temp)\7f($_,$flag,$opt,$f,$r,@temp\ 18,169
-sub usage \7fmain::usage\ 138,856
+sub usage \7f38,856
        local($prog,$_,@list)\7f($prog,$_,@list\ 139,868
        local($string,$flag,@string,@temp,@last)\7f($string,$flag,@string,@temp,@last\ 140,897
 \f
-perl-src/kai-test.pl,244
-sub f1 \7fmain::f1\ 12,16
-sub main::f2 \7f6,50
+perl-src/kai-test.pl,203
+sub f1 \7f2,16
+sub main::f2 \7ff2\ 16,50
 package Foo;\7f10,90
-sub f3 \7fFoo::f3\ 112,104
-sub Bar::f4 \7f16,138
+sub f3 \7f12,104
+sub Bar::f4 \7ff4\ 116,138
 package Bar;\7f20,177
-sub f5 \7fBar::f5\ 122,191
+sub f5 \7f22,191
 package Foo::Bar;\7f26,225
-sub f6 \7fFoo::Bar::f6\ 128,244
+sub f6 \7f28,244
 package main;\7f32,278
-sub f7 \7fmain::f7\ 134,293
+sub f7 \7f34,293
 \f
 ps-src/rfc1245.ps,2478
 /FMversion \7f12,311

diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4
index b8a3d9de6dbc0843c01a7736e2e2fe14038c7bcb..12e2a6549cf28bd6e3a37bb93f9f2f5215c38ce0 100644 (file)
--- a/test/etags/ETAGS.good_4
+++ b/test/etags/ETAGS.good_4
@@ -2829,7 +2829,7 @@ define("TEST"\7fTEST\ 11,0
 test \7f4,26
 foo(\7f16,200
 \f
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;\7fsection_name\ 112,236
 my @appendix_name;\7fappendix_name\ 113,254
 my @section_toc;\7fsection_toc\ 115,274
@@ -2847,7 +2847,7 @@ my $output_file;\7foutput_file\ 135,556
 my $line;\7fline\ 137,574
 my $subsection_marker;\7fsubsection_marker\ 1161,3883
 my $new;\7fnew\ 1163,3907
-sub read_toc \7fmain::read_toc\ 1165,3917
+sub read_toc \7f165,3917
          my $entry \7fentry\ 1218,5621
          my $entry \7fentry\ 1234,6077
              my $entry \7fentry\ 1245,6351
@@ -2856,38 +2856,38 @@ sub read_toc \7fmain::read_toc\ 1165,3917
              my $entry \7fentry\ 1276,7204
          my $entry \7fentry\ 1281,7328
       my $entry \7fentry\ 1296,7698
-sub finish_subsubsections \7fmain::finish_subsubsections\ 1302,7805
-sub finish_subsections \7fmain::finish_subsections\ 1309,7987
-sub finish_sections \7fmain::finish_sections\ 1320,8310
-sub finish_appendices \7fmain::finish_appendices\ 1331,8599
-sub section_url_base \7fmain::section_url_base\ 1337,8724
-sub section_url_name \7fmain::section_url_name\ 1342,8922
-sub section_url \7fmain::section_url\ 1355,9284
+sub finish_subsubsections \7f302,7805
+sub finish_subsections \7f309,7987
+sub finish_sections \7f320,8310
+sub finish_appendices \7f331,8599
+sub section_url_base \7f337,8724
+sub section_url_name \7f342,8922
+sub section_url \7f355,9284
   my $name \7fname\ 1357,9336
-sub section_href \7fmain::section_href\ 1364,9452
-sub section_name \7fmain::section_name\ 1368,9551
-sub toc_line \7fmain::toc_line\ 1372,9655
-sub file_end \7fmain::file_end\ 1375,9750
+sub section_href \7f364,9452
+sub section_name \7f368,9551
+sub toc_line \7f372,9655
+sub file_end \7f375,9750
 \f
-perl-src/yagrip.pl,258
-sub getopt \7fmain::getopt\ 17,156
+perl-src/yagrip.pl,233
+sub getopt \7f7,156
        local($_,$flag,$opt,$f,$r,@temp)\7f($_,$flag,$opt,$f,$r,@temp\ 18,169
-sub usage \7fmain::usage\ 138,856
+sub usage \7f38,856
        local($prog,$_,@list)\7f($prog,$_,@list\ 139,868
        local($string,$flag,@string,@temp,@last)\7f($string,$flag,@string,@temp,@last\ 140,897
 \f
-perl-src/kai-test.pl,244
-sub f1 \7fmain::f1\ 12,16
-sub main::f2 \7f6,50
+perl-src/kai-test.pl,203
+sub f1 \7f2,16
+sub main::f2 \7ff2\ 16,50
 package Foo;\7f10,90
-sub f3 \7fFoo::f3\ 112,104
-sub Bar::f4 \7f16,138
+sub f3 \7f12,104
+sub Bar::f4 \7ff4\ 116,138
 package Bar;\7f20,177
-sub f5 \7fBar::f5\ 122,191
+sub f5 \7f22,191
 package Foo::Bar;\7f26,225
-sub f6 \7fFoo::Bar::f6\ 128,244
+sub f6 \7f28,244
 package main;\7f32,278
-sub f7 \7fmain::f7\ 134,293
+sub f7 \7f34,293
 \f
 ps-src/rfc1245.ps,2478
 /FMversion \7f12,311

diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5
index 9e3b258eabcc4ddb3acfaacc8b760daeda2833fa..98de4f2c2fbeaf01f9f5b40188b31755e8c3d401 100644 (file)
--- a/test/etags/ETAGS.good_5
+++ b/test/etags/ETAGS.good_5
@@ -3746,7 +3746,7 @@ test \7f4,26
        var $test\7f12,176
 foo(\7f16,200
 \f
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;\7fsection_name\ 112,236
 my @appendix_name;\7fappendix_name\ 113,254
 my @section_toc;\7fsection_toc\ 115,274
@@ -3764,7 +3764,7 @@ my $output_file;\7foutput_file\ 135,556
 my $line;\7fline\ 137,574
 my $subsection_marker;\7fsubsection_marker\ 1161,3883
 my $new;\7fnew\ 1163,3907
-sub read_toc \7fmain::read_toc\ 1165,3917
+sub read_toc \7f165,3917
          my $entry \7fentry\ 1218,5621
          my $entry \7fentry\ 1234,6077
              my $entry \7fentry\ 1245,6351
@@ -3773,38 +3773,38 @@ sub read_toc \7fmain::read_toc\ 1165,3917
              my $entry \7fentry\ 1276,7204
          my $entry \7fentry\ 1281,7328
       my $entry \7fentry\ 1296,7698
-sub finish_subsubsections \7fmain::finish_subsubsections\ 1302,7805
-sub finish_subsections \7fmain::finish_subsections\ 1309,7987
-sub finish_sections \7fmain::finish_sections\ 1320,8310
-sub finish_appendices \7fmain::finish_appendices\ 1331,8599
-sub section_url_base \7fmain::section_url_base\ 1337,8724
-sub section_url_name \7fmain::section_url_name\ 1342,8922
-sub section_url \7fmain::section_url\ 1355,9284
+sub finish_subsubsections \7f302,7805
+sub finish_subsections \7f309,7987
+sub finish_sections \7f320,8310
+sub finish_appendices \7f331,8599
+sub section_url_base \7f337,8724
+sub section_url_name \7f342,8922
+sub section_url \7f355,9284
   my $name \7fname\ 1357,9336
-sub section_href \7fmain::section_href\ 1364,9452
-sub section_name \7fmain::section_name\ 1368,9551
-sub toc_line \7fmain::toc_line\ 1372,9655
-sub file_end \7fmain::file_end\ 1375,9750
+sub section_href \7f364,9452
+sub section_name \7f368,9551
+sub toc_line \7f372,9655
+sub file_end \7f375,9750
 \f
-perl-src/yagrip.pl,258
-sub getopt \7fmain::getopt\ 17,156
+perl-src/yagrip.pl,233
+sub getopt \7f7,156
        local($_,$flag,$opt,$f,$r,@temp)\7f($_,$flag,$opt,$f,$r,@temp\ 18,169
-sub usage \7fmain::usage\ 138,856
+sub usage \7f38,856
        local($prog,$_,@list)\7f($prog,$_,@list\ 139,868
        local($string,$flag,@string,@temp,@last)\7f($string,$flag,@string,@temp,@last\ 140,897
 \f
-perl-src/kai-test.pl,244
-sub f1 \7fmain::f1\ 12,16
-sub main::f2 \7f6,50
+perl-src/kai-test.pl,203
+sub f1 \7f2,16
+sub main::f2 \7ff2\ 16,50
 package Foo;\7f10,90
-sub f3 \7fFoo::f3\ 112,104
-sub Bar::f4 \7f16,138
+sub f3 \7f12,104
+sub Bar::f4 \7ff4\ 116,138
 package Bar;\7f20,177
-sub f5 \7fBar::f5\ 122,191
+sub f5 \7f22,191
 package Foo::Bar;\7f26,225
-sub f6 \7fFoo::Bar::f6\ 128,244
+sub f6 \7f28,244
 package main;\7f32,278
-sub f7 \7fmain::f7\ 134,293
+sub f7 \7f34,293
 \f
 ps-src/rfc1245.ps,2478
 /FMversion \7f12,311