X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/17bbb94dca3a8e6af53912a3a8180f9c4c4d9592..358794e5a75e96eb512ec3c64efcc10deaa8383a:/test/etags/ETAGS.good_4 diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4 index 5d31c36643..2b631d1a16 100644 --- a/test/etags/ETAGS.good_4 +++ b/test/etags/ETAGS.good_4 @@ -1,46 +1,4 @@ -Makefile,683 -ADASRC=1,0 -ASRC=2,91 -CSRC=3,139 -CPSRC=7,410 -ELSRC=10,584 -ERLSRC=11,654 -FORTHSRC=12,699 -FSRC=13,749 -HTMLSRC=14,821 -LUASRC=16,950 -MAKESRC=17,993 -OBJCSRC=18,1035 -OBJCPPSRC=19,1116 -PASSRC=20,1179 -PERLSRC=21,1221 -PHPSRC=22,1291 -PSSRC=23,1363 -PROLSRC=24,1403 -PYTSRC=25,1465 -TEXSRC=26,1506 -YSRC=27,1585 -SRCS=28,1650 -NONSRCS=32,1902 -ETAGS_PROG=34,1976 -CTAGS_PROG=35,2007 -REGEX=37,2039 -xx=38,2085 -RUN=40,2134 -OPTIONS=42,2140 -ARGS=43,2192 -infiles 45,2210 -check:check47,2272 -ediff%:ediff%55,2575 -cdiff:cdiff58,2676 -ETAGS:ETAGS61,2773 -CTAGS:CTAGS64,2843 -srclist:srclist67,2921 -regexfile:regexfile71,3012 -.PRECIOUS:.PRECIOUS77,3189 -FRC:FRC79,3223 - ada-src/etags-test-for.ada,1969 type LL_Task_Procedure_Access LL_Task_Procedure_Access/t1,0 function Body_RequiredBody_Required/f3,78 @@ -645,18 +603,18 @@ char **tab_fill(tab_fill70,1129 int tab_delete_first(91,1638 int tab_count_words(103,1820 -c-src/dostorture.c,197 -(*tag1 tag118,451 -#define notag2 26,552 -(*tag2 tag229,629 -(*tag3 tag339,771 -#define notag4 45,860 -(*tag4 tag448,954 -tag5 57,1080 -tag6 66,1207 -int pp1(74,1316 -pp287,1418 -pp3(100,1517 +c-src/dostorture.c,198 +(*tag1 tag118,468 +#define notag2 26,577 +(*tag2 tag229,657 +(*tag3 tag339,809 +#define notag4 45,904 +(*tag4 tag448,1001 +tag5 57,1136 +tag6 66,1272 +int pp1(74,1389 +pp287,1504 +pp3(100,1616 c-src/emacs/src/gmalloc.c,3539 #define USE_PTHREAD25,1002 @@ -2086,13 +2044,13 @@ int extvar;109,2053 #define UNDEFINED118,2259 struct re_pattern_buffer 119,2277 -cp-src/c.C,2225 +cp-src/c.C,2094 template > A,int>::f(f51,1618 template class AT 52,1668 class AU 53,1716 class B<B54,1735 -class B { void f(B::f54,1735 -const A::B::T& abt 55,1765 -class A 56,1791 -class A { class B A::B56,1791 -class A 57,1826 - A operator+(A::operator+59,1860 -is_muldiv_operation(61,1887 -domain foo 68,1955 - void f(foo::f69,1968 -void A::A(72,1989 -struct A 73,2004 -struct B 74,2022 -void B::B(75,2041 -void BE_Node::BE_Node(76,2056 -class BE_Node 77,2083 -struct foo 79,2102 -class test 86,2156 - int f(test::f87,2169 - int ff(test::ff89,2231 - int g(test::g90,2254 -class AST_Root 92,2278 -AST_ConcreteType::AST_ConcreteType(99,2393 -AST_Array::AST_Array(107,2532 - void f(::f115,2733 -struct A 117,2753 -A::~A(120,2777 -struct B 122,2789 - ~B(B::~B123,2800 -enum {dog,::dog126,2817 -enum {dog, cat}::cat126,2817 -enum {dog, cat} animals;126,2817 -struct {int teats;} cow;127,2842 -class Boo 129,2868 - enum {dog,Boo::dog130,2880 - enum {dog, cat}Boo::cat130,2880 - foo(Boo::foo133,2954 - Boo(Boo::Boo137,2995 -Boo::Boo(141,3070 -typedef int should_see_this_one_enclosed_in_extern_C;149,3155 -typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228 -typedef int should_see_this_array_type[should_see_this_array_type156,3310 +class B { void f(54,1735 +const A::B::T& abt 55,1766 +class A 56,1792 +class A { class B 56,1792 +class A 57,1827 + A operator+(59,1861 +is_muldiv_operation(61,1888 +domain foo 68,1956 + void f(69,1969 +void A::A(A72,1990 +struct A 73,2005 +struct B 74,2023 +void B::B(B75,2042 +void BE_Node::BE_Node(BE_Node76,2057 +class BE_Node 77,2084 +struct foo 79,2103 +class test 86,2157 + int f(87,2170 + int ff(89,2232 + int g(90,2255 +class AST_Root 92,2279 +AST_ConcreteType::AST_ConcreteType(99,2394 +AST_Array::AST_Array(107,2533 + void f(115,2734 +struct A 117,2754 +A::~A(~A120,2778 +struct B 122,2790 + ~B(123,2801 +enum {dog,dog126,2818 +enum {dog, cat}cat126,2818 +enum {dog, cat} animals;126,2818 +struct {int teats;} cow;127,2843 +class Boo 129,2869 + enum {dog,dog130,2881 + enum {dog, cat}cat130,2881 + foo(133,2955 + Boo(137,2996 +Boo::Boo(141,3071 +typedef int should_see_this_one_enclosed_in_extern_C;149,3156 +typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229 +typedef int should_see_this_array_type[should_see_this_array_type156,3311 + +cp-src/x.cc,63 +class XX1,0 +XX::foo(foo9,60 +XX::bar(bar15,95 +main(21,126 -cp-src/burton.cpp,103 -::dummy::dummy test::dummy1(1,0 -::dummy::dummy test::dummy2(6,64 -::dummy::dummy test::dummy3(11,143 +cp-src/burton.cpp,124 +::dummy::dummy test::dummy1(dummy11,0 +::dummy::dummy test::dummy2(dummy26,64 +::dummy::dummy test::dummy3(dummy311,143 -cp-src/functions.cpp,807 -void Date::setDate 5,148 -void Date::plus 32,939 -void Date::minus 42,1229 -void Date::shift 52,1407 -Date & Date::operator = Date::operator =62,1628 -Date & Date::operator += Date::operator +=69,1789 -Date & Date::operator -= Date::operator -=78,1939 -Date & Date::operator ++ Date::operator ++87,2080 -Date & Date::operator -- Date::operator --96,2216 -int Date::operator - Date::operator -104,2331 -int Date::operator < Date::operator <112,2483 -int Date::operator > Date::operator >116,2557 -int Date::operator == Date::operator ==120,2631 +cp-src/functions.cpp,778 +void Date::setDate setDate5,148 +void Date::plus plus32,939 +void Date::minus minus42,1229 +void Date::shift shift52,1407 +Date & Date::operator = operator =62,1628 +Date & Date::operator += operator +=69,1789 +Date & Date::operator -= operator -=78,1939 +Date & Date::operator ++ operator ++87,2080 +Date & Date::operator -- operator --96,2216 +int Date::operator - operator -104,2331 +int Date::operator < operator <112,2483 +int Date::operator > operator >116,2557 +int Date::operator == operator ==120,2631 ostream& operator << operator <<124,2707 istream& operator >> operator >>133,2943 bool isLeap 159,3543 @@ -2185,39 +2149,39 @@ void Debug 201,4523 int WorkingDays(211,4867 Date StartDay(226,5129 -cp-src/MDiagArray2.h,709 +cp-src/MDiagArray2.h,482 #define octave_MDiagArray2_h 29,870 #undef LTGT35,967 #define LTGT39,1031 #define LTGT 42,1051 class MDiagArray2 78,2022 - MDiagArray2 MDiagArray2::MDiagArray282,2077 - MDiagArray2 MDiagArray2::MDiagArray286,2154 - MDiagArray2 MDiagArray2::MDiagArray287,2198 - MDiagArray2 MDiagArray2::MDiagArray288,2254 - MDiagArray2 MDiagArray2::MDiagArray289,2329 - MDiagArray2 MDiagArray2::MDiagArray290,2387 - MDiagArray2 MDiagArray2::MDiagArray291,2450 - ~MDiagArray2 MDiagArray2::~MDiagArray293,2515 - MDiagArray2& operator = MDiagArray2::operator =95,2542 - operator MArray2 MDiagArray2::operator MArray2101,2667 + MDiagArray2 82,2077 + MDiagArray2 86,2154 + MDiagArray2 87,2198 + MDiagArray2 88,2254 + MDiagArray2 89,2329 + MDiagArray2 90,2387 + MDiagArray2 91,2450 + ~MDiagArray2 93,2515 + MDiagArray2& operator = operator =95,2542 + operator MArray2 operator MArray2101,2667 #undef LTGT144,3874 #define INSTANTIATE_MDIAGARRAY_FRIENDS(146,3887 -cp-src/Range.h,424 +cp-src/Range.h,275 #define octave_Range_h 24,765 Range35,891 - Range Range::Range39,909 - Range Range::Range42,995 - Range Range::Range46,1130 - Range Range::Range50,1248 - double base Range::base54,1376 - double limit Range::limit55,1425 - double inc Range::inc56,1475 - int nelem Range::nelem57,1523 - void set_base Range::set_base68,1728 - void set_limit Range::set_limit69,1774 - void set_inc Range::set_inc70,1821 + Range 39,909 + Range 42,995 + Range 46,1130 + Range 50,1248 + double base 54,1376 + double limit 55,1425 + double inc 56,1475 + int nelem 57,1523 + void set_base 68,1728 + void set_limit 69,1774 + void set_inc 70,1821 cp-src/screen.cpp,228 unsigned char cursor_x,15,548 @@ -2229,89 +2193,89 @@ void cursor_position(32,836 void clear_screen(41,997 void write_xyc(55,1247 -cp-src/screen.hpp,667 +cp-src/screen.hpp,414 #define __COLORS9,401 enum COLORS 11,419 - BLACK,COLORS::BLACK12,433 - BLUE,COLORS::BLUE13,471 - GREEN,COLORS::GREEN14,481 - CYAN,COLORS::CYAN15,492 - RED,COLORS::RED16,502 - MAGENTA,COLORS::MAGENTA17,511 - BROWN,COLORS::BROWN18,524 - LIGHTGRAY,COLORS::LIGHTGRAY19,535 - DARKGRAY,COLORS::DARKGRAY20,550 - LIGHTBLUE,COLORS::LIGHTBLUE21,589 - LIGHTGREEN,COLORS::LIGHTGREEN22,604 - LIGHTCYAN,COLORS::LIGHTCYAN23,620 - LIGHTRED,COLORS::LIGHTRED24,635 - LIGHTMAGENTA,COLORS::LIGHTMAGENTA25,649 - YELLOW,COLORS::YELLOW26,667 - WHITECOLORS::WHITE27,679 + BLACK,12,433 + BLUE,13,471 + GREEN,14,481 + CYAN,15,492 + RED,16,502 + MAGENTA,17,511 + BROWN,18,524 + LIGHTGRAY,19,535 + DARKGRAY,20,550 + LIGHTBLUE,21,589 + LIGHTGREEN,22,604 + LIGHTCYAN,23,620 + LIGHTRED,24,635 + LIGHTMAGENTA,25,649 + YELLOW,26,667 + WHITE27,679 #define SCREEN_FP(31,700 #define SCREEN_START 33,795 -cp-src/conway.cpp,270 +cp-src/conway.cpp,288 #define max(12,357 #define min(13,393 const int num_rows 15,430 const int num_columns 16,470 class site *field_of_play[field_of_play18,499 -int site::total_surrounding(20,550 +int site::total_surrounding(total_surrounding20,550 void display(37,958 void glider(50,1239 void traffic_light(59,1478 void main(67,1633 -cp-src/conway.hpp,244 +cp-src/conway.hpp,164 class site:site5,235 - site(site::site10,344 - char read(site::read12,410 - void set(site::set13,444 - void clear(site::clear14,478 - void compute_next_state(site::compute_next_state15,514 - void step(site::step22,717 + site(10,344 + char read(12,410 + void set(13,444 + void clear(14,478 + void compute_next_state(15,514 + void step(22,717 -cp-src/clheir.cpp,307 +cp-src/clheir.cpp,359 const int max_num_generic_objects 9,298 generic_object * object_registry[object_registry10,340 void init_registry(12,400 void step_everybody(19,527 -void discrete_location::clear_neighbors(31,852 -generic_object::generic_object(36,981 -generic_object::~generic_object(48,1255 -void agent::move(53,1353 +void discrete_location::clear_neighbors(clear_neighbors31,852 +generic_object::generic_object(generic_object36,981 +generic_object::~generic_object(~generic_object48,1255 +void agent::move(move53,1353 -cp-src/clheir.hpp,609 +cp-src/clheir.hpp,423 class generic_object13,520 - virtual void compute_next_state(generic_object::compute_next_state21,842 - virtual void step(generic_object::step22,888 + virtual void compute_next_state(21,842 + virtual void step(22,888 const int max_num_directions 31,1219 class location:location33,1289 - location(location::location43,1642 + location(43,1642 class irregular_location:irregular_location47,1686 - irregular_location(irregular_location::irregular_location51,1762 + irregular_location(51,1762 class discrete_location:discrete_location56,1889 - discrete_location(discrete_location::discrete_location62,2044 - void assign_neighbor(discrete_location::assign_neighbor66,2184 + discrete_location(62,2044 + void assign_neighbor(66,2184 class agent:agent75,2508 -cp-src/fail.C,365 +cp-src/fail.C,294 struct A 7,263 - struct B A::B8,274 - struct C A::B::C9,289 - C(A::B::C::C11,318 - operator int(A::B::C::operator int12,342 - typedef C T;A::B::T14,389 - typedef B T2;A::T216,414 + struct B 8,274 + struct C 9,289 + C(11,318 + operator int(operator int12,342 + typedef C T;14,389 + typedef B T2;16,414 class A 23,453 - class B A::B24,463 - class C A::B::C25,474 - int f(A::B::f26,488 -int A::B::f(31,521 + class B 24,463 + class C 25,474 + int f(26,488 +int A::B::f(f31,521 main(37,571 class D 41,622 - D(D::D43,659 + D(43,659 el-src/TAGTEST.EL,148 (foo::defmumble bletch 1,0 @@ -2462,10 +2426,12 @@ f-src/entry.strange_suffix,172 & intensity1(577,12231 character*(*) function foo(579,12307 -f-src/entry.strange,103 - ENTRY MSGSEL 193,4382 - & intensity1(375,8135 - character*(*) function foo(377,8211 +f-src/entry.strange,172 + LOGICAL FUNCTION PRTPKG 3,75 + ENTRY SETPRT 194,3866 + ENTRY MSGSEL 395,8478 + & intensity1(577,12231 + character*(*) function foo(579,12307 forth-src/test-forth.fth,408 : a-forth-word 20,301 @@ -2481,44 +2447,44 @@ constant (a-forth-constant(a-forth-constant38,628 code assemby-code-word 43,685 : a-forth-word 50,870 -html-src/softwarelibero.html,198 -Cos'è il software libero?4,38 -Licenze d'uso di un programmalicenze65,2474 -Sfatiamo alcuni miti138,6064 -Il movimento open sourceoss191,7968 -Impatto pratico del software liberoimpatto231,9986 +html-src/softwarelibero.html,200 +Cos'è il software libero?4,38 +Licenze d'uso di un programmalicenze65,2500 +Sfatiamo alcuni miti138,6118 +Il movimento open sourceoss191,8037 +Impatto pratico del software liberoimpatto231,10066 html-src/index.shtml,104  8,281 -In evidenza15,446 -Comunicati e iniziative32,974 -Ultime notizie dall'associazione63,2027 +In evidenza15,447 +Comunicati e iniziative32,976 +Ultime notizie dall'associazione63,2030 html-src/algrthms.html,467 -Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,276 -Descriptionalgorithms10,477 -Generating the Datagenalgorithm48,1953 -Convolutionallyconalgorithm55,2463 -Nextstatetable262,11331 -Outputoutputtable350,13571 -Mapping the Channel Symbolsmapping433,15786 -Adding Noise to theaddnoise439,16174 -Quantizing the Receivedquantizing469,18637 +Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,277 +Descriptionalgorithms10,481 +Generating the Datagenalgorithm48,1995 +Convolutionallyconalgorithm55,2512 +Nextstatetable262,11587 +Outputoutputtable350,13915 +Mapping the Channel Symbolsmapping433,16213 +Adding Noise to theaddnoise439,16607 +Quantizing the Receivedquantizing469,19100 -html-src/software.html,438 -Francesco Potortì Software Page9,280 -Software that I wrote for supporting my research activitysimulation36,1400 -MTGmtg41,1484 -Fracasfracas65,2626 -GaliLEOgalileo101,4234 -Leasqrleasqr114,4679 -Free software that I wrote for the GNU project or for my personal or workgnu142,6067 -Etagsetags148,6182 -checkiso161,6731 -cgrep178,7549 -debian-bug.eldebian-bug190,7981 -tcpdump205,8566 -Links to interesting softwarelinks216,8893 +html-src/software.html,439 +Francesco Potortì Software Page9,280 +Software that I wrote for supporting my research activitysimulation36,1398 +MTGmtg41,1482 +Fracasfracas65,2624 +GaliLEOgalileo101,4232 +Leasqrleasqr114,4677 +Free software that I wrote for the GNU project or for my personal or workgnu142,6065 +Etagsetags148,6180 +checkiso161,6729 +cgrep178,7547 +debian-bug.eldebian-bug190,7979 +tcpdump205,8564 +Links to interesting softwarelinks216,8891 lua-src/allegro.lua,400 local function get_layer_by_name 7,175 @@ -2583,22 +2549,22 @@ objc-src/Subprocess.h,98 #define BUFFERSIZE 43,1267 @interface Subprocess:Subprocess45,1292 -objc-src/Subprocess.m,475 +objc-src/Subprocess.m,446 #define PTY_TEMPLATE 20,494 #define PTY_LENGTH 21,528 -@interface Subprocess(Private)Subprocess(Private)32,737 +@interface Subprocess(Private)32,737 - childDidExit39,851 -- fdHandler:67,1589 +- fdHandler:fdHandler67,1589 showError 98,2360 fdHandler 112,2785 getptys 119,2907 -- init:183,4815 - andStdErr:init:withDelegate:andPtySupport:andStdErr:197,5147 -- send:(const char *)string withNewline:send:withNewline:300,7436 -- send:308,7599 +- init:init183,4815 + andStdErr:init197,5147 +- send:(const char *)string withNewline:send300,7436 +- send:send308,7599 - terminateInput314,7689 -- terminate:321,7810 -- setDelegate:332,7961 +- terminate:terminate321,7810 +- setDelegate:setDelegate332,7961 - delegate338,8031 objc-src/PackInsp.h,109 @@ -2606,7 +2572,7 @@ objc-src/PackInsp.h,109 #define TYPESTOSTAT 37,1120 @interface PackageInspector:PackageInspector39,1172 -objc-src/PackInsp.m,1360 +objc-src/PackInsp.m,1322 static const char RCSid[RCSid30,1032 #define VERSION 34,1116 # define DEBUG 37,1155 @@ -2623,46 +2589,46 @@ static const char RCSid[RCSid30,1032 #define LOCALIZE(61,2585 #define LOCALIZE_ARCH(62,2668 +newnew67,2802 --showInfo:showInfo:93,3417 --revert:revert:107,3737 --ok:ok:136,4297 +-showInfo:showInfo93,3417 +-revert:revert107,3737 +-ok:ok136,4297 -loadload143,4424 #define LOOKUP(156,4826 #undef LOOKUP176,5694 --loadKeyValuesFrom:(const char *)type inTable:loadKeyValuesFrom:inTable:186,5852 --loadContentsOf:(const char *)type inTable:loadContentsOf:inTable:238,7079 +-loadKeyValuesFrom:(const char *)type inTable:loadKeyValuesFrom186,5852 +-loadContentsOf:(const char *)type inTable:loadContentsOf238,7079 -loadImageloadImage257,7552 #define STAT_EQ(275,7940 -(BOOL)shouldLoad280,8116 -toggleDescriptiontoggleDescription301,8626 --(const char *)getPath:(char *)buf forType:getPath:forType:317,8899 +-(const char *)getPath:(char *)buf forType:getPath317,8899 -setRevertButtonTitlesetRevertButtonTitle333,9320 --(const char *)formatSize:(const char *)size inBuf:formatSize:inBuf:344,9525 +-(const char *)formatSize:(const char *)size inBuf:formatSize344,9525 #define WORKING 368,10045 -(void)getArchs370,10100 --(void)addArchs:385,10520 --subprocess:(Subprocess *)sender output:subprocess:output:428,11351 --subprocessDone:subprocessDone:436,11484 +-(void)addArchs:addArchs385,10520 +-subprocess:(Subprocess *)sender output:subprocess428,11351 +-subprocessDone:subprocessDone436,11484 static void openInWorkspace(446,11634 --open:open:464,12063 +-open:open464,12063 objcpp-src/SimpleCalc.H,41 @interface SimpleCalc:SimpleCalc14,400 -objcpp-src/SimpleCalc.M,300 +objcpp-src/SimpleCalc.M,445 - init52,1747 -- appendToDisplay:60,1933 -- registerAction:70,2210 -- decimalKey:77,2348 -- numberKeys:91,2661 -- equalsKey:112,3192 -- operationKeys:131,3680 -- clearKey:153,4301 -- clearAllKey:160,4410 -- appDidInit:168,4591 -- windowWillClose:178,4882 -- infoPanel:186,5132 -- helpPanel:198,5482 +- appendToDisplay:appendToDisplay60,1933 +- registerAction:registerAction70,2210 +- decimalKey:decimalKey77,2348 +- numberKeys:numberKeys91,2661 +- equalsKey:equalsKey112,3192 +- operationKeys:operationKeys131,3680 +- clearKey:clearKey153,4301 +- clearAllKey:clearAllKey160,4410 +- appDidInit:appDidInit168,4591 +- windowWillClose:windowWillClose178,4882 +- infoPanel:infoPanel186,5132 +- helpPanel:helpPanel198,5482 pas-src/common.pas,1875 procedure InitializeStringPackage;26,527 @@ -3894,7 +3860,7 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno % \global\def={=3306,107486 \def\normalbackslash{\normalbackslash3320,107868 -c-src//c.c,76 +c-src/c.c,76 T f(1,0 }T i;2,14 void bar(5,69