[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 3dda110: Remove 'def X' from the example
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] emacs-25 3dda110: Remove 'def X' from the example |
Date: |
Thu, 04 Feb 2016 09:21:12 +0000 |
branch: emacs-25
commit 3dda11032f9f49c285b0433b47802ceed2ade406
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Remove 'def X' from the example
* test/etags/ruby-src/test1.ru (A::B): Remove 'def X'
(http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00167.html).
* 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.
---
test/etags/CTAGS.good | 29 ++++++++++++++---------------
test/etags/ETAGS.good_1 | 31 +++++++++++++++----------------
test/etags/ETAGS.good_2 | 31 +++++++++++++++----------------
test/etags/ETAGS.good_3 | 31 +++++++++++++++----------------
test/etags/ETAGS.good_4 | 31 +++++++++++++++----------------
test/etags/ETAGS.good_5 | 31 +++++++++++++++----------------
test/etags/ETAGS.good_6 | 31 +++++++++++++++----------------
test/etags/ruby-src/test1.ru | 21 ++++++++++-----------
8 files changed, 114 insertions(+), 122 deletions(-)
diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good
index b78c194..58b1db6 100644
--- a/test/etags/CTAGS.good
+++ b/test/etags/CTAGS.good
@@ -454,7 +454,7 @@ Condition_Variable/t ada-src/2ataspri.ads /^
type Condition_Variable is privat
Condition_Variable/t ada-src/2ataspri.ads /^ type Condition_Variable
is$/
Configure pyt-src/server.py /^class Configure(Frame, ControlEdit):$/
ConfirmQuit pyt-src/server.py /^def ConfirmQuit(frame, context):$/
-Constant ruby-src/test1.ru 39
+Constant ruby-src/test1.ru 38
ControlEdit pyt-src/server.py /^class ControlEdit(Frame):$/
Controls pyt-src/server.py /^class Controls:$/
CopyTextString pas-src/common.pas /^function CopyTextString;(*($/
@@ -1491,7 +1491,6 @@ WorkingDays cp-src/functions.cpp /^int
WorkingDays(Date a, Date b){$/
Write_Lock/p ada-src/2ataspri.adb /^ procedure Write_Lock (L : in out
Lock; Ceiling_/
Write_Lock/p ada-src/2ataspri.ads /^ procedure Write_Lock (L : in out
Lock; Ceiling_/
X c-src/h.h 100
-X ruby-src/test1.ru /^ def X$/
XBOOL_VECTOR c-src/emacs/src/lisp.h /^XBOOL_VECTOR (Lisp_Object a)$/
XBUFFER c-src/emacs/src/lisp.h /^XBUFFER (Lisp_Object a)$/
XBUFFER_OBJFWD c-src/emacs/src/lisp.h /^XBUFFER_OBJFWD (union Lisp_Fwd *a)$/
@@ -2556,12 +2555,12 @@ 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,$/
+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; }$/
base cp-src/Range.h /^ double base (void) const { return rng_base; }$/
-baz= ruby-src/test1.ru /^ :baz,$/
+baz= ruby-src/test1.ru /^ :baz,$/
bb c.c 275
bbb c.c 251
bbbbbb c-src/h.h 113
@@ -3007,7 +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 /^ 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 /
@@ -3515,7 +3514,7 @@ 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_class_method ruby-src/test.rb /^ def
ModuleExample.module_class_method$/
module_instance_method ruby-src/test.rb /^ def
module_instance_method$/
-more= ruby-src/test1.ru /^ :more$/
+more= ruby-src/test1.ru /^ :more$/
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
@@ -3881,7 +3880,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, attr_accessor
:bogu/
+qux ruby-src/test1.ru /^ alias_method :qux, :tee, attr_accessor
:bogus$/
qux= ruby-src/test1.ru /^ def qux=(tee)$/
r0 c-src/sysdep.h 54
r1 c-src/sysdep.h 55
@@ -3906,8 +3905,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 :wr/
-read2 ruby-src/test1.ru /^ attr_reader :read1 , :read2;
attr_writer :wr/
+read1 ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer
:writ/
+read2 ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer
:writ/
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,$/
@@ -4166,7 +4165,7 @@ substitute c-src/etags.c /^substitute (char *in,
char *out, struct re_registe/
subsubsec=\relax tex-src/texinfo.tex
/^\\let\\appendixsubsubsec=\\relax$/
subsubsection perl-src/htlmify-cystic 27
subsubsection=\relax tex-src/texinfo.tex
/^\\let\\appendixsubsubsection=\\relax$/
-subtle ruby-src/test1.ru /^ :tee ; attr_reader
:subtle$/
+subtle ruby-src/test1.ru /^ :tee ; attr_reader :subtle$/
subtree prol-src/natded.prolog /^subtree(T,T).$/
suffix c-src/etags.c 186
suffixes c-src/etags.c 195
@@ -4283,8 +4282,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$/
+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$/
@@ -4453,8 +4452,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 :wr/
-write2= ruby-src/test1.ru /^ attr_reader :read1 , :read2;
attr_writer :wr/
+write1= ruby-src/test1.ru /^ attr_reader :read1 , :read2;
attr_writer :writ/
+write2= ruby-src/test1.ru /^ attr_reader :read1 , :read2;
attr_writer :writ/
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):-$/
@@ -4495,7 +4494,7 @@ xref-location-marker
el-src/emacs/lisp/progmodes/etags.el /^(cl-defmethod xref-l
xref-make-etags-location el-src/emacs/lisp/progmodes/etags.el
/^(defun xref-make-etags-location (tag-info file)$/
xrnew c-src/etags.c /^#define xrnew(op, n, Type) ((op) = (Type *) xreall/
xx make-src/Makefile /^xx="this line is here because of a fontlock
bug$/
-xyz ruby-src/test1.ru /^ alias_method :xyz,$/
+xyz ruby-src/test1.ru /^ alias_method :xyz,$/
y cp-src/conway.hpp 7
y cp-src/clheir.hpp 49
y cp-src/clheir.hpp 58
diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1
index 1390187..90bbe77 100644
--- a/test/etags/ETAGS.good_1
+++ b/test/etags/ETAGS.good_1
@@ -3061,7 +3061,7 @@ module ModuleExample1,0
def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ru,828
+ruby-src/test1.ru,785
class A1,0
def a(2,8
def b(5,38
@@ -3073,21 +3073,20 @@ module A9,57
def foo!15,121
def self._bar?(_bar?18,143
def qux=(qux=22,194
- def X25,232
- attr_reader :foofoo26,242
- attr_reader :read1 read127,265
- attr_reader :read1 , :read2;read227,265
- attr_reader :read1 , :read2; attr_writer :write1,write1=27,265
- attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265
- attr_writer :bar,bar=28,329
- :baz,baz=29,353
- :moremore=30,377
- attr_accessor :teetee31,401
- attr_accessor :teetee=31,401
- alias_method :qux,qux32,426
- alias_method :xyz,xyz33,478
- :tee ; attr_reader :subtlesubtle34,503
-A::Constant Constant39,568
+ attr_reader :foofoo26,233
+ attr_reader :read1 read127,254
+ attr_reader :read1 , :read2;read227,254
+ attr_reader :read1 , :read2; attr_writer :write1,write1=27,254
+ attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254
+ attr_writer :bar,bar=28,316
+ :baz,baz=29,338
+ :moremore=30,360
+ attr_accessor :teetee31,382
+ attr_accessor :teetee=31,382
+ alias_method :qux,qux32,405
+ alias_method :xyz,xyz33,455
+ :tee ; attr_reader :subtlesubtle34,478
+A::Constant Constant38,533
tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77
diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2
index f8b1546..d774bb1 100644
--- a/test/etags/ETAGS.good_2
+++ b/test/etags/ETAGS.good_2
@@ -3631,7 +3631,7 @@ module ModuleExample1,0
def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ru,828
+ruby-src/test1.ru,785
class A1,0
def a(2,8
def b(5,38
@@ -3643,21 +3643,20 @@ module A9,57
def foo!15,121
def self._bar?(_bar?18,143
def qux=(qux=22,194
- def X25,232
- attr_reader :foofoo26,242
- attr_reader :read1 read127,265
- attr_reader :read1 , :read2;read227,265
- attr_reader :read1 , :read2; attr_writer :write1,write1=27,265
- attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265
- attr_writer :bar,bar=28,329
- :baz,baz=29,353
- :moremore=30,377
- attr_accessor :teetee31,401
- attr_accessor :teetee=31,401
- alias_method :qux,qux32,426
- alias_method :xyz,xyz33,478
- :tee ; attr_reader :subtlesubtle34,503
-A::Constant Constant39,568
+ attr_reader :foofoo26,233
+ attr_reader :read1 read127,254
+ attr_reader :read1 , :read2;read227,254
+ attr_reader :read1 , :read2; attr_writer :write1,write1=27,254
+ attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254
+ attr_writer :bar,bar=28,316
+ :baz,baz=29,338
+ :moremore=30,360
+ attr_accessor :teetee31,382
+ attr_accessor :teetee=31,382
+ alias_method :qux,qux32,405
+ alias_method :xyz,xyz33,455
+ :tee ; attr_reader :subtlesubtle34,478
+A::Constant Constant38,533
tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77
diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3
index a1e895a..e3855a5 100644
--- a/test/etags/ETAGS.good_3
+++ b/test/etags/ETAGS.good_3
@@ -3408,7 +3408,7 @@ module ModuleExample1,0
def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ru,828
+ruby-src/test1.ru,785
class A1,0
def a(2,8
def b(5,38
@@ -3420,21 +3420,20 @@ module A9,57
def foo!15,121
def self._bar?(_bar?18,143
def qux=(qux=22,194
- def X25,232
- attr_reader :foofoo26,242
- attr_reader :read1 read127,265
- attr_reader :read1 , :read2;read227,265
- attr_reader :read1 , :read2; attr_writer :write1,write1=27,265
- attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265
- attr_writer :bar,bar=28,329
- :baz,baz=29,353
- :moremore=30,377
- attr_accessor :teetee31,401
- attr_accessor :teetee=31,401
- alias_method :qux,qux32,426
- alias_method :xyz,xyz33,478
- :tee ; attr_reader :subtlesubtle34,503
-A::Constant Constant39,568
+ attr_reader :foofoo26,233
+ attr_reader :read1 read127,254
+ attr_reader :read1 , :read2;read227,254
+ attr_reader :read1 , :read2; attr_writer :write1,write1=27,254
+ attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254
+ attr_writer :bar,bar=28,316
+ :baz,baz=29,338
+ :moremore=30,360
+ attr_accessor :teetee31,382
+ attr_accessor :teetee=31,382
+ alias_method :qux,qux32,405
+ alias_method :xyz,xyz33,455
+ :tee ; attr_reader :subtlesubtle34,478
+A::Constant Constant38,533
tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77
diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4
index 32390fa..dbae59b 100644
--- a/test/etags/ETAGS.good_4
+++ b/test/etags/ETAGS.good_4
@@ -3225,7 +3225,7 @@ module ModuleExample1,0
def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ru,828
+ruby-src/test1.ru,785
class A1,0
def a(2,8
def b(5,38
@@ -3237,21 +3237,20 @@ module A9,57
def foo!15,121
def self._bar?(_bar?18,143
def qux=(qux=22,194
- def X25,232
- attr_reader :foofoo26,242
- attr_reader :read1 read127,265
- attr_reader :read1 , :read2;read227,265
- attr_reader :read1 , :read2; attr_writer :write1,write1=27,265
- attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265
- attr_writer :bar,bar=28,329
- :baz,baz=29,353
- :moremore=30,377
- attr_accessor :teetee31,401
- attr_accessor :teetee=31,401
- alias_method :qux,qux32,426
- alias_method :xyz,xyz33,478
- :tee ; attr_reader :subtlesubtle34,503
-A::Constant Constant39,568
+ attr_reader :foofoo26,233
+ attr_reader :read1 read127,254
+ attr_reader :read1 , :read2;read227,254
+ attr_reader :read1 , :read2; attr_writer :write1,write1=27,254
+ attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254
+ attr_writer :bar,bar=28,316
+ :baz,baz=29,338
+ :moremore=30,360
+ attr_accessor :teetee31,382
+ attr_accessor :teetee=31,382
+ alias_method :qux,qux32,405
+ alias_method :xyz,xyz33,455
+ :tee ; attr_reader :subtlesubtle34,478
+A::Constant Constant38,533
tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77
diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5
index ee19bcf..9ea7797 100644
--- a/test/etags/ETAGS.good_5
+++ b/test/etags/ETAGS.good_5
@@ -4142,7 +4142,7 @@ module ModuleExample1,0
def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ru,828
+ruby-src/test1.ru,785
class A1,0
def a(2,8
def b(5,38
@@ -4154,21 +4154,20 @@ module A9,57
def foo!15,121
def self._bar?(_bar?18,143
def qux=(qux=22,194
- def X25,232
- attr_reader :foofoo26,242
- attr_reader :read1 read127,265
- attr_reader :read1 , :read2;read227,265
- attr_reader :read1 , :read2; attr_writer :write1,write1=27,265
- attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265
- attr_writer :bar,bar=28,329
- :baz,baz=29,353
- :moremore=30,377
- attr_accessor :teetee31,401
- attr_accessor :teetee=31,401
- alias_method :qux,qux32,426
- alias_method :xyz,xyz33,478
- :tee ; attr_reader :subtlesubtle34,503
-A::Constant Constant39,568
+ attr_reader :foofoo26,233
+ attr_reader :read1 read127,254
+ attr_reader :read1 , :read2;read227,254
+ attr_reader :read1 , :read2; attr_writer :write1,write1=27,254
+ attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254
+ attr_writer :bar,bar=28,316
+ :baz,baz=29,338
+ :moremore=30,360
+ attr_accessor :teetee31,382
+ attr_accessor :teetee=31,382
+ alias_method :qux,qux32,405
+ alias_method :xyz,xyz33,455
+ :tee ; attr_reader :subtlesubtle34,478
+A::Constant Constant38,533
tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77
diff --git a/test/etags/ETAGS.good_6 b/test/etags/ETAGS.good_6
index f4d9ab8..7420a41 100644
--- a/test/etags/ETAGS.good_6
+++ b/test/etags/ETAGS.good_6
@@ -4142,7 +4142,7 @@ module ModuleExample1,0
def module_instance_method46,1051
def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ru,828
+ruby-src/test1.ru,785
class A1,0
def a(2,8
def b(5,38
@@ -4154,21 +4154,20 @@ module A9,57
def foo!15,121
def self._bar?(_bar?18,143
def qux=(qux=22,194
- def X25,232
- attr_reader :foofoo26,242
- attr_reader :read1 read127,265
- attr_reader :read1 , :read2;read227,265
- attr_reader :read1 , :read2; attr_writer :write1,write1=27,265
- attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265
- attr_writer :bar,bar=28,329
- :baz,baz=29,353
- :moremore=30,377
- attr_accessor :teetee31,401
- attr_accessor :teetee=31,401
- alias_method :qux,qux32,426
- alias_method :xyz,xyz33,478
- :tee ; attr_reader :subtlesubtle34,503
-A::Constant Constant39,568
+ attr_reader :foofoo26,233
+ attr_reader :read1 read127,254
+ attr_reader :read1 , :read2;read227,254
+ attr_reader :read1 , :read2; attr_writer :write1,write1=27,254
+ attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254
+ attr_writer :bar,bar=28,316
+ :baz,baz=29,338
+ :moremore=30,360
+ attr_accessor :teetee31,382
+ attr_accessor :teetee=31,382
+ alias_method :qux,qux32,405
+ alias_method :xyz,xyz33,455
+ :tee ; attr_reader :subtlesubtle34,478
+A::Constant Constant38,533
tex-src/testenv.tex,52
\newcommand{\nm}\nm4,77
diff --git a/test/etags/ruby-src/test1.ru b/test/etags/ruby-src/test1.ru
index bc9dbec..93888c1 100644
--- a/test/etags/ruby-src/test1.ru
+++ b/test/etags/ruby-src/test1.ru
@@ -22,17 +22,16 @@ module A
def qux=(tee)
end
end
- def X
- attr_reader :foo
- attr_reader :read1 , :read2; attr_writer :write1, :write2
- attr_writer :bar,
- :baz,
- :more
- attr_accessor :tee
- alias_method :qux, :tee, attr_accessor :bogus
- alias_method :xyz,
- :tee ; attr_reader :subtle
- end
+
+ attr_reader :foo
+ attr_reader :read1 , :read2; attr_writer :write1, :write2
+ attr_writer :bar,
+ :baz,
+ :more
+ attr_accessor :tee
+ alias_method :qux, :tee, attr_accessor :bogus
+ alias_method :xyz,
+ :tee ; attr_reader :subtle
end
end
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 3dda110: Remove 'def X' from the example,
Dmitry Gutov <=