From f6213ce79981747b3cb2c8213710986b93999fe5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 2 Feb 2016 20:01:33 +0200 Subject: [PATCH] Fix file-name recognition in 'etags' * lib-src/etags.c (get_language_from_filename): If FILE includes a leading directory, compare only its basename to the known file names in lang_names[]. * test/etags/Makefile (RBSRC): Adapt to recent test1.ruby renaming. * 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 file names and to the results in Makefile due to the above etags.c fix. --- lib-src/etags.c | 8 ++ test/etags/CTAGS.good | 180 ++++++++++++++++++++++++++-------------- test/etags/ETAGS.good_1 | 128 +++++++++++++++++++--------- test/etags/ETAGS.good_2 | 129 +++++++++++++++++++--------- test/etags/ETAGS.good_3 | 128 +++++++++++++++++++--------- test/etags/ETAGS.good_4 | 128 +++++++++++++++++++--------- test/etags/ETAGS.good_5 | 129 +++++++++++++++++++--------- test/etags/ETAGS.good_6 | 129 +++++++++++++++++++--------- test/etags/Makefile | 2 +- 9 files changed, 665 insertions(+), 296 deletions(-) diff --git a/lib-src/etags.c b/lib-src/etags.c index acf20ddceb9..760685a6693 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -1485,8 +1485,16 @@ get_language_from_filename (char *file, int case_sensitive) { language *lang; const char **name, **ext, *suffix; + char *slash; /* Try whole file name first. */ + slash = strrchr (file, '/'); + if (slash != NULL) + file = slash + 1; +#ifdef DOS_NT + else if (file[0] && file[1] == ':') + file += 2; +#endif for (lang = lang_names; lang->name != NULL; lang++) if (lang->filenames != NULL) for (name = lang->filenames; *name != NULL; name++) diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good index c4962a7a207..ac577e4acfd 100644 --- a/test/etags/CTAGS.good +++ b/test/etags/CTAGS.good @@ -1,17 +1,5 @@ #a-defer-word forth-src/test-forth.fth /^defer #a-defer-word$/ #some-storage forth-src/test-forth.fth /^2000 buffer: #some-storage$/ -$ make-src/Makefile /^ @-$(MAKE) OPTIONS='--no-members' ${LATEST}ediff$/ -$ make-src/Makefile /^ @-$(MAKE) OPTIONS='--declarations --no-members' $/ -$ make-src/Makefile /^ @-$(MAKE) OPTIONS='--members' ${LATEST}ediff$/ -$ make-src/Makefile /^ @-$(MAKE) OPTIONS='--regex=@regexfile --no-member/ -$ make-src/Makefile /^ @-$(MAKE) OPTIONS='nonexistent --members --declar/ -$ make-src/Makefile /^ @-$(MAKE) ${LATEST}cdiff$/ -$ make-src/Makefile /^ $(CC) ${FASTCFLAGS} -c $?$/ -$ make-src/Makefile /^ $(CC) ${FASTCFLAGS} -c $?$/ -$ make-src/Makefile /^ $(CC) ${FASTCFLAGS} -c $?$/ -$ make-src/Makefile /^ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o etags e/ -$ make-src/Makefile /^ $(CC) $(CFLAGS) $(CPPFLAGS) -DCTAGS $(LDFLAGS) -o/ -$$i make-src/Makefile 140 $0x80 c-src/sysdep.h 32 $SYS_##syscall_na c-src/sysdep.h 31 $domain php-src/lce_functions.php 175 @@ -41,6 +29,9 @@ $unk_comment_lc php-src/lce_functions.php 117 $user_comment php-src/lce_functions.php 109 $user_comment php-src/lce_functions.php 167 $user_comment_lc php-src/lce_functions.php 115 +${CHECKOBJS} make-src/Makefile /^${CHECKOBJS}: CFLAGS=-g3 -DNULLFREECHECK=0$/ +%cdiff make-src/Makefile /^%cdiff: CTAGS% CTAGS ${infiles}$/ +%ediff make-src/Makefile /^%ediff: ETAGS% ETAGS ${infiles}$/ ($_,$flag,$opt,$f,$r,@temp perl-src/yagrip.pl 8 ($prog,$_,@list perl-src/yagrip.pl 39 ($string,$flag,@string,@temp,@last perl-src/yagrip.pl 40 @@ -48,6 +39,7 @@ $user_comment_lc php-src/lce_functions.php 115 (another-forth-word forth-src/test-forth.fth /^: (another-forth-word) ( -- )$/ + ruby-src/test.rb /^ def +(y)$/ + tex-src/texinfo.tex /^\\def+{{\\tt \\char 43}}$/ +.PRECIOUS make-src/Makefile /^.PRECIOUS: ETAGS CTAGS ETAGS16 CTAGS16 ETAGS17 CTA/ /.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/ /.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/ /.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/ @@ -138,6 +130,8 @@ $user_comment_lc php-src/lce_functions.php 115 /graymode ps-src/rfc1245.ps /^\/graymode true def$/ /grayness ps-src/rfc1245.ps /^\/grayness {$/ /guillemotleft ps-src/rfc1245.ps /^\/guillemotleft \/guillemotright \/ellipsis \/.notdef / +/home/www/pub/etags.c.gz make-src/Makefile /^\/home\/www\/pub\/etags.c.gz: etags.c$/ +/home/www/pub/software/unix/etags.tar.gz make-src/Makefile /^\/home\/www\/pub\/software\/unix\/etags.tar.gz: Makefile/ /hx ps-src/rfc1245.ps /^\/hx { $/ /i ps-src/rfc1245.ps /^\/i \/j \/k \/l \/m \/n \/o \/p \/q \/r \/s \/t \/u \/v \/w \/x \/y/ /iacute ps-src/rfc1245.ps /^\/iacute \/igrave \/icircumflex \/idieresis \/ntilde \/o/ @@ -177,15 +171,15 @@ $user_comment_lc php-src/lce_functions.php 115 /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.ruby /^ attr_writer :bar$/ -:foo ruby-src/test1.ruby /^ attr_reader :foo$/ -:qux ruby-src/test1.ruby /^ alias_method :qux, :tee$/ -:read1 ruby-src/test1.ruby /^ attr_reader :read1, :read2; attr_writer :wri/ -:read2 ruby-src/test1.ruby /^ attr_reader :read1, :read2; attr_writer :wri/ -:tee ruby-src/test1.ruby /^ attr_accessor :tee$/ -:tee= ruby-src/test1.ruby /^ attr_accessor :tee$/ -:write1= ruby-src/test1.ruby /^ attr_reader :read1, :read2; attr_writer :wri/ -:write2= ruby-src/test1.ruby /^ attr_reader :read1, :read2; attr_writer :wri/ +: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)$/ @@ -216,16 +210,6 @@ $user_comment_lc php-src/lce_functions.php 115 > tex-src/texinfo.tex /^\\def>{{\\tt \\gtr}}$/ >field1 forth-src/test-forth.fth /^ 9 field >field1$/ >field2 forth-src/test-forth.fth /^ 5 field >field2$/ -@$ make-src/Makefile /^ @$(MAKE) OPTIONS='--no-members' ${LATEST}ediff$/ -@$ make-src/Makefile /^ @$(MAKE) OPTIONS='--declarations --no-members' ${/ -@$ make-src/Makefile /^ @$(MAKE) OPTIONS='--members' ${LATEST}ediff$/ -@$ make-src/Makefile /^ @$(MAKE) OPTIONS='--regex=@regexfile --no-members/ -@$ make-src/Makefile /^ @$(MAKE) OPTIONS='nonexistent --members --declara/ -@$ make-src/Makefile /^ @$(MAKE) ${LATEST}cdiff$/ -@$ make-src/Makefile /^ @$(MAKE) etags "CPPFLAGS=-UVERSION"$/ -@$ make-src/Makefile /^ @$(MAKE) CHECKOBJS= CHECKFLAGS= etags "CFLAGS=-an/ -@$ make-src/Makefile /^ @$(MAKE) CHECKOBJS= CHECKFLAGS= ctags "CFLAGS=-an/ -@$ make-src/Makefile /^ @$(MAKE) etags CHECKOBJS= CHECKFLAGS= REGEXOBJS= / A c.c 162 A cp-src/c.C 39 A cp-src/c.C 56 @@ -235,9 +219,10 @@ A cp-src/c.C 73 A cp-src/c.C 117 A cp-src/fail.C 7 A cp-src/fail.C 23 -A ruby-src/test1.ruby /^class A$/ -A ruby-src/test1.ruby /^module A$/ -ABC ruby-src/test1.ruby 11 +A ruby-src/test1.ru /^class A$/ +A ruby-src/test1.ru /^module A$/ +ABC ruby-src/test1.ru 11 +ADASRC make-src/Makefile /^ADASRC=etags-test-for.ada 2ataspri.adb 2ataspri.ad/ ADDRESS c-src/emacs/src/gmalloc.c /^#define ADDRESS(B) ((void *) (((B) - 1) * BLOCKSIZ/ ALIGNOF_STRUCT_LISP_VECTOR c-src/emacs/src/lisp.h 1378 ALLOCATED_BEFORE_DUMPING c-src/emacs/src/gmalloc.c /^#define ALLOCATED_BEFORE_DUMPING(P) \\$/ @@ -247,6 +232,7 @@ AND y-src/cccp.c 11 ANSIC c-src/h.h 84 ANSIC c-src/h.h 85 AREF c-src/emacs/src/lisp.h /^AREF (Lisp_Object array, ptrdiff_t idx)$/ +ARGS make-src/Makefile /^ARGS=- < srclist$/ ARITH_EQUAL c-src/emacs/src/lisp.h 3498 ARITH_GRTR c-src/emacs/src/lisp.h 3501 ARITH_GRTR_OR_EQUAL c-src/emacs/src/lisp.h 3503 @@ -259,6 +245,7 @@ ARRAY_MARK_FLAG c-src/emacs/src/lisp.h 768 ASCII_CHAR_P c-src/emacs/src/lisp.h /^#define ASCII_CHAR_P(c) UNSIGNED_CMP (c, <, 0x80)$/ ASET c-src/emacs/src/lisp.h /^ASET (Lisp_Object array, ptrdiff_t idx, Lisp_Objec/ ASIZE c-src/emacs/src/lisp.h /^ASIZE (Lisp_Object array)$/ +ASRC make-src/Makefile /^ASRC=empty.zz empty.zz.gz$/ AST_Array::AST_Array cp-src/c.C /^AST_Array::AST_Array(UTL_ScopedName *n, unsigned l/ AST_ConcreteType::AST_ConcreteType cp-src/c.C /^AST_ConcreteType::AST_ConcreteType(AST_Decl::NodeT/ AST_Root cp-src/c.C 92 @@ -300,7 +287,7 @@ B cp-src/c.C /^void B::B() {}$/ B cp-src/c.C 122 B cp-src/fail.C 8 B cp-src/fail.C 24 -B ruby-src/test1.ruby /^ class B$/ +B ruby-src/test1.ru /^ class B$/ BE_Node cp-src/c.C /^void BE_Node::BE_Node() {}$/ BE_Node cp-src/c.C 77 BITS_PER_BITS_WORD c-src/emacs/src/lisp.h 125 @@ -349,7 +336,7 @@ CAR_SAFE c-src/emacs/src/lisp.h /^CAR_SAFE (Lisp_Object c)$/ CATCHER c-src/emacs/src/lisp.h 3021 CDR c-src/emacs/src/lisp.h /^CDR (Lisp_Object c)$/ CDR_SAFE c-src/emacs/src/lisp.h /^CDR_SAFE (Lisp_Object c)$/ -CFLAGS make-src/Makefile 88 +CFLAGS make-src/Makefile /^CFLAGS=${WARNINGS} -ansi -g3 # -pg -O$/ CHAR c-src/etags.c /^#define CHAR(x) ((unsigned int)(x) & (CHARS - 1))/ CHAR y-src/cccp.c 7 CHARACTERBITS c-src/emacs/src/lisp.h 2457 @@ -377,7 +364,8 @@ CHAR_TABLE_SET c-src/emacs/src/lisp.h /^CHAR_TABLE_SET (Lisp_Object ct, int idx, CHAR_TABLE_STANDARD_SLOTS c-src/emacs/src/lisp.h 1697 CHAR_TYPE_SIZE cccp.y 87 CHAR_TYPE_SIZE y-src/cccp.y 87 -CHECKEROPTS make-src/Makefile 92 +CHECKFLAGS make-src/Makefile /^CHECKFLAGS=-DDEBUG -Wno-unused-function$/ +CHECKOBJS make-src/Makefile /^CHECKOBJS=chkmalloc.o chkxm.o$/ CHECK_ARRAY c-src/emacs/src/lisp.h /^CHECK_ARRAY (Lisp_Object x, Lisp_Object predicate)/ CHECK_BOOL_VECTOR c-src/emacs/src/lisp.h /^CHECK_BOOL_VECTOR (Lisp_Object x)$/ CHECK_BUFFER c-src/emacs/src/lisp.h /^CHECK_BUFFER (Lisp_Object x)$/ @@ -416,6 +404,7 @@ CK_REL_R parse.y /^#define CK_REL_R(x) if( ((x)>0 && MAX_ROW-(x)$/ test go-src/test1.go /^func test(p plus) {$/ +test make-src/Makefile /^test:$/ test php-src/ptest.php /^test $/ test.me22b lua-src/test.lua /^ local function test.me22b (one)$/ test.me_22a lua-src/test.lua /^ function test.me_22a(one, two)$/ @@ -4386,15 +4439,12 @@ warning cccp.y /^warning (msg)$/ warning y-src/cccp.y /^warning (msg)$/ weak c-src/emacs/src/lisp.h 1830 weak_alias c-src/emacs/src/gmalloc.c /^weak_alias (free, cfree)$/ +web ftp publish make-src/Makefile /^web ftp publish:$/ what c-src/etags.c 252 wheel_syms c-src/emacs/src/keyboard.c 4628 where c-src/emacs/src/lisp.h 2348 where cp-src/clheir.hpp 77 where_in_registry cp-src/clheir.hpp 15 -width make-src/Makefile 186 -width make-src/Makefile 189 -width make-src/Makefile 192 -width make-src/Makefile 195 windowWillClose objcpp-src/SimpleCalc.M /^- windowWillClose:sender$/ wipe_kboard c-src/emacs/src/keyboard.c /^wipe_kboard (KBOARD *kb)$/ womboid c-src/h.h 63 @@ -4432,6 +4482,7 @@ x-get-selection-internal c.c /^DEFUN ("x-get-selection-internal", Fx_get_selecti x-get-selection-internal c.c /^ Fx_get_selection_internal, Sx_get_selection/ xcar_addr c-src/emacs/src/lisp.h /^xcar_addr (Lisp_Object c)$/ xcdr_addr c-src/emacs/src/lisp.h /^xcdr_addr (Lisp_Object c)$/ +xdiff make-src/Makefile /^xdiff: ETAGS EXTAGS ${infiles}$/ xmalloc c-src/etags.c /^xmalloc (size_t size)$/ xnew c-src/etags.c /^#define xnew(n, Type) ((Type *) xmalloc ((n) / xrealloc c-src/etags.c /^xrealloc (void *ptr, size_t size)$/ @@ -4440,6 +4491,7 @@ xref-location-line el-src/emacs/lisp/progmodes/etags.el /^(cl-defmethod xref-loc xref-location-marker el-src/emacs/lisp/progmodes/etags.el /^(cl-defmethod xref-location-marker ((l xref-etags-/ 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$/ 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 435cd08da89..84831c9c743 100644 --- a/test/etags/ETAGS.good_1 +++ b/test/etags/ETAGS.good_1 @@ -2362,49 +2362,101 @@ function Square.something:Bar Bar14,148 local function test.me22b 25,297 local function test.me22b me22b25,297 -make-src/Makefile,1133 +make-src/Makefile,2175 LATEST=1,0 +RELEASELIST=2,10 +ADASRC=4,104 +ASRC=5,171 +CSRC=6,197 +CPSRC=10,423 +ELSRC=13,614 +ERLSRC=14,661 +FORTHSRC=15,702 +FSRC=16,726 +HTMLSRC=17,776 +JAVASRC=18,844 +LUASRC=19,907 +MAKESRC=20,926 +OBJCSRC=21,943 +OBJCPPSRC=22,999 +PASSRC=23,1035 +PERLSRC=24,1053 +PHPSRC=25,1108 +PSSRC=26,1156 +PROLSRC=27,1173 +PYTSRC=28,1210 +TEXSRC=29,1227 +YSRC=30,1282 +SRCS=31,1325 NONSRCS=35,1577 +VHDLFLAGS=37,1624 +COBOLFLAGS=38,1827 +POSTSCRIPTFLAGS=39,1889 +TCLFLAGS=40,1943 +GETOPTOBJS=42,2002 +RXINCLUDE=43,2034 +REGEXOBJS=44,2056 +CHECKOBJS=46,2075 +CHECKFLAGS=47,2105 +OBJS=48,2145 CPPFLAGS=49,2190 LDFLAGS=50,2259 +WARNINGS=51,2282 +CFLAGS=52,2466 FASTCFLAGS=55,2530 +FASTCFLAGSWARN=56,2591 FILTER=58,2641 - @-$($72,3063 - @-$($73,3112 - @-$($74,3176 - @-$($75,3222 - @-$($76,3290 - @-$($77,3382 - @$(81,3465 - @$(82,3513 - @$(83,3576 - @$(84,3621 - @$(85,3688 - @$(86,3779 -${CHECKOBJS}: CFLAGS=88,3805 - @env CHECKEROPTS=92,3921 - @$(98,4093 - @$(106,4249 - @$(110,4373 - @$(114,4499 - @for i in $(SRCS); do echo $$i;140,5320 - $(160,6058 - $(163,6119 - $(166,6182 - $(169,6233 - $(172,6322 - sdiff --suppress-common-lines --width=width186,6619 - sdiff --suppress-common-lines --width=width189,6708 - sdiff --suppress-common-lines --width=width192,6796 - sdiff --suppress-common-lines --width=width195,6885 - TEXTAGS=204,7127 - TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127 - ${RUN} etags12 --members -o $@ --regex=regex207,7244 - ${RUN} ./ctags -o $@ --regex=regex213,7393 - ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469 - TEXTAGS=219,7588 - TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588 - ${RUN} ./extags -e --regex-c=c222,7715 +REGEX=59,2695 +xx=60,2741 +MAKE:MAKE62,2790 +RUN=63,2825 +RUN=64,2865 +OPTIONS=65,2870 +ARGS=66,2922 +infiles 68,2940 +quiettest:quiettest70,3002 +test:test79,3409 +${CHECKOBJS}:${CHECKOBJS}88,3805 +checker:checker90,3849 +standalone:standalone96,4062 +prof:prof101,4168 +fastetags:fastetags104,4198 +fastctags:fastctags108,4322 +staticetags:staticetags112,4446 +rsynctofly:rsynctofly116,4608 +rsyncfromfly:rsyncfromfly119,4698 +web ftp publish:web ftp publish122,4794 +release distrib:release distrib129,5115 +tags:tags134,5255 +clean:clean136,5267 +srclist:srclist139,5302 +regexfile:regexfile143,5391 +/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566 +/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825 +regex.o:regex.o159,6031 +getopt.o:getopt.o162,6086 +getopt1.o:getopt1.o165,6147 +etags:etags168,6210 +ctags:ctags171,6299 +man manpage:man manpage174,6396 +etags.1.man:etags.1.man176,6422 +maintaining.info:maintaining.info179,6475 +TAGS:TAGS182,6557 +%ediff:%ediff185,6587 +oediff:oediff188,6677 +%cdiff:%cdiff191,6764 +xdiff:xdiff194,6854 +ETAGS:ETAGS197,6942 +ETAGS%:ETAGS%200,7012 +ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084 +ETAGS12:ETAGS12206,7216 +OTAGS:OTAGS209,7304 +CTAGS:CTAGS212,7369 +CTAGS%:CTAGS%215,7443 +CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545 +EXTAGS:EXTAGS221,7680 +.PRECIOUS:.PRECIOUS224,7838 +FRC:FRC226,7894 objc-src/Subprocess.h,98 #define Subprocess 41,1217 @@ -3009,7 +3061,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ruby,635 +ruby-src/test1.ru,635 class A1,0 def a(2,8 def b(5,38 diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2 index 4abdc9098af..b97d5f75490 100644 --- a/test/etags/ETAGS.good_2 +++ b/test/etags/ETAGS.good_2 @@ -2931,50 +2931,101 @@ function Square.something:Bar Bar14,148 local function test.me22b 25,297 local function test.me22b me22b25,297 -make-src/Makefile,1156 +make-src/Makefile,2175 LATEST=1,0 +RELEASELIST=2,10 +ADASRC=4,104 +ASRC=5,171 +CSRC=6,197 +CPSRC=10,423 +ELSRC=13,614 +ERLSRC=14,661 +FORTHSRC=15,702 +FSRC=16,726 +HTMLSRC=17,776 +JAVASRC=18,844 +LUASRC=19,907 +MAKESRC=20,926 +OBJCSRC=21,943 +OBJCPPSRC=22,999 +PASSRC=23,1035 +PERLSRC=24,1053 +PHPSRC=25,1108 +PSSRC=26,1156 +PROLSRC=27,1173 +PYTSRC=28,1210 +TEXSRC=29,1227 +YSRC=30,1282 +SRCS=31,1325 NONSRCS=35,1577 +VHDLFLAGS=37,1624 +COBOLFLAGS=38,1827 +POSTSCRIPTFLAGS=39,1889 +TCLFLAGS=40,1943 +GETOPTOBJS=42,2002 +RXINCLUDE=43,2034 +REGEXOBJS=44,2056 +CHECKOBJS=46,2075 +CHECKFLAGS=47,2105 +OBJS=48,2145 CPPFLAGS=49,2190 LDFLAGS=50,2259 +WARNINGS=51,2282 +CFLAGS=52,2466 FASTCFLAGS=55,2530 +FASTCFLAGSWARN=56,2591 FILTER=58,2641 - @-$($72,3063 - @-$($73,3112 - @-$($74,3176 - @-$($75,3222 - @-$($76,3290 - @-$($77,3382 - @$(81,3465 - @$(82,3513 - @$(83,3576 - @$(84,3621 - @$(85,3688 - @$(86,3779 -${CHECKOBJS}: CFLAGS=88,3805 - @env CHECKEROPTS=92,3921 - @$(98,4093 - @$(106,4249 - @$(110,4373 - @$(114,4499 - @for i in $(140,5320 - @for i in $(SRCS); do echo $$i;140,5320 - $(160,6058 - $(163,6119 - $(166,6182 - $(169,6233 - $(172,6322 - sdiff --suppress-common-lines --width=width186,6619 - sdiff --suppress-common-lines --width=width189,6708 - sdiff --suppress-common-lines --width=width192,6796 - sdiff --suppress-common-lines --width=width195,6885 - TEXTAGS=204,7127 - TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127 - ${RUN} etags12 --members -o $@ --regex=regex207,7244 - ${RUN} ./ctags -o $@ --regex=regex213,7393 - ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469 - TEXTAGS=219,7588 - TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588 - ${RUN} ./extags -e --regex-c=c222,7715 +REGEX=59,2695 +xx=60,2741 +MAKE:MAKE62,2790 +RUN=63,2825 +RUN=64,2865 +OPTIONS=65,2870 +ARGS=66,2922 +infiles 68,2940 +quiettest:quiettest70,3002 +test:test79,3409 +${CHECKOBJS}:${CHECKOBJS}88,3805 +checker:checker90,3849 +standalone:standalone96,4062 +prof:prof101,4168 +fastetags:fastetags104,4198 +fastctags:fastctags108,4322 +staticetags:staticetags112,4446 +rsynctofly:rsynctofly116,4608 +rsyncfromfly:rsyncfromfly119,4698 +web ftp publish:web ftp publish122,4794 +release distrib:release distrib129,5115 +tags:tags134,5255 +clean:clean136,5267 +srclist:srclist139,5302 +regexfile:regexfile143,5391 +/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566 +/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825 +regex.o:regex.o159,6031 +getopt.o:getopt.o162,6086 +getopt1.o:getopt1.o165,6147 +etags:etags168,6210 +ctags:ctags171,6299 +man manpage:man manpage174,6396 +etags.1.man:etags.1.man176,6422 +maintaining.info:maintaining.info179,6475 +TAGS:TAGS182,6557 +%ediff:%ediff185,6587 +oediff:oediff188,6677 +%cdiff:%cdiff191,6764 +xdiff:xdiff194,6854 +ETAGS:ETAGS197,6942 +ETAGS%:ETAGS%200,7012 +ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084 +ETAGS12:ETAGS12206,7216 +OTAGS:OTAGS209,7304 +CTAGS:CTAGS212,7369 +CTAGS%:CTAGS%215,7443 +CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545 +EXTAGS:EXTAGS221,7680 +.PRECIOUS:.PRECIOUS224,7838 +FRC:FRC226,7894 objc-src/Subprocess.h,98 #define Subprocess 41,1217 @@ -3580,7 +3631,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ruby,635 +ruby-src/test1.ru,635 class A1,0 def a(2,8 def b(5,38 diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3 index 94815caf489..108fcae16db 100644 --- a/test/etags/ETAGS.good_3 +++ b/test/etags/ETAGS.good_3 @@ -2682,49 +2682,101 @@ function Square.something:Bar Bar14,148 local function test.me22b 25,297 local function test.me22b me22b25,297 -make-src/Makefile,1133 +make-src/Makefile,2175 LATEST=1,0 +RELEASELIST=2,10 +ADASRC=4,104 +ASRC=5,171 +CSRC=6,197 +CPSRC=10,423 +ELSRC=13,614 +ERLSRC=14,661 +FORTHSRC=15,702 +FSRC=16,726 +HTMLSRC=17,776 +JAVASRC=18,844 +LUASRC=19,907 +MAKESRC=20,926 +OBJCSRC=21,943 +OBJCPPSRC=22,999 +PASSRC=23,1035 +PERLSRC=24,1053 +PHPSRC=25,1108 +PSSRC=26,1156 +PROLSRC=27,1173 +PYTSRC=28,1210 +TEXSRC=29,1227 +YSRC=30,1282 +SRCS=31,1325 NONSRCS=35,1577 +VHDLFLAGS=37,1624 +COBOLFLAGS=38,1827 +POSTSCRIPTFLAGS=39,1889 +TCLFLAGS=40,1943 +GETOPTOBJS=42,2002 +RXINCLUDE=43,2034 +REGEXOBJS=44,2056 +CHECKOBJS=46,2075 +CHECKFLAGS=47,2105 +OBJS=48,2145 CPPFLAGS=49,2190 LDFLAGS=50,2259 +WARNINGS=51,2282 +CFLAGS=52,2466 FASTCFLAGS=55,2530 +FASTCFLAGSWARN=56,2591 FILTER=58,2641 - @-$($72,3063 - @-$($73,3112 - @-$($74,3176 - @-$($75,3222 - @-$($76,3290 - @-$($77,3382 - @$(81,3465 - @$(82,3513 - @$(83,3576 - @$(84,3621 - @$(85,3688 - @$(86,3779 -${CHECKOBJS}: CFLAGS=88,3805 - @env CHECKEROPTS=92,3921 - @$(98,4093 - @$(106,4249 - @$(110,4373 - @$(114,4499 - @for i in $(SRCS); do echo $$i;140,5320 - $(160,6058 - $(163,6119 - $(166,6182 - $(169,6233 - $(172,6322 - sdiff --suppress-common-lines --width=width186,6619 - sdiff --suppress-common-lines --width=width189,6708 - sdiff --suppress-common-lines --width=width192,6796 - sdiff --suppress-common-lines --width=width195,6885 - TEXTAGS=204,7127 - TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127 - ${RUN} etags12 --members -o $@ --regex=regex207,7244 - ${RUN} ./ctags -o $@ --regex=regex213,7393 - ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469 - TEXTAGS=219,7588 - TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588 - ${RUN} ./extags -e --regex-c=c222,7715 +REGEX=59,2695 +xx=60,2741 +MAKE:MAKE62,2790 +RUN=63,2825 +RUN=64,2865 +OPTIONS=65,2870 +ARGS=66,2922 +infiles 68,2940 +quiettest:quiettest70,3002 +test:test79,3409 +${CHECKOBJS}:${CHECKOBJS}88,3805 +checker:checker90,3849 +standalone:standalone96,4062 +prof:prof101,4168 +fastetags:fastetags104,4198 +fastctags:fastctags108,4322 +staticetags:staticetags112,4446 +rsynctofly:rsynctofly116,4608 +rsyncfromfly:rsyncfromfly119,4698 +web ftp publish:web ftp publish122,4794 +release distrib:release distrib129,5115 +tags:tags134,5255 +clean:clean136,5267 +srclist:srclist139,5302 +regexfile:regexfile143,5391 +/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566 +/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825 +regex.o:regex.o159,6031 +getopt.o:getopt.o162,6086 +getopt1.o:getopt1.o165,6147 +etags:etags168,6210 +ctags:ctags171,6299 +man manpage:man manpage174,6396 +etags.1.man:etags.1.man176,6422 +maintaining.info:maintaining.info179,6475 +TAGS:TAGS182,6557 +%ediff:%ediff185,6587 +oediff:oediff188,6677 +%cdiff:%cdiff191,6764 +xdiff:xdiff194,6854 +ETAGS:ETAGS197,6942 +ETAGS%:ETAGS%200,7012 +ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084 +ETAGS12:ETAGS12206,7216 +OTAGS:OTAGS209,7304 +CTAGS:CTAGS212,7369 +CTAGS%:CTAGS%215,7443 +CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545 +EXTAGS:EXTAGS221,7680 +.PRECIOUS:.PRECIOUS224,7838 +FRC:FRC226,7894 objc-src/Subprocess.h,98 #define Subprocess 41,1217 @@ -3356,7 +3408,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ruby,635 +ruby-src/test1.ru,635 class A1,0 def a(2,8 def b(5,38 diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4 index f71e1b0a432..1f10a40ccaf 100644 --- a/test/etags/ETAGS.good_4 +++ b/test/etags/ETAGS.good_4 @@ -2526,49 +2526,101 @@ function Square.something:Bar Bar14,148 local function test.me22b 25,297 local function test.me22b me22b25,297 -make-src/Makefile,1133 +make-src/Makefile,2175 LATEST=1,0 +RELEASELIST=2,10 +ADASRC=4,104 +ASRC=5,171 +CSRC=6,197 +CPSRC=10,423 +ELSRC=13,614 +ERLSRC=14,661 +FORTHSRC=15,702 +FSRC=16,726 +HTMLSRC=17,776 +JAVASRC=18,844 +LUASRC=19,907 +MAKESRC=20,926 +OBJCSRC=21,943 +OBJCPPSRC=22,999 +PASSRC=23,1035 +PERLSRC=24,1053 +PHPSRC=25,1108 +PSSRC=26,1156 +PROLSRC=27,1173 +PYTSRC=28,1210 +TEXSRC=29,1227 +YSRC=30,1282 +SRCS=31,1325 NONSRCS=35,1577 +VHDLFLAGS=37,1624 +COBOLFLAGS=38,1827 +POSTSCRIPTFLAGS=39,1889 +TCLFLAGS=40,1943 +GETOPTOBJS=42,2002 +RXINCLUDE=43,2034 +REGEXOBJS=44,2056 +CHECKOBJS=46,2075 +CHECKFLAGS=47,2105 +OBJS=48,2145 CPPFLAGS=49,2190 LDFLAGS=50,2259 +WARNINGS=51,2282 +CFLAGS=52,2466 FASTCFLAGS=55,2530 +FASTCFLAGSWARN=56,2591 FILTER=58,2641 - @-$($72,3063 - @-$($73,3112 - @-$($74,3176 - @-$($75,3222 - @-$($76,3290 - @-$($77,3382 - @$(81,3465 - @$(82,3513 - @$(83,3576 - @$(84,3621 - @$(85,3688 - @$(86,3779 -${CHECKOBJS}: CFLAGS=88,3805 - @env CHECKEROPTS=92,3921 - @$(98,4093 - @$(106,4249 - @$(110,4373 - @$(114,4499 - @for i in $(SRCS); do echo $$i;140,5320 - $(160,6058 - $(163,6119 - $(166,6182 - $(169,6233 - $(172,6322 - sdiff --suppress-common-lines --width=width186,6619 - sdiff --suppress-common-lines --width=width189,6708 - sdiff --suppress-common-lines --width=width192,6796 - sdiff --suppress-common-lines --width=width195,6885 - TEXTAGS=204,7127 - TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127 - ${RUN} etags12 --members -o $@ --regex=regex207,7244 - ${RUN} ./ctags -o $@ --regex=regex213,7393 - ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469 - TEXTAGS=219,7588 - TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588 - ${RUN} ./extags -e --regex-c=c222,7715 +REGEX=59,2695 +xx=60,2741 +MAKE:MAKE62,2790 +RUN=63,2825 +RUN=64,2865 +OPTIONS=65,2870 +ARGS=66,2922 +infiles 68,2940 +quiettest:quiettest70,3002 +test:test79,3409 +${CHECKOBJS}:${CHECKOBJS}88,3805 +checker:checker90,3849 +standalone:standalone96,4062 +prof:prof101,4168 +fastetags:fastetags104,4198 +fastctags:fastctags108,4322 +staticetags:staticetags112,4446 +rsynctofly:rsynctofly116,4608 +rsyncfromfly:rsyncfromfly119,4698 +web ftp publish:web ftp publish122,4794 +release distrib:release distrib129,5115 +tags:tags134,5255 +clean:clean136,5267 +srclist:srclist139,5302 +regexfile:regexfile143,5391 +/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566 +/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825 +regex.o:regex.o159,6031 +getopt.o:getopt.o162,6086 +getopt1.o:getopt1.o165,6147 +etags:etags168,6210 +ctags:ctags171,6299 +man manpage:man manpage174,6396 +etags.1.man:etags.1.man176,6422 +maintaining.info:maintaining.info179,6475 +TAGS:TAGS182,6557 +%ediff:%ediff185,6587 +oediff:oediff188,6677 +%cdiff:%cdiff191,6764 +xdiff:xdiff194,6854 +ETAGS:ETAGS197,6942 +ETAGS%:ETAGS%200,7012 +ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084 +ETAGS12:ETAGS12206,7216 +OTAGS:OTAGS209,7304 +CTAGS:CTAGS212,7369 +CTAGS%:CTAGS%215,7443 +CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545 +EXTAGS:EXTAGS221,7680 +.PRECIOUS:.PRECIOUS224,7838 +FRC:FRC226,7894 objc-src/Subprocess.h,98 #define Subprocess 41,1217 @@ -3173,7 +3225,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ruby,635 +ruby-src/test1.ru,635 class A1,0 def a(2,8 def b(5,38 diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5 index d51542c3a93..0a6cfc8e8e6 100644 --- a/test/etags/ETAGS.good_5 +++ b/test/etags/ETAGS.good_5 @@ -3415,50 +3415,101 @@ function Square.something:Bar Bar14,148 local function test.me22b 25,297 local function test.me22b me22b25,297 -make-src/Makefile,1156 +make-src/Makefile,2175 LATEST=1,0 +RELEASELIST=2,10 +ADASRC=4,104 +ASRC=5,171 +CSRC=6,197 +CPSRC=10,423 +ELSRC=13,614 +ERLSRC=14,661 +FORTHSRC=15,702 +FSRC=16,726 +HTMLSRC=17,776 +JAVASRC=18,844 +LUASRC=19,907 +MAKESRC=20,926 +OBJCSRC=21,943 +OBJCPPSRC=22,999 +PASSRC=23,1035 +PERLSRC=24,1053 +PHPSRC=25,1108 +PSSRC=26,1156 +PROLSRC=27,1173 +PYTSRC=28,1210 +TEXSRC=29,1227 +YSRC=30,1282 +SRCS=31,1325 NONSRCS=35,1577 +VHDLFLAGS=37,1624 +COBOLFLAGS=38,1827 +POSTSCRIPTFLAGS=39,1889 +TCLFLAGS=40,1943 +GETOPTOBJS=42,2002 +RXINCLUDE=43,2034 +REGEXOBJS=44,2056 +CHECKOBJS=46,2075 +CHECKFLAGS=47,2105 +OBJS=48,2145 CPPFLAGS=49,2190 LDFLAGS=50,2259 +WARNINGS=51,2282 +CFLAGS=52,2466 FASTCFLAGS=55,2530 +FASTCFLAGSWARN=56,2591 FILTER=58,2641 - @-$($72,3063 - @-$($73,3112 - @-$($74,3176 - @-$($75,3222 - @-$($76,3290 - @-$($77,3382 - @$(81,3465 - @$(82,3513 - @$(83,3576 - @$(84,3621 - @$(85,3688 - @$(86,3779 -${CHECKOBJS}: CFLAGS=88,3805 - @env CHECKEROPTS=92,3921 - @$(98,4093 - @$(106,4249 - @$(110,4373 - @$(114,4499 - @for i in $(140,5320 - @for i in $(SRCS); do echo $$i;140,5320 - $(160,6058 - $(163,6119 - $(166,6182 - $(169,6233 - $(172,6322 - sdiff --suppress-common-lines --width=width186,6619 - sdiff --suppress-common-lines --width=width189,6708 - sdiff --suppress-common-lines --width=width192,6796 - sdiff --suppress-common-lines --width=width195,6885 - TEXTAGS=204,7127 - TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127 - ${RUN} etags12 --members -o $@ --regex=regex207,7244 - ${RUN} ./ctags -o $@ --regex=regex213,7393 - ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469 - TEXTAGS=219,7588 - TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588 - ${RUN} ./extags -e --regex-c=c222,7715 +REGEX=59,2695 +xx=60,2741 +MAKE:MAKE62,2790 +RUN=63,2825 +RUN=64,2865 +OPTIONS=65,2870 +ARGS=66,2922 +infiles 68,2940 +quiettest:quiettest70,3002 +test:test79,3409 +${CHECKOBJS}:${CHECKOBJS}88,3805 +checker:checker90,3849 +standalone:standalone96,4062 +prof:prof101,4168 +fastetags:fastetags104,4198 +fastctags:fastctags108,4322 +staticetags:staticetags112,4446 +rsynctofly:rsynctofly116,4608 +rsyncfromfly:rsyncfromfly119,4698 +web ftp publish:web ftp publish122,4794 +release distrib:release distrib129,5115 +tags:tags134,5255 +clean:clean136,5267 +srclist:srclist139,5302 +regexfile:regexfile143,5391 +/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566 +/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825 +regex.o:regex.o159,6031 +getopt.o:getopt.o162,6086 +getopt1.o:getopt1.o165,6147 +etags:etags168,6210 +ctags:ctags171,6299 +man manpage:man manpage174,6396 +etags.1.man:etags.1.man176,6422 +maintaining.info:maintaining.info179,6475 +TAGS:TAGS182,6557 +%ediff:%ediff185,6587 +oediff:oediff188,6677 +%cdiff:%cdiff191,6764 +xdiff:xdiff194,6854 +ETAGS:ETAGS197,6942 +ETAGS%:ETAGS%200,7012 +ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084 +ETAGS12:ETAGS12206,7216 +OTAGS:OTAGS209,7304 +CTAGS:CTAGS212,7369 +CTAGS%:CTAGS%215,7443 +CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545 +EXTAGS:EXTAGS221,7680 +.PRECIOUS:.PRECIOUS224,7838 +FRC:FRC226,7894 objc-src/Subprocess.h,98 #define Subprocess 41,1217 @@ -4091,7 +4142,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ruby,635 +ruby-src/test1.ru,635 class A1,0 def a(2,8 def b(5,38 diff --git a/test/etags/ETAGS.good_6 b/test/etags/ETAGS.good_6 index 84b73198a4c..cb1264f3e00 100644 --- a/test/etags/ETAGS.good_6 +++ b/test/etags/ETAGS.good_6 @@ -3415,50 +3415,101 @@ function Square.something:Bar Bar14,148 local function test.me22b 25,297 local function test.me22b me22b25,297 -make-src/Makefile,1156 +make-src/Makefile,2175 LATEST=1,0 +RELEASELIST=2,10 +ADASRC=4,104 +ASRC=5,171 +CSRC=6,197 +CPSRC=10,423 +ELSRC=13,614 +ERLSRC=14,661 +FORTHSRC=15,702 +FSRC=16,726 +HTMLSRC=17,776 +JAVASRC=18,844 +LUASRC=19,907 +MAKESRC=20,926 +OBJCSRC=21,943 +OBJCPPSRC=22,999 +PASSRC=23,1035 +PERLSRC=24,1053 +PHPSRC=25,1108 +PSSRC=26,1156 +PROLSRC=27,1173 +PYTSRC=28,1210 +TEXSRC=29,1227 +YSRC=30,1282 +SRCS=31,1325 NONSRCS=35,1577 +VHDLFLAGS=37,1624 +COBOLFLAGS=38,1827 +POSTSCRIPTFLAGS=39,1889 +TCLFLAGS=40,1943 +GETOPTOBJS=42,2002 +RXINCLUDE=43,2034 +REGEXOBJS=44,2056 +CHECKOBJS=46,2075 +CHECKFLAGS=47,2105 +OBJS=48,2145 CPPFLAGS=49,2190 LDFLAGS=50,2259 +WARNINGS=51,2282 +CFLAGS=52,2466 FASTCFLAGS=55,2530 +FASTCFLAGSWARN=56,2591 FILTER=58,2641 - @-$($72,3063 - @-$($73,3112 - @-$($74,3176 - @-$($75,3222 - @-$($76,3290 - @-$($77,3382 - @$(81,3465 - @$(82,3513 - @$(83,3576 - @$(84,3621 - @$(85,3688 - @$(86,3779 -${CHECKOBJS}: CFLAGS=88,3805 - @env CHECKEROPTS=92,3921 - @$(98,4093 - @$(106,4249 - @$(110,4373 - @$(114,4499 - @for i in $(140,5320 - @for i in $(SRCS); do echo $$i;140,5320 - $(160,6058 - $(163,6119 - $(166,6182 - $(169,6233 - $(172,6322 - sdiff --suppress-common-lines --width=width186,6619 - sdiff --suppress-common-lines --width=width189,6708 - sdiff --suppress-common-lines --width=width192,6796 - sdiff --suppress-common-lines --width=width195,6885 - TEXTAGS=204,7127 - TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127 - ${RUN} etags12 --members -o $@ --regex=regex207,7244 - ${RUN} ./ctags -o $@ --regex=regex213,7393 - ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469 - TEXTAGS=219,7588 - TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588 - ${RUN} ./extags -e --regex-c=c222,7715 +REGEX=59,2695 +xx=60,2741 +MAKE:MAKE62,2790 +RUN=63,2825 +RUN=64,2865 +OPTIONS=65,2870 +ARGS=66,2922 +infiles 68,2940 +quiettest:quiettest70,3002 +test:test79,3409 +${CHECKOBJS}:${CHECKOBJS}88,3805 +checker:checker90,3849 +standalone:standalone96,4062 +prof:prof101,4168 +fastetags:fastetags104,4198 +fastctags:fastctags108,4322 +staticetags:staticetags112,4446 +rsynctofly:rsynctofly116,4608 +rsyncfromfly:rsyncfromfly119,4698 +web ftp publish:web ftp publish122,4794 +release distrib:release distrib129,5115 +tags:tags134,5255 +clean:clean136,5267 +srclist:srclist139,5302 +regexfile:regexfile143,5391 +/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566 +/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825 +regex.o:regex.o159,6031 +getopt.o:getopt.o162,6086 +getopt1.o:getopt1.o165,6147 +etags:etags168,6210 +ctags:ctags171,6299 +man manpage:man manpage174,6396 +etags.1.man:etags.1.man176,6422 +maintaining.info:maintaining.info179,6475 +TAGS:TAGS182,6557 +%ediff:%ediff185,6587 +oediff:oediff188,6677 +%cdiff:%cdiff191,6764 +xdiff:xdiff194,6854 +ETAGS:ETAGS197,6942 +ETAGS%:ETAGS%200,7012 +ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084 +ETAGS12:ETAGS12206,7216 +OTAGS:OTAGS209,7304 +CTAGS:CTAGS212,7369 +CTAGS%:CTAGS%215,7443 +CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545 +EXTAGS:EXTAGS221,7680 +.PRECIOUS:.PRECIOUS224,7838 +FRC:FRC226,7894 objc-src/Subprocess.h,98 #define Subprocess 41,1217 @@ -4091,7 +4142,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ruby,635 +ruby-src/test1.ru,635 class A1,0 def a(2,8 def b(5,38 diff --git a/test/etags/Makefile b/test/etags/Makefile index 21a77eb0c5d..6e335711ff2 100644 --- a/test/etags/Makefile +++ b/test/etags/Makefile @@ -24,7 +24,7 @@ PHPSRC=$(addprefix ./php-src/,lce_functions.php ptest.php sendmail.php) PSSRC=$(addprefix ./ps-src/,rfc1245.ps) PROLSRC=$(addprefix ./prol-src/,ordsets.prolog natded.prolog) PYTSRC=$(addprefix ./pyt-src/,server.py) -RBSRC=$(addprefix ./ruby-src/,test.rb test1.ruby) +RBSRC=$(addprefix ./ruby-src/,test.rb test1.ru) TEXSRC=$(addprefix ./tex-src/,testenv.tex gzip.texi texinfo.tex nonewline.tex) YSRC=$(addprefix ./y-src/,parse.y parse.c atest.y cccp.c cccp.y) SRCS=${ADASRC} ${ASRC} ${CSRC} ${CPSRC} ${ELSRC} ${ERLSRC} ${FSRC}\ -- 2.39.2