79c2c32df4
* c-exp.y: Include cp-support.h. Add qualified_type. (yylex): Delete nested type hack; add comments. * cp-namespace.c (cp_lookup_nested_type): New function. * cp-support.h: Declare cp_lookup_nested_type. * eval.c (evaluate_subexp_standard): Call value_aggregate_elt instead of value_struct_elt_for_reference. * valops.c: Include cp-support.h. (value_aggregate_elt): New function. (value_namespace_elt): Ditto. (value_struct_elt_for_reference): Make static. * value.h: Delete declaration of value_struct_elt_for_reference; add declaration for value_aggregate_elt. * Makefile.in (c-exp.tab.o): Depend on $(cp_support_h). (valops.o): Ditto. 2003-09-25 David Carlton <carlton@kealia.com> * gdb.cp/namespace.exp: Tweak comments. Add non-quoted versions of some print tests, where appropriate. Add tests for C::D::cd, E::ce, F::cXfX, G::XgX. * gdb.cp/namespace.cc: Add XgX, cXfX, ce.
182 lines
2 KiB
C++
182 lines
2 KiB
C++
namespace AAA {
|
|
char c;
|
|
int i;
|
|
int A_xyzq (int);
|
|
char xyzq (char);
|
|
class inA {
|
|
public:
|
|
int xx;
|
|
int fum (int);
|
|
};
|
|
};
|
|
|
|
int AAA::inA::fum (int i)
|
|
{
|
|
return 10 + i;
|
|
}
|
|
|
|
namespace BBB {
|
|
char c;
|
|
int i;
|
|
int B_xyzq (int);
|
|
char xyzq (char);
|
|
|
|
namespace CCC {
|
|
char xyzq (char);
|
|
};
|
|
|
|
class Class {
|
|
public:
|
|
char xyzq (char);
|
|
int dummy;
|
|
};
|
|
};
|
|
|
|
int AAA::A_xyzq (int x)
|
|
{
|
|
return 2 * x;
|
|
}
|
|
|
|
char AAA::xyzq (char c)
|
|
{
|
|
return 'a';
|
|
}
|
|
|
|
|
|
int BBB::B_xyzq (int x)
|
|
{
|
|
return 3 * x;
|
|
}
|
|
|
|
char BBB::xyzq (char c)
|
|
{
|
|
return 'b';
|
|
}
|
|
|
|
char BBB::CCC::xyzq (char c)
|
|
{
|
|
return 'z';
|
|
}
|
|
|
|
char BBB::Class::xyzq (char c)
|
|
{
|
|
return 'o';
|
|
}
|
|
|
|
void marker1(void)
|
|
{
|
|
return;
|
|
}
|
|
|
|
namespace
|
|
{
|
|
int X = 9;
|
|
|
|
namespace G
|
|
{
|
|
int Xg = 10;
|
|
|
|
namespace
|
|
{
|
|
int XgX = 11;
|
|
}
|
|
}
|
|
}
|
|
|
|
namespace C
|
|
{
|
|
int c = 1;
|
|
int shadow = 12;
|
|
|
|
namespace
|
|
{
|
|
int cX = 6;
|
|
|
|
namespace F
|
|
{
|
|
int cXf = 7;
|
|
|
|
namespace
|
|
{
|
|
int cXfX = 8;
|
|
}
|
|
}
|
|
}
|
|
|
|
namespace C
|
|
{
|
|
int cc = 2;
|
|
}
|
|
|
|
namespace E
|
|
{
|
|
int ce = 4;
|
|
}
|
|
|
|
namespace D
|
|
{
|
|
int cd = 3;
|
|
int shadow = 13;
|
|
|
|
namespace E
|
|
{
|
|
int cde = 5;
|
|
}
|
|
|
|
void marker2 (void)
|
|
{
|
|
// NOTE: carlton/2003-04-23: I'm listing the expressions that I
|
|
// plan to have GDB try to print out, just to make sure that the
|
|
// compiler and I agree which ones should be legal! It's easy
|
|
// to screw up when testing the boundaries of namespace stuff.
|
|
c;
|
|
//cc;
|
|
C::cc;
|
|
cd;
|
|
//C::D::cd;
|
|
E::cde;
|
|
shadow;
|
|
//E::ce;
|
|
cX;
|
|
F::cXf;
|
|
F::cXfX;
|
|
X;
|
|
G::Xg;
|
|
//cXOtherFile;
|
|
//XOtherFile;
|
|
G::XgX;
|
|
|
|
return;
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
int main ()
|
|
{
|
|
using AAA::inA;
|
|
char c1;
|
|
|
|
using namespace BBB;
|
|
|
|
c1 = xyzq ('x');
|
|
c1 = AAA::xyzq ('x');
|
|
c1 = BBB::CCC::xyzq ('m');
|
|
|
|
inA ina;
|
|
|
|
ina.xx = 33;
|
|
|
|
int y;
|
|
|
|
y = AAA::A_xyzq (33);
|
|
y += B_xyzq (44);
|
|
|
|
BBB::Class cl;
|
|
|
|
c1 = cl.xyzq('e');
|
|
|
|
marker1();
|
|
|
|
C::D::marker2 ();
|
|
}
|