Fix names of tags generated for Ruby accessors

* lib-src/etags.c (Ruby_functions): Don't include the leading
colon ':' in tags for Ruby accessors and aliases.  (Bug#22241)

* 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/ETAGS.good_6:
* test/etags/CTAGS.good: Adapt to changes in Ruby tags.

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 760685a6693296775595a11f3eb329edac7ca11c..ca6fe51bdb6d93ab6c738ecda4dcaa187fd5b652 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4721,6 +4721,8 @@ Ruby_functions (FILE *inf)
                  do {
                    char *np = cp;
 
+                   if (*np == ':')
+                     np++;
                    cp = skip_name (cp);
                    if (reader)
                      make_tag (np, cp - np, true,

diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good
index ac577e4acfdc86a79c45a72180b00d6b15a7e02c..afb1096b08497fa32a65e6798637a9d10eca5410 100644 (file)
--- a/test/etags/CTAGS.good
+++ b/test/etags/CTAGS.good
@@ -171,15 +171,6 @@ ${CHECKOBJS}       make-src/Makefile       /^${CHECKOBJS}: CFLAGS=-g3 -DNULLFREECHECK=0$/
 /wh    ps-src/rfc1245.ps       /^\/wh { $/
 /yen   ps-src/rfc1245.ps       /^\/yen \/.notdef \/.notdef \/.notdef \/.notdef \/.notdef /
 :a-forth-dictionary-entry      forth-src/test-forth.fth        /^create :a-forth-dictionary-entry$/
-:bar=  ruby-src/test1.ru       /^      attr_writer :bar$/
-:foo   ruby-src/test1.ru       /^      attr_reader :foo$/
-:qux   ruby-src/test1.ru       /^      alias_method :qux, :tee$/
-:read1 ruby-src/test1.ru       /^      attr_reader :read1, :read2; attr_writer :wri/
-:read2 ruby-src/test1.ru       /^      attr_reader :read1, :read2; attr_writer :wri/
-:tee   ruby-src/test1.ru       /^      attr_accessor :tee$/
-:tee=  ruby-src/test1.ru       /^      attr_accessor :tee$/
-:write1=       ruby-src/test1.ru       /^      attr_reader :read1, :read2; attr_writer :wri/
-:write2=       ruby-src/test1.ru       /^      attr_reader :read1, :read2; attr_writer :wri/
 <      tex-src/texinfo.tex     /^\\def<{{\\tt \\less}}$/
 <<     ruby-src/test.rb        /^        def <<(y)$/
 <=     ruby-src/test.rb        /^        def <=(y)$/
@@ -2565,6 +2556,7 @@ bar       c-src/c.c       /^void bar() {while(0) {}}$/
 bar    c.c     143
 bar    c-src/h.h       19
 bar    cp-src/x.cc     /^XX::bar()$/
+bar=   ruby-src/test1.ru       /^      attr_writer :bar$/
 bas_syn        prol-src/natded.prolog  /^bas_syn(n(_)).$/
 base   c-src/emacs/src/lisp.h  2188
 base   cp-src/c.C      /^double base (void) const { return rng_base;  }$/
@@ -3014,6 +3006,7 @@ foo       f-src/entry.for /^       character*(*) function foo()$/
 foo    f-src/entry.strange_suffix      /^       character*(*) function foo()$/
 foo    f-src/entry.strange     /^       character*(*) function foo()$/
 foo    php-src/ptest.php       /^foo()$/
+foo    ruby-src/test1.ru       /^      attr_reader :foo$/
 foo!   ruby-src/test1.ru       /^    def foo!$/
 foobar c-src/c.c       /^int foobar() {;}$/
 foobar c.c     /^extern void foobar (void) __attribute__ ((section /
@@ -3886,6 +3879,7 @@ questo    ../c/c.web      34
 quiettest      make-src/Makefile       /^quiettest:$/
 quit_char      c-src/emacs/src/keyboard.c      192
 quit_throw_to_read_char        c-src/emacs/src/keyboard.c      /^quit_throw_to_read_char (bool from_signal)$/
+qux    ruby-src/test1.ru       /^      alias_method :qux, :tee$/
 qux=   ruby-src/test1.ru       /^      def qux=(tee)$/
 r0     c-src/sysdep.h  54
 r1     c-src/sysdep.h  55
@@ -3910,6 +3904,8 @@ read      cp-src/conway.hpp       /^    char read() { return alive; }$/
 read   php-src/lce_functions.php       /^      function read()$/
 read-key-sequence      c-src/emacs/src/keyboard.c      /^DEFUN ("read-key-sequence", Fread_key_sequence, Sr/
 read-key-sequence-vector       c-src/emacs/src/keyboard.c      /^DEFUN ("read-key-sequence-vector", Fread_key_seque/
+read1  ruby-src/test1.ru       /^      attr_reader :read1, :read2; attr_writer :wri/
+read2  ruby-src/test1.ru       /^      attr_reader :read1, :read2; attr_writer :wri/
 read_char      c-src/emacs/src/keyboard.c      /^read_char (int commandflag, Lisp_Object map,$/
 read_char_help_form_unwind     c-src/emacs/src/keyboard.c      /^read_char_help_form_unwind (void)$/
 read_char_minibuf_menu_prompt  c-src/emacs/src/keyboard.c      /^read_char_minibuf_menu_prompt (int commandflag,$/
@@ -4284,6 +4280,8 @@ tags-with-face    el-src/emacs/lisp/progmodes/etags.el    /^(defmacro tags-with-face (
 target_multibyte       c-src/emacs/src/regex.h 407
 tcpdump        html-src/software.html  /^tcpdump$/
 teats  cp-src/c.C      127
+tee    ruby-src/test1.ru       /^      attr_accessor :tee$/
+tee=   ruby-src/test1.ru       /^      attr_accessor :tee$/
 temporarily_switch_to_single_kboard    c-src/emacs/src/keyboard.c      /^temporarily_switch_to_single_kboard (struct frame /
 tend   c-src/etags.c   2432
 terminate      objc-src/Subprocess.m   /^- terminate:sender$/
@@ -4452,6 +4450,8 @@ womboid   c-src/h.h       75
 word_size      c-src/emacs/src/lisp.h  1473
 write  php-src/lce_functions.php       /^      function write()$/
 write  php-src/lce_functions.php       /^      function write($save="yes")$/
+write1=        ruby-src/test1.ru       /^      attr_reader :read1, :read2; attr_writer :wri/
+write2=        ruby-src/test1.ru       /^      attr_reader :read1, :read2; attr_writer :wri/
 write_abbrev   c-src/abbrev.c  /^write_abbrev (sym, stream)$/
 write_classname        c-src/etags.c   /^write_classname (linebuffer *cn, const char *quali/
 write_lex      prol-src/natded.prolog  /^write_lex(File):-$/

diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1
index 84831c9c7434a0a10d74c09945ca43d07f6e8e70..87ab88fd6c2830dfce401be36766928d0df43a3d 100644 (file)
--- a/test/etags/ETAGS.good_1
+++ b/test/etags/ETAGS.good_1
@@ -3061,7 +3061,7 @@ module ModuleExample\7f1,0
     def module_instance_method\7f46,1051
     def ModuleExample.module_class_method\7fmodule_class_method\ 149,1131
 \f
-ruby-src/test1.ru,635
+ruby-src/test1.ru,655
 class A\7f1,0
  def a(\7f2,8
  def b(\7f5,38
@@ -3074,15 +3074,15 @@ module A\7f9,57
     def self._bar?(\7f_bar?\ 118,143
       def qux=(\7fqux=\ 122,194
     def X\7f25,232
-      attr_reader :foo\7f26,242
-      attr_reader :read1,\7f27,265
-      attr_reader :read1, :read2;\7f27,265
-      attr_reader :read1, :read2; attr_writer :write1,\7f:write1=\ 127,265
-      attr_reader :read1, :read2; attr_writer :write1, :write2\7f:write2=\ 127,265
-      attr_writer :bar\7f:bar=\ 128,328
-      attr_accessor :tee\7f29,351
-      attr_accessor :tee\7f:tee=\ 129,351
-      alias_method :qux,\7f30,376
+      attr_reader :foo\7ffoo\ 126,242
+      attr_reader :read1,\7fread1\ 127,265
+      attr_reader :read1, :read2;\7fread2\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1,\7fwrite1=\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1, :write2\7fwrite2=\ 127,265
+      attr_writer :bar\7fbar=\ 128,328
+      attr_accessor :tee\7ftee\ 129,351
+      attr_accessor :tee\7ftee=\ 129,351
+      alias_method :qux,\7fqux\ 130,376
 A::Constant \7fConstant\ 135,425
 \f
 tex-src/testenv.tex,52

diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2
index b97d5f7549095ad56d8525fa09afce0c7aa47a60..861598232a93d5918cc6ab22382ed7fcec9345f8 100644 (file)
--- a/test/etags/ETAGS.good_2
+++ b/test/etags/ETAGS.good_2
@@ -3631,7 +3631,7 @@ module ModuleExample\7f1,0
     def module_instance_method\7f46,1051
     def ModuleExample.module_class_method\7fmodule_class_method\ 149,1131
 \f
-ruby-src/test1.ru,635
+ruby-src/test1.ru,655
 class A\7f1,0
  def a(\7f2,8
  def b(\7f5,38
@@ -3644,15 +3644,15 @@ module A\7f9,57
     def self._bar?(\7f_bar?\ 118,143
       def qux=(\7fqux=\ 122,194
     def X\7f25,232
-      attr_reader :foo\7f26,242
-      attr_reader :read1,\7f27,265
-      attr_reader :read1, :read2;\7f27,265
-      attr_reader :read1, :read2; attr_writer :write1,\7f:write1=\ 127,265
-      attr_reader :read1, :read2; attr_writer :write1, :write2\7f:write2=\ 127,265
-      attr_writer :bar\7f:bar=\ 128,328
-      attr_accessor :tee\7f29,351
-      attr_accessor :tee\7f:tee=\ 129,351
-      alias_method :qux,\7f30,376
+      attr_reader :foo\7ffoo\ 126,242
+      attr_reader :read1,\7fread1\ 127,265
+      attr_reader :read1, :read2;\7fread2\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1,\7fwrite1=\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1, :write2\7fwrite2=\ 127,265
+      attr_writer :bar\7fbar=\ 128,328
+      attr_accessor :tee\7ftee\ 129,351
+      attr_accessor :tee\7ftee=\ 129,351
+      alias_method :qux,\7fqux\ 130,376
 A::Constant \7fConstant\ 135,425
 \f
 tex-src/testenv.tex,52

diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3
index 108fcae16db75aa3dd4a307edf7440617bd78e9f..52d5a613b616f0ef589cc0e8fd48e215a3c0346a 100644 (file)
--- a/test/etags/ETAGS.good_3
+++ b/test/etags/ETAGS.good_3
@@ -3408,7 +3408,7 @@ module ModuleExample\7f1,0
     def module_instance_method\7f46,1051
     def ModuleExample.module_class_method\7fmodule_class_method\ 149,1131
 \f
-ruby-src/test1.ru,635
+ruby-src/test1.ru,655
 class A\7f1,0
  def a(\7f2,8
  def b(\7f5,38
@@ -3421,15 +3421,15 @@ module A\7f9,57
     def self._bar?(\7f_bar?\ 118,143
       def qux=(\7fqux=\ 122,194
     def X\7f25,232
-      attr_reader :foo\7f26,242
-      attr_reader :read1,\7f27,265
-      attr_reader :read1, :read2;\7f27,265
-      attr_reader :read1, :read2; attr_writer :write1,\7f:write1=\ 127,265
-      attr_reader :read1, :read2; attr_writer :write1, :write2\7f:write2=\ 127,265
-      attr_writer :bar\7f:bar=\ 128,328
-      attr_accessor :tee\7f29,351
-      attr_accessor :tee\7f:tee=\ 129,351
-      alias_method :qux,\7f30,376
+      attr_reader :foo\7ffoo\ 126,242
+      attr_reader :read1,\7fread1\ 127,265
+      attr_reader :read1, :read2;\7fread2\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1,\7fwrite1=\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1, :write2\7fwrite2=\ 127,265
+      attr_writer :bar\7fbar=\ 128,328
+      attr_accessor :tee\7ftee\ 129,351
+      attr_accessor :tee\7ftee=\ 129,351
+      alias_method :qux,\7fqux\ 130,376
 A::Constant \7fConstant\ 135,425
 \f
 tex-src/testenv.tex,52

diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4
index 1f10a40ccafb6c34aa5c534ad2d614dd2906543d..333274cb253d484b1ce577d189148d409adcecf0 100644 (file)
--- a/test/etags/ETAGS.good_4
+++ b/test/etags/ETAGS.good_4
@@ -3225,7 +3225,7 @@ module ModuleExample\7f1,0
     def module_instance_method\7f46,1051
     def ModuleExample.module_class_method\7fmodule_class_method\ 149,1131
 \f
-ruby-src/test1.ru,635
+ruby-src/test1.ru,655
 class A\7f1,0
  def a(\7f2,8
  def b(\7f5,38
@@ -3238,15 +3238,15 @@ module A\7f9,57
     def self._bar?(\7f_bar?\ 118,143
       def qux=(\7fqux=\ 122,194
     def X\7f25,232
-      attr_reader :foo\7f26,242
-      attr_reader :read1,\7f27,265
-      attr_reader :read1, :read2;\7f27,265
-      attr_reader :read1, :read2; attr_writer :write1,\7f:write1=\ 127,265
-      attr_reader :read1, :read2; attr_writer :write1, :write2\7f:write2=\ 127,265
-      attr_writer :bar\7f:bar=\ 128,328
-      attr_accessor :tee\7f29,351
-      attr_accessor :tee\7f:tee=\ 129,351
-      alias_method :qux,\7f30,376
+      attr_reader :foo\7ffoo\ 126,242
+      attr_reader :read1,\7fread1\ 127,265
+      attr_reader :read1, :read2;\7fread2\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1,\7fwrite1=\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1, :write2\7fwrite2=\ 127,265
+      attr_writer :bar\7fbar=\ 128,328
+      attr_accessor :tee\7ftee\ 129,351
+      attr_accessor :tee\7ftee=\ 129,351
+      alias_method :qux,\7fqux\ 130,376
 A::Constant \7fConstant\ 135,425
 \f
 tex-src/testenv.tex,52

diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5
index 0a6cfc8e8e6d8cc38ca1101eaebb87c2d3e99228..fdf2329ee064f2cb4db98d19938a6abd7a068235 100644 (file)
--- a/test/etags/ETAGS.good_5
+++ b/test/etags/ETAGS.good_5
@@ -4142,7 +4142,7 @@ module ModuleExample\7f1,0
     def module_instance_method\7f46,1051
     def ModuleExample.module_class_method\7fmodule_class_method\ 149,1131
 \f
-ruby-src/test1.ru,635
+ruby-src/test1.ru,655
 class A\7f1,0
  def a(\7f2,8
  def b(\7f5,38
@@ -4155,15 +4155,15 @@ module A\7f9,57
     def self._bar?(\7f_bar?\ 118,143
       def qux=(\7fqux=\ 122,194
     def X\7f25,232
-      attr_reader :foo\7f26,242
-      attr_reader :read1,\7f27,265
-      attr_reader :read1, :read2;\7f27,265
-      attr_reader :read1, :read2; attr_writer :write1,\7f:write1=\ 127,265
-      attr_reader :read1, :read2; attr_writer :write1, :write2\7f:write2=\ 127,265
-      attr_writer :bar\7f:bar=\ 128,328
-      attr_accessor :tee\7f29,351
-      attr_accessor :tee\7f:tee=\ 129,351
-      alias_method :qux,\7f30,376
+      attr_reader :foo\7ffoo\ 126,242
+      attr_reader :read1,\7fread1\ 127,265
+      attr_reader :read1, :read2;\7fread2\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1,\7fwrite1=\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1, :write2\7fwrite2=\ 127,265
+      attr_writer :bar\7fbar=\ 128,328
+      attr_accessor :tee\7ftee\ 129,351
+      attr_accessor :tee\7ftee=\ 129,351
+      alias_method :qux,\7fqux\ 130,376
 A::Constant \7fConstant\ 135,425
 \f
 tex-src/testenv.tex,52

diff --git a/test/etags/ETAGS.good_6 b/test/etags/ETAGS.good_6
index cb1264f3e00a52b5afdc3405ab0d4619a302197d..95d59d3db39b9e0186e62f67c06ed5e4c91faf96 100644 (file)
--- a/test/etags/ETAGS.good_6
+++ b/test/etags/ETAGS.good_6
@@ -4142,7 +4142,7 @@ module ModuleExample\7f1,0
     def module_instance_method\7f46,1051
     def ModuleExample.module_class_method\7fmodule_class_method\ 149,1131
 \f
-ruby-src/test1.ru,635
+ruby-src/test1.ru,655
 class A\7f1,0
  def a(\7f2,8
  def b(\7f5,38
@@ -4155,15 +4155,15 @@ module A\7f9,57
     def self._bar?(\7f_bar?\ 118,143
       def qux=(\7fqux=\ 122,194
     def X\7f25,232
-      attr_reader :foo\7f26,242
-      attr_reader :read1,\7f27,265
-      attr_reader :read1, :read2;\7f27,265
-      attr_reader :read1, :read2; attr_writer :write1,\7f:write1=\ 127,265
-      attr_reader :read1, :read2; attr_writer :write1, :write2\7f:write2=\ 127,265
-      attr_writer :bar\7f:bar=\ 128,328
-      attr_accessor :tee\7f29,351
-      attr_accessor :tee\7f:tee=\ 129,351
-      alias_method :qux,\7f30,376
+      attr_reader :foo\7ffoo\ 126,242
+      attr_reader :read1,\7fread1\ 127,265
+      attr_reader :read1, :read2;\7fread2\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1,\7fwrite1=\ 127,265
+      attr_reader :read1, :read2; attr_writer :write1, :write2\7fwrite2=\ 127,265
+      attr_writer :bar\7fbar=\ 128,328
+      attr_accessor :tee\7ftee\ 129,351
+      attr_accessor :tee\7ftee=\ 129,351
+      alias_method :qux,\7fqux\ 130,376
 A::Constant \7fConstant\ 135,425
 \f
 tex-src/testenv.tex,52