Rename methods in Ruby etags example file

* test/etags/ruby-src/test.rb: Rename the example methods to
correspond to the common terminology used in Ruby.
* test/etags/CTAGS.good:
* 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: Adjust accordingly.

8 files changed, 68 insertions, 64 deletions

diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good
index 245f6703adf..86b019a2b4c 100644
--- a/test/etags/CTAGS.good
+++ b/test/etags/CTAGS.good
@@ -438,7 +438,7 @@ Cjava_entries	c-src/etags.c	/^Cjava_entries (FILE *inf)$/
 Cjava_help      c-src/etags.c   551
 Cjava_suffixes  c-src/etags.c   549
 ClassExample    ruby-src/test.rb        /^    class ClassExample$/
-ClassExample.singleton_class_method     ruby-src/test.rb        /^        def ClassExample.singleton_class_method$/
+ClassExample.class_method       ruby-src/test.rb        /^        def ClassExample.class_method$/
 Clear/p ada-src/2ataspri.adb    /^   procedure Clear (Cell : in out TAS_Cell) is$/
 Clear/p ada-src/2ataspri.ads    /^   procedure Clear        (Cell : in out TAS_Cell)/
 Cobol_help      c-src/etags.c   558
@@ -939,7 +939,7 @@ Metags	c-src/etags.c	/^main (int argc, char **argv)$/
 Mfail   cp-src/fail.C   /^main()$/
 Mkai-test.pl    perl-src/kai-test.pl    /^package main;$/
 ModuleExample   ruby-src/test.rb        /^module ModuleExample$/
-ModuleExample.singleton_module_method   ruby-src/test.rb        /^    def ModuleExample.singleton_module_method$/
+ModuleExample.module_class_method       ruby-src/test.rb        /^    def ModuleExample.module_class_method$/
 More_Lisp_Bits  c-src/emacs/src/lisp.h  801
 MoveLayerAfter  lua-src/allegro.lua     /^function MoveLayerAfter (this_one)$/
 MoveLayerBefore lua-src/allegro.lua     /^function MoveLayerBefore (this_one)$/
@@ -2620,10 +2620,10 @@ childDidExit	objc-src/Subprocess.m	/^- childDidExit$/
 chunks_free     c-src/emacs/src/gmalloc.c       313
 chunks_used     c-src/emacs/src/gmalloc.c       311
 cjava   c-src/etags.c   2936
-class_method    ruby-src/test.rb        /^        def class_method$/
-class_method_equals=    ruby-src/test.rb        /^        def class_method_equals=$/
-class_method_exclamation!       ruby-src/test.rb        /^        def class_method_exclamation!$/
-class_method_question?  ruby-src/test.rb        /^        def class_method_question?$/
+instance_method ruby-src/test.rb        /^        def instance_method$/
+instance_method_equals= ruby-src/test.rb        /^        def instance_method_equals=$/
+instance_method_exclamation!    ruby-src/test.rb        /^        def instance_method_exclamation!$/
+instance_method_question?       ruby-src/test.rb        /^        def instance_method_question?$/
 classifyLine    php-src/lce_functions.php       /^      function classifyLine($line)$/
 clear   cp-src/conway.hpp       /^    void clear(void) { alive = 0; }$/
 clear-abbrev-table      c-src/abbrev.c  /^DEFUN ("clear-abbrev-table", Fclear_abbrev_table, /
@@ -3450,7 +3450,7 @@ miti	html-src/softwarelibero.html	/^Sfatiamo alcuni miti$/
 modifier_names  c-src/emacs/src/keyboard.c      6319
 modifier_symbols        c-src/emacs/src/keyboard.c      6327
 modify_event_symbol     c-src/emacs/src/keyboard.c      /^modify_event_symbol (ptrdiff_t symbol_num, int mod/
-module_method   ruby-src/test.rb        /^    def module_method$/
+module_instance_method  ruby-src/test.rb        /^    def module_instance_method$/
 more_aligned_int        c.c     165
 morecore_nolock c-src/emacs/src/gmalloc.c       /^morecore_nolock (size_t size)$/
 morecore_recursing      c-src/emacs/src/gmalloc.c       604
diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1
index 2ae4ec41256..dac20910347 100644
--- a/test/etags/ETAGS.good_1
+++ b/test/etags/ETAGS.good_1
@@ -2980,11 +2980,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -2994,8 +2994,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2
index 3ec5b21d384..e5dbefbbd0d 100644
--- a/test/etags/ETAGS.good_2
+++ b/test/etags/ETAGS.good_2
@@ -3551,11 +3551,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -3565,8 +3565,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3
index 43b84eed5d2..804440aad6d 100644
--- a/test/etags/ETAGS.good_3
+++ b/test/etags/ETAGS.good_3
@@ -3324,11 +3324,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -3338,8 +3338,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4
index 434fe13cbd4..3b904ebe37c 100644
--- a/test/etags/ETAGS.good_4
+++ b/test/etags/ETAGS.good_4
@@ -3144,11 +3144,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -3158,8 +3158,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5
index 425e2526f35..c3a277829f0 100644
--- a/test/etags/ETAGS.good_5
+++ b/test/etags/ETAGS.good_5
@@ -4059,11 +4059,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -4073,8 +4073,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/etags/ETAGS.good_6 b/test/etags/ETAGS.good_6
index 39522dbdb9b..2014283a89c 100644
--- a/test/etags/ETAGS.good_6
+++ b/test/etags/ETAGS.good_6
@@ -4059,11 +4059,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -4073,8 +4073,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/etags/ruby-src/test.rb b/test/etags/ruby-src/test.rb
index 9254c5bffa9..adb2cb1d0bc 100644
--- a/test/etags/ruby-src/test.rb
+++ b/test/etags/ruby-src/test.rb
@@ -1,19 +1,19 @@
 module ModuleExample
     class ClassExample
-        def class_method
-            puts "in class_method"
+        def instance_method
+            puts "in instane_method"
         end
-        def ClassExample.singleton_class_method
-            puts "in singleton_class_method"
+        def ClassExample.class_method
+            puts "in class_method"
         end
-        def class_method_exclamation!
-            puts "in class_method_exclamation!"
+        def instance_method_exclamation!
+            puts "in instance_method_exclamation!"
         end
-        def class_method_question?
-            puts "in class_method_question?"
+        def instance_method_question?
+            puts "in instance_method_question?"
         end
-        def class_method_equals=
-            puts "in class_method_equals="
+        def instance_method_equals=
+            puts "in instance_method_equals="
         end
         def `(command)
             return "just testing a backquote override"
@@ -43,12 +43,16 @@ module ModuleExample
             self == y
         end
     end
-    def module_method
-        puts "in module_method"
+    def module_instance_method
+        puts "in module_instance_method"
     end
-    def ModuleExample.singleton_module_method
-        puts "in singleton_module_method"
+    def ModuleExample.module_class_method
+        puts "in module_class_method"
     end
 end
 
-ModuleExample::ClassExample.singleton_class_method
+ModuleExample::ClassExample.class_method
+
+# Local Variables:
+# ruby-indent-level: 4
+# End: