[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0acb538 1/2: Add etags test for the new -Q option
|
From: |
Eli Zaretskii |
|
Subject: |
[Emacs-diffs] master 0acb538 1/2: Add etags test for the new -Q option |
|
Date: |
Sat, 30 May 2015 12:03:02 +0000 |
branch: master
commit 0acb538bb058aa2b961ab183d7473cdf4a820a79
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Add etags test for the new -Q option
* 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/CTAGS.good: Adjust to
test-case changes below.
* test/etags/ETAGS.good_6: New file.
* test/etags/cp-src/x.cc: New file.
* test/etags/Makefile (CPSRC): Add x.cc.
(check): Add one more test, for -Q.
---
test/etags/CTAGS.good | 4 +
test/etags/ETAGS.good_1 | 6 +
test/etags/ETAGS.good_2 | 8 +
test/etags/ETAGS.good_3 | 6 +
test/etags/ETAGS.good_4 | 6 +
test/etags/ETAGS.good_5 | 8 +
test/etags/{ETAGS.good_5 => ETAGS.good_6} | 456 +++++++++++++++--------------
test/etags/Makefile | 3 +-
test/etags/cp-src/x.cc | 26 ++
9 files changed, 298 insertions(+), 225 deletions(-)
diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good
index 52c335a..9291d34 100644
--- a/test/etags/CTAGS.good
+++ b/test/etags/CTAGS.good
@@ -931,6 +931,7 @@ MoveLayerAfter lua-src/allegro.lua /^function
MoveLayerAfter (this_one)$/
MoveLayerBefore lua-src/allegro.lua /^function MoveLayerBefore
(this_one)$/
MoveLayerBottom lua-src/allegro.lua /^function MoveLayerBottom ()$/
MoveLayerTop lua-src/allegro.lua /^function MoveLayerTop ()$/
+Mx.cc cp-src/x.cc /^main(int argc, char *argv[])$/
NAME y-src/cccp.c 8
NATNUMP c-src/emacs/src/lisp.h /^NATNUMP (Lisp_Object x)$/
NDEBUG c-src/etags.c 88
@@ -1508,6 +1509,7 @@ XTYPE c-src/emacs/src/lisp.h /^XTYPE (Lisp_Object
a)$/
XUNTAG c-src/emacs/src/lisp.h /^# define XUNTAG(a, type) lisp_h_XUNTAG (a,
type)$/
XUNTAG c-src/emacs/src/lisp.h /^XUNTAG (Lisp_Object a, int type)$/
XWINDOW c-src/emacs/src/lisp.h /^XWINDOW (Lisp_Object a)$/
+XX cp-src/x.cc 1
Y c-src/h.h 100
YACC c-src/etags.c 2199
YELLOW cp-src/screen.hpp 26
@@ -2486,6 +2488,7 @@ backslash=0 tex-src/texinfo.tex
/^\\let\\indexbackslash=0 %overridden during \\
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()$/
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; }$/
@@ -2923,6 +2926,7 @@ foo c-src/h.h 18
foo cp-src/c.C 68
foo cp-src/c.C 79
foo cp-src/c.C /^ foo() {$/
+foo cp-src/x.cc /^XX::foo()$/
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()$/
diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1
index a8e826f..e1e0daf 100644
--- a/test/etags/ETAGS.good_1
+++ b/test/etags/ETAGS.good_1
@@ -1950,6 +1950,12 @@ 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,124
::dummy::dummy test::dummy1(dummy11,0
::dummy::dummy test::dummy2(dummy26,64
diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2
index 73336b7..8b07422 100644
--- a/test/etags/ETAGS.good_2
+++ b/test/etags/ETAGS.good_2
@@ -2463,6 +2463,14 @@ 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,102
+class XX1,0
+ int foo(4,19
+ void bar(5,35
+XX::foo(foo9,60
+XX::bar(bar15,95
+main(21,126
+
cp-src/burton.cpp,124
::dummy::dummy test::dummy1(dummy11,0
::dummy::dummy test::dummy2(dummy26,64
diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3
index 950ed4f..37eaafb 100644
--- a/test/etags/ETAGS.good_3
+++ b/test/etags/ETAGS.good_3
@@ -2248,6 +2248,12 @@ 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,124
::dummy::dummy test::dummy1(dummy11,0
::dummy::dummy test::dummy2(dummy26,64
diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4
index 01b2761..2b631d1 100644
--- a/test/etags/ETAGS.good_4
+++ b/test/etags/ETAGS.good_4
@@ -2114,6 +2114,12 @@ 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,124
::dummy::dummy test::dummy1(dummy11,0
::dummy::dummy test::dummy2(dummy26,64
diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5
index d840172..544a166 100644
--- a/test/etags/ETAGS.good_5
+++ b/test/etags/ETAGS.good_5
@@ -2925,6 +2925,14 @@ 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,102
+class XX1,0
+ int foo(4,19
+ void bar(5,35
+XX::foo(foo9,60
+XX::bar(bar15,95
+main(21,126
+
cp-src/burton.cpp,124
::dummy::dummy test::dummy1(dummy11,0
::dummy::dummy test::dummy2(dummy26,64
diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_6
similarity index 95%
copy from test/etags/ETAGS.good_5
copy to test/etags/ETAGS.good_6
index d840172..f3d17b1 100644
--- a/test/etags/ETAGS.good_5
+++ b/test/etags/ETAGS.good_6
@@ -2825,37 +2825,37 @@ int extvar;109,2053
struct re_pattern_buffer 119,2277
struct re_pattern_buffer { unsigned char *buffer;buffer119,2277
-cp-src/c.C,3133
+cp-src/c.C,3629
template <typename ipc3dIslandHierarchy,1,0
template <typename ipc3dIslandHierarchy, typename ipc3dChannelType,1,0
template <typename ipc3dIslandHierarchy, typename ipc3dChannelType, unsigned
numOfChannels,1,0
template <typename ipc3dIslandHierarchy, typename ipc3dChannelType, unsigned
numOfChannels, typename ipc3dLinkControl,1,0
class CMultiChannelCSC19_3D2,151
- ipc3dLinkControlSetup setup;5,190
- ipc3dCSC19<ipc3dCSC196,227
-
ipc3dCSC19<ipc3dIslandHierarchy,ipcMultiChannel<ipc3dChannelType,numOfChannels>,ipcMultiChannel<ipc3dChannelType,numOfChannels>,ipc3dLinkControl>
mcCSC;6,227
- advTimer cscInitTime;7,388
- advTimer cscSegmentationTime;8,418
- advTimer outputTime;9,456
- void execute(11,493
+ ipc3dLinkControlSetup setup;CMultiChannelCSC19_3D::setup5,190
+ ipc3dCSC19<CMultiChannelCSC19_3D::ipc3dCSC196,227
+
ipc3dCSC19<ipc3dIslandHierarchy,ipcMultiChannel<ipc3dChannelType,numOfChannels>,ipcMultiChannel<ipc3dChannelType,numOfChannels>,ipc3dLinkControl>
mcCSC;CMultiChannelCSC19_3D::mcCSC6,227
+ advTimer cscInitTime;CMultiChannelCSC19_3D::cscInitTime7,388
+ advTimer
cscSegmentationTime;CMultiChannelCSC19_3D::cscSegmentationTime8,418
+ advTimer outputTime;CMultiChannelCSC19_3D::outputTime9,456
+ void execute(CMultiChannelCSC19_3D::execute11,493
static void my_function1(24,984
int main 25,1026
double base 26,1088
operator += operator +=29,1174
class TestRecord;31,1233
typedef struct s1 32,1251
- int counter;33,1271
+ int counter;s1::counter33,1271
} t1;34,1287
struct s2 35,1293
- int counter;36,1305
+ int counter;s2::counter36,1305
typedef struct s2 t2;38,1324
class A 39,1346
- enum { rosso,40,1356
- enum { rosso, giallo,40,1356
- enum { rosso, giallo, verde 40,1356
- enum { rosso, giallo, verde } colori;40,1356
- const A& operator+(41,1396
-const A& A::operator+(operator+43,1431
+ enum { rosso,A::rosso40,1356
+ enum { rosso, giallo,A::giallo40,1356
+ enum { rosso, giallo, verde A::verde40,1356
+ enum { rosso, giallo, verde } colori;A::colori40,1356
+ const A& operator+(A::operator+41,1396
+const A& A::operator+(43,1431
void operator+(44,1467
void operator -(operator -45,1495
void operator int(operator int46,1524
@@ -2864,86 +2864,94 @@ int f(49,1571
int A<int>::f(f50,1590
A<float,B<int> > A<B<float>,int>::f(f51,1618
template <class C, int n> class AT 52,1668
-template <class C, int n> class AT { C t[t52,1668
+template <class C, int n> class AT { C t[AT::t52,1668
class AU 53,1716
-class AU { T x;53,1716
+class AU { T x;AU::x53,1716
class B<B54,1735
-class B<int> { void f(54,1735
+class B<int> { void f(B::f54,1735
const A::B::T& abt 55,1766
class A 56,1792
-class A { class B 56,1792
-class A { class B { int f(56,1792
+class A { class B A::B56,1792
+class A { class B { int f(A::B::f56,1792
class A 57,1827
- int get_data(58,1837
- A operator+(59,1861
+ int get_data(A::get_data58,1837
+ A operator+(A::operator+59,1861
is_muldiv_operation(61,1888
domain foo 68,1956
- void f(69,1969
-void A::A(A72,1990
+ void f(foo::f69,1969
+void A::A(72,1990
struct A 73,2005
-struct A { A(73,2005
+struct A { A(A::A73,2005
struct B 74,2023
-struct B { B(74,2023
-void B::B(B75,2042
-void BE_Node::BE_Node(BE_Node76,2057
+struct B { B(B::B74,2023
+void B::B(75,2042
+void BE_Node::BE_Node(76,2057
class BE_Node 77,2084
struct foo 79,2103
- int x;80,2116
+ int x;foo::x80,2116
class test 86,2157
- int f(87,2170
- int ff(89,2232
- int g(90,2255
+ int f(test::f87,2170
+ int ff(test::ff89,2232
+ int g(test::g90,2255
class AST_Root 92,2279
class AST_Root;96,2328
AST_ConcreteType::AST_ConcreteType(99,2394
AST_Array::AST_Array(107,2533
- void f(115,2734
+ void f(::f115,2734
struct A 117,2754
- ~A(118,2765
-A::~A(~A120,2778
+ ~A(A::~A118,2765
+A::~A(120,2778
struct B 122,2790
- ~B(123,2801
-enum {dog,dog126,2818
-enum {dog, cat}cat126,2818
+ ~B(B::~B123,2801
+enum {dog,::dog126,2818
+enum {dog, cat}::cat126,2818
enum {dog, cat} animals;126,2818
-struct {int teats;127,2843
+struct {int teats;::teats127,2843
struct {int teats;} cow;127,2843
class Boo 129,2869
- enum {dog,dog130,2881
- enum {dog, cat}cat130,2881
- enum {dog, cat} animals;130,2881
- struct {int treats;131,2910
- struct {int treats;} cow;131,2910
- int i,132,2940
- int i,a,132,2940
- int i,a,b;132,2940
- foo(133,2955
- Boo(137,2996
- Boo(138,3053
+ enum {dog,Boo::dog130,2881
+ enum {dog, cat}Boo::cat130,2881
+ enum {dog, cat} animals;Boo::animals130,2881
+ struct {int treats;Boo::treats131,2910
+ struct {int treats;} cow;Boo::cow131,2910
+ int i,Boo::i132,2940
+ int i,a,Boo::a132,2940
+ int i,a,b;Boo::b132,2940
+ foo(Boo::foo133,2955
+ Boo(Boo::Boo137,2996
+ Boo(Boo::Boo138,3053
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/burton.cpp,124
-::dummy::dummy test::dummy1(dummy11,0
-::dummy::dummy test::dummy2(dummy26,64
-::dummy::dummy test::dummy3(dummy311,143
+cp-src/x.cc,110
+class XX1,0
+ int foo(XX::foo4,19
+ void bar(XX::bar5,35
+XX::foo(9,60
+XX::bar(15,95
+main(21,126
-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
+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/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
ostream& operator << operator <<124,2707
istream& operator >> operator >>133,2943
bool isLeap 159,3543
@@ -2954,7 +2962,7 @@ void Debug 201,4523
int WorkingDays(211,4867
Date StartDay(226,5129
-cp-src/MDiagArray2.h,1194
+cp-src/MDiagArray2.h,1538
#define octave_MDiagArray2_h 29,870
#undef LTGT35,967
#define LTGT39,1031
@@ -2970,58 +2978,58 @@ operator - operator -66,1707
product 69,1808
operator - operator -72,1907
class MDiagArray2 78,2022
- 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<T>& operator = operator =95,2542
- DiagArray2<T>::operator = operator =97,2603
- operator MArray2<T> operator MArray2<T>101,2667
- operator += operator +=116,2966
- operator -= operator -=119,3057
- friend MDiagArray2<T> operator * operator *123,3174
- friend MDiagArray2<T> operator / operator /124,3253
- friend MDiagArray2<T> operator * operator *128,3384
- operator + operator +133,3544
- operator - operator -136,3640
- friend MDiagArray2<T> operator - operator -141,3803
+ 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<T>& operator = MDiagArray2::operator =95,2542
+ DiagArray2<T>::operator = MDiagArray2::operator =97,2603
+ operator MArray2<T> MDiagArray2::operator MArray2<T>101,2667
+ operator += MDiagArray2::operator +=116,2966
+ operator -= MDiagArray2::operator -=119,3057
+ friend MDiagArray2<T> operator * MDiagArray2::operator *123,3174
+ friend MDiagArray2<T> operator / MDiagArray2::operator /124,3253
+ friend MDiagArray2<T> operator * MDiagArray2::operator *128,3384
+ operator + MDiagArray2::operator +133,3544
+ operator - MDiagArray2::operator -136,3640
+ friend MDiagArray2<T> operator - MDiagArray2::operator -141,3803
#undef LTGT144,3874
#define INSTANTIATE_MDIAGARRAY_FRIENDS(146,3887
-cp-src/Range.h,784
+cp-src/Range.h,1136
#define octave_Range_h 24,765
class istream;30,840
class ostream;31,855
class Matrix;32,870
Range35,891
- 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
- bool all_elements_are_ints 59,1571
- Matrix matrix_value 61,1615
- double min 63,1652
- double max 64,1679
- void sort 66,1707
- void set_base 68,1728
- void set_limit 69,1774
- void set_inc 70,1821
- friend ostream& operator << operator <<72,1867
- friend istream& operator >> operator >>73,1928
- void print_range 75,1984
- double rng_base;79,2023
- double rng_limit;80,2042
- double rng_inc;81,2062
- int rng_nelem;83,2081
- int nelem_internal 85,2099
+ 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
+ bool all_elements_are_ints Range::all_elements_are_ints59,1571
+ Matrix matrix_value Range::matrix_value61,1615
+ double min Range::min63,1652
+ double max Range::max64,1679
+ void sort Range::sort66,1707
+ void set_base Range::set_base68,1728
+ void set_limit Range::set_limit69,1774
+ void set_inc Range::set_inc70,1821
+ friend ostream& operator << Range::operator <<72,1867
+ friend istream& operator >> Range::operator >>73,1928
+ void print_range Range::print_range75,1984
+ double rng_base;Range::rng_base79,2023
+ double rng_limit;Range::rng_limit80,2042
+ double rng_inc;Range::rng_inc81,2062
+ int rng_nelem;Range::rng_nelem83,2081
+ int nelem_internal Range::nelem_internal85,2099
extern Range operator - operator -88,2138
cp-src/screen.cpp,228
@@ -3034,25 +3042,25 @@ void cursor_position(32,836
void clear_screen(41,997
void write_xyc(55,1247
-cp-src/screen.hpp,538
+cp-src/screen.hpp,791
#define __COLORS9,401
enum COLORS 11,419
- 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
+ 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
#define SCREEN_FP(31,700
#define SCREEN_START 33,795
void goto_xy(35,835
@@ -3061,96 +3069,96 @@ void cursor_position(37,907
void clear_screen(38,935
void write_xyc(39,960
-cp-src/conway.cpp,288
+cp-src/conway.cpp,270
#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(total_surrounding20,550
+int site::total_surrounding(20,550
void display(37,958
void glider(50,1239
void traffic_light(59,1478
void main(67,1633
-cp-src/conway.hpp,322
+cp-src/conway.hpp,483
class site:site5,235
- char x,7,269
- char x, y,7,269
- char x, y, alive,7,269
- char x, y, alive, next_alive;7,269
- int total_surrounding(8,303
- site(10,344
- ~site(11,397
- char read(12,410
- void set(13,444
- void clear(14,478
- void compute_next_state(15,514
- void step(22,717
+ char x,site::x7,269
+ char x, y,site::y7,269
+ char x, y, alive,site::alive7,269
+ char x, y, alive, next_alive;site::next_alive7,269
+ int total_surrounding(site::total_surrounding8,303
+ site(site::site10,344
+ ~site(site::~site11,397
+ 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
-cp-src/clheir.cpp,359
+cp-src/clheir.cpp,307
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(clear_neighbors31,852
-generic_object::generic_object(generic_object36,981
-generic_object::~generic_object(~generic_object48,1255
-void agent::move(move53,1353
+void discrete_location::clear_neighbors(31,852
+generic_object::generic_object(36,981
+generic_object::~generic_object(48,1255
+void agent::move(53,1353
-cp-src/clheir.hpp,990
+cp-src/clheir.hpp,1600
extern void init_registry(10,452
extern void step_everybody(11,485
class generic_object13,520
- int where_in_registry;15,547
- generic_object(17,582
- ~generic_object(19,724
- virtual void compute_next_state(21,842
- virtual void step(22,888
+ int where_in_registry;generic_object::where_in_registry15,547
+ generic_object(generic_object::generic_object17,582
+ ~generic_object(generic_object::~generic_object19,724
+ virtual void compute_next_state(generic_object::compute_next_state21,842
+ virtual void step(generic_object::step22,888
const int max_num_directions 31,1219
class location:location33,1289
- location(43,1642
- ~location(44,1661
+ location(location::location43,1642
+ ~location(location::~location44,1661
class irregular_location:irregular_location47,1686
- double x,49,1734
- double x, y,49,1734
- double x, y, z;49,1734
- irregular_location(51,1762
- ~irregular_location(53,1854
+ double x,irregular_location::x49,1734
+ double x, y,irregular_location::y49,1734
+ double x, y, z;irregular_location::z49,1734
+ irregular_location(irregular_location::irregular_location51,1762
+ ~irregular_location(irregular_location::~irregular_location53,1854
class discrete_location:discrete_location56,1889
- int x,58,1936
- int x, y,58,1936
- int x, y, z;58,1936
- class location *neighbors[neighbors59,1953
- void clear_neighbors(60,2004
- discrete_location(62,2044
- ~discrete_location(65,2154
- void assign_neighbor(66,2184
+ int x,discrete_location::x58,1936
+ int x, y,discrete_location::y58,1936
+ int x, y, z;discrete_location::z58,1936
+ class location *neighbors[discrete_location::neighbors59,1953
+ void clear_neighbors(discrete_location::clear_neighbors60,2004
+ discrete_location(discrete_location::discrete_location62,2044
+ ~discrete_location(discrete_location::~discrete_location65,2154
+ void assign_neighbor(discrete_location::assign_neighbor66,2184
class agent:agent75,2508
- location *where;where77,2549
- agent(79,2578
- ~agent(80,2591
- void move(81,2605
+ location *where;agent::where77,2549
+ agent(agent::agent79,2578
+ ~agent(agent::~agent80,2591
+ void move(agent::move81,2605
-cp-src/fail.C,351
+cp-src/fail.C,438
struct A 7,263
- struct B 8,274
- struct C 9,289
- int x;10,305
- C(11,318
- operator int(operator int12,342
- typedef C T;14,389
- typedef B T2;16,414
+ struct B A::B8,274
+ struct C A::B::C9,289
+ int x;A::B::C::x10,305
+ 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
class String;20,437
class A 23,453
- class B 24,463
- class C 25,474
- int f(26,488
-int A::B::f(f31,521
+ class B A::B24,463
+ class C A::B::C25,474
+ int f(A::B::f26,488
+int A::B::f(31,521
main(37,571
class D 41,622
- D(43,659
- int x;44,694
+ D(D::D43,659
+ int x;D::x44,694
el-src/TAGTEST.EL,148
(foo::defmumble bletch 1,0
@@ -3428,23 +3436,23 @@ objc-src/Subprocess.h,98
#define BUFFERSIZE 43,1267
@interface Subprocess:Subprocess45,1292
-objc-src/Subprocess.m,476
+objc-src/Subprocess.m,505
#define PTY_TEMPLATE 20,494
#define PTY_LENGTH 21,528
static void showError(23,551
address@hidden Subprocess(Private)32,737
address@hidden Subprocess(Private)Subprocess(Private)32,737
- childDidExit39,851
-- fdHandler:fdHandler67,1589
+- fdHandler:67,1589
showError 98,2360
fdHandler 112,2785
getptys 119,2907
-- init:init183,4815
- andStdErr:init197,5147
-- send:(const char *)string withNewline:send300,7436
-- send:send308,7599
+- init:183,4815
+ andStdErr:init:withDelegate:andPtySupport:andStdErr:197,5147
+- send:(const char *)string withNewline:send:withNewline:300,7436
+- send:308,7599
- terminateInput314,7689
-- terminate:terminate321,7810
-- setDelegate:setDelegate332,7961
+- terminate:321,7810
+- setDelegate:332,7961
- delegate338,8031
objc-src/PackInsp.h,109
@@ -3452,7 +3460,7 @@ objc-src/PackInsp.h,109
#define TYPESTOSTAT 37,1120
@interface PackageInspector:PackageInspector39,1172
-objc-src/PackInsp.m,1322
+objc-src/PackInsp.m,1360
static const char RCSid[RCSid30,1032
#define VERSION 34,1116
# define DEBUG 37,1155
@@ -3469,46 +3477,46 @@ static const char RCSid[RCSid30,1032
#define LOCALIZE(61,2585
#define LOCALIZE_ARCH(62,2668
+newnew67,2802
--showInfo:showInfo93,3417
--revert:revert107,3737
--ok:ok136,4297
+-showInfo:showInfo:93,3417
+-revert:revert:107,3737
+-ok:ok:136,4297
-loadload143,4424
#define LOOKUP(156,4826
#undef LOOKUP176,5694
--loadKeyValuesFrom:(const char *)type inTable:loadKeyValuesFrom186,5852
--loadContentsOf:(const char *)type inTable:loadContentsOf238,7079
+-loadKeyValuesFrom:(const char *)type
inTable:loadKeyValuesFrom:inTable:186,5852
+-loadContentsOf:(const char *)type inTable:loadContentsOf:inTable:238,7079
-loadImageloadImage257,7552
#define STAT_EQ(275,7940
-(BOOL)shouldLoad280,8116
-toggleDescriptiontoggleDescription301,8626
--(const char *)getPath:(char *)buf forType:getPath317,8899
+-(const char *)getPath:(char *)buf forType:getPath:forType:317,8899
-setRevertButtonTitlesetRevertButtonTitle333,9320
--(const char *)formatSize:(const char *)size inBuf:formatSize344,9525
+-(const char *)formatSize:(const char *)size inBuf:formatSize:inBuf:344,9525
#define WORKING 368,10045
-(void)getArchs370,10100
--(void)addArchs:addArchs385,10520
--subprocess:(Subprocess *)sender output:subprocess428,11351
--subprocessDone:subprocessDone436,11484
+-(void)addArchs:385,10520
+-subprocess:(Subprocess *)sender output:subprocess:output:428,11351
+-subprocessDone:subprocessDone:436,11484
static void openInWorkspace(446,11634
--open:open464,12063
+-open:open:464,12063
objcpp-src/SimpleCalc.H,41
@interface SimpleCalc:SimpleCalc14,400
-objcpp-src/SimpleCalc.M,445
+objcpp-src/SimpleCalc.M,300
- init52,1747
-- 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
+- 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
pas-src/common.pas,1875
procedure InitializeStringPackage;26,527
diff --git a/test/etags/Makefile b/test/etags/Makefile
index c305a8b..f326c90 100644
--- a/test/etags/Makefile
+++ b/test/etags/Makefile
@@ -4,7 +4,7 @@ CSRC=$(addprefix ./c-src/,abbrev.c .//c.c torture.c getopt.h
etags.c\
exit.c exit.strange_suffix sysdep.h tab.c dostorture.c\
emacs/src/gmalloc.c emacs/src/regex.h emacs/src/keyboard.c emacs/src/lisp.h\
machsyscalls.c machsyscalls.h fail.c a/b/b.c) ../etags/c-src/h.h
-CPSRC=$(addprefix ./cp-src/,c.C burton.cpp burton.cpp\
+CPSRC=$(addprefix ./cp-src/,c.C x.cc burton.cpp burton.cpp\
functions.cpp MDiagArray2.h Range.h\
screen.cpp screen.hpp conway.cpp conway.hpp clheir.cpp.gz clheir.hpp.gz
fail.C)
ELSRC=$(addprefix ./el-src/,TAGTEST.EL emacs/lisp/progmodes/etags.el)
@@ -53,6 +53,7 @@ check:
@$(MAKE) OPTIONS='--members' ediff_3
@$(MAKE) OPTIONS='address@hidden --no-members' ediff_4
@$(MAKE) OPTIONS='nonexistent --members --declarations address@hidden'
ediff_5
+ @$(MAKE) OPTIONS='--class-qualify --members --declarations
address@hidden' ediff_6
@$(MAKE) cdiff
ediff%: ETAGS.good% ETAGS ${infiles}
diff --git a/test/etags/cp-src/x.cc b/test/etags/cp-src/x.cc
new file mode 100644
index 0000000..a236060
--- /dev/null
+++ b/test/etags/cp-src/x.cc
@@ -0,0 +1,26 @@
+class XX
+{
+public:
+ int foo();
+ void bar();
+};
+
+int
+XX::foo()
+{
+ return 1;
+}
+
+void
+XX::bar()
+{
+ foo();
+}
+
+int
+main(int argc, char *argv[])
+{
+ XX xx;
+ xx.bar();
+ return 0;
+}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 0acb538 1/2: Add etags test for the new -Q option,
Eli Zaretskii <=