+2001-01-08 Nathan Sidwell <nathan@codesourcery.com>
+
+ * class.c (duplicate_tag_error): Adjust diagnostic.
+ (finish_struct): Locally set location to start of struct.
+ * decl.c (fixup_anonymous_aggr): Use cp_error_at.
+
2001-01-08 Nathan Sidwell <nathan@codesourcery.com>
* decl.c (struct binding_level): Adjust class_shadowed comments
/* Functions related to building classes and their related objects.
Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000 Free Software Foundation, Inc.
+ 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Michael Tiemann (tiemann@cygnus.com)
This file is part of GNU CC.
tree t;
{
cp_error ("redefinition of `%#T'", t);
- cp_error_at ("previous definition here", t);
+ cp_error_at ("previous definition of `%#T'", t);
/* Pretend we haven't defined this type. */
finish_struct (t, attributes)
tree t, attributes;
{
+ char *saved_filename = input_filename;
+ int saved_lineno = lineno;
+
/* Now that we've got all the field declarations, reverse everything
as necessary. */
unreverse_member_declarations (t);
cplus_decl_attributes (t, attributes, NULL_TREE);
+ /* Nadger the current location so that diagnostics point to the start of
+ the struct, not the end. */
+ input_filename = DECL_SOURCE_FILE (TYPE_NAME (t));
+ lineno = DECL_SOURCE_LINE (TYPE_NAME (t));
+
if (processing_template_decl)
{
finish_struct_methods (t);
else
finish_struct_1 (t);
+ input_filename = saved_filename;
+ lineno = saved_lineno;
+
TYPE_BEING_DEFINED (t) = 0;
if (current_class_type)
/* ISO C++ 9.5.3. Anonymous unions may not have function members. */
if (TYPE_METHODS (t))
- error ("an anonymous union cannot have function members");
+ cp_error_at ("an anonymous union cannot have function members", t);
}
/* Make sure that a declaration with no declarator is well-formed, i.e.
+2001-01-08 Nathan Sidwell <nathan@codesourcery.com>
+
+ * g++.old-deja/g++.benjamin/15309-1.C: Expect diagnostic at
+ start of structs.
+ * g++.old-deja/g++.benjamin/15309-2.C: Likewise.
+ * g++.old-deja/g++.brendan/crash17.C: Likewise.
+ * g++.old-deja/g++.brendan/crash29.C: Likewise.
+ * g++.old-deja/g++.brendan/crash48.C: Likewise.
+ * g++.old-deja/g++.brendan/ns1.C: Likewise.
+ * g++.old-deja/g++.brendan/warnings1.C: Likewise.
+ * g++.old-deja/g++.bugs/900205_04.C: Likewise.
+ * g++.old-deja/g++.bugs/900514_03.C: Likewise.
+ * g++.old-deja/g++.eh/spec6.C: Likewise.
+ * g++.old-deja/g++.jason/crash3.C: Likewise.
+ * g++.old-deja/g++.law/ctors11.C: Likewise.
+ * g++.old-deja/g++.law/ctors17.C: Likewise.
+ * g++.old-deja/g++.law/ctors5.C: Likewise.
+ * g++.old-deja/g++.law/ctors9.C: Likewise.
+ * g++.old-deja/g++.mike/ambig1.C: Likewise.
+ * g++.old-deja/g++.mike/net22.C: Likewise.
+ * g++.old-deja/g++.mike/p3538a.C: Likewise.
+ * g++.old-deja/g++.mike/p3538b.C: Likewise.
+ * g++.old-deja/g++.mike/virt3.C: Likewise.
+ * g++.old-deja/g++.niklas/t128.C: Likewise.
+ * g++.old-deja/g++.other/anon4.C: Likewise.
+ * g++.old-deja/g++.other/using1.C: Likewise.
+ * g++.old-deja/g++.other/warn3.C: Likewise.
+ * g++.old-deja/g++.pt/t37.C: Likewise.
+ * g++.old-deja/g++.robertl/eb69.C: Likewise.
+ * g++.old-deja/g++.robertl/eb71.C: Likewise.
+
2001-01-08 Nathan Sidwell <nathan@codesourcery.com>
* g++.old-deja/g++.other/lookup16.C: Remove XFAIL.
};
class miami : public bahamian
-{
+{ // WARNING - // WARNING -
public:
miami ();
~miami ();
-}; // WARNING - // WARNING -
+};
// Build don't link:
// Special g++ Options: -Wnon-virtual-dtor -Weffc++
-class bermuda {
+class bermuda { // WARNING - // WARNING -
public:
virtual int func1(int);
~bermuda();
-}; // WARNING - // WARNING -
+};
virtual ~GnWidget();
};
-class GnOptionGroup : public GnObject, public GnWidget {
-};// ERROR - warning
+class GnOptionGroup : public GnObject, public GnWidget {// ERROR - warning
+};
};
struct GlobalAddress
-{
+{// ERROR - candidates .*
GlobalAddress(Value *nvar){}// ERROR - .*
-};// ERROR - candidates .*
+};
int
main()
// Build don't link:
// GROUPS passed old-abort
-class internal {
+class internal { // ERROR - candidates are
int field;
int anotherfield;
-}; // ERROR - candidates are
+};
-class bug {
+class bug { // ERROR - several errors
internal* numbers;
bug(int size);
-}; // ERROR - several errors
+};
bug::bug(int size)
{ // ERROR - candidates
};
class C
-{
+{ // ERROR - warning
int g();
-};// ERROR - warning
+};
class D2 : public B
-{
+{ // ERROR - type C is not a base type for type D2
using B::f; // ok: B is a base of D
using C::g; // error: C isn't a base of D2
-}; // ERROR - type C is not a base type for type D2
+};
// Build don't link:
// GROUPS passed warnings
// there should be a warning about foo only defining private methods
-class foo {
+class foo { // ERROR - .*
int bar();
-};// ERROR - .*
+};
{
}
-struct struct0_derived_struct_0 : public struct0 {
-}; // ERROR -
+struct struct0_derived_struct_0 : public struct0 { // ERROR -
+};
// struct0_derived_struct_0 object; // would give g++ error if compiled
struct t_0_st_0;
-struct t_0_st_1 {
+struct t_0_st_1 { // ERROR -
int member;
t_0_st_1 (t_0_st_0&);// ERROR -
t_0_st_1 ();
-};// ERROR -
+};
struct t_0_st_0 {
int member;
struct t_2_st_0;
-struct t_2_st_1 {
+struct t_2_st_1 { // ERROR - candidate
int member;
t_2_st_1 (t_2_st_0); // ERROR - candidate
t_2_st_1 ();
-}; // ERROR - candidate
+};
struct t_2_st_0 {
int member;
};
struct C : A, A1
-{
+{ // ERROR - looser throw - A::~A()
virtual void foo() throw(int); // ERROR - looser throw - A::foo
virtual void bar() throw(int); // ERROR - looser throw - A1::bar
-}; // ERROR - looser throw - A::~A()
+};
struct D : A, A1
{
// Build don't link:
struct Node
-{
+{ // ERROR -
Node* child[2];
-}; // ERROR -
+};
void bug(int i)
{
inline A(int x){printf("constructing A with %d\n", x);}
};
-class B:public A{
+class B:public A{ // ERROR - non-default constructor
private:
public:
-}; // ERROR - non-default constructor
+};
int main()
{
#include <fstream.h>
-class X : public ifstream {
+class X : public ifstream { // ERROR - candidate
public:
X(int a, char *b) {} // ERROR - candidate
-}; // ERROR - candidate
+};
int main()
{
X *y = new X(10, "123");
// Date: Tue, 1 Sep 92 10:38:44 EDT
class X
-{
+{ // ERROR - candidate
private:
int x;
public:
static const X x0;
X( int );
-}; // ERROR - candidate
+};
class Y
{
struct var_Foo: public Foo
-{
+{ // ERROR - base.*// ERROR - in class.*
var_Foo* operator-> () {return this;}
-};// ERROR - base.*// ERROR - in class.*
+};
int blort(Foo& f)
{
class rM : public M {
};
-class D : public lM, rM {
-} d; // ERROR - ambiguous function
+class D : public lM, rM { // ERROR - ambiguous function
+} d;
int main() {
((lM*)&d)->i = 1;
Parent( char *s ) {}
};
-class Child : public Parent {
-}; // ERROR - called
+class Child : public Parent { // ERROR - called
+};
int main() {
Child c( "String initializer" ); // ERROR - bad
{};
class cc_CircleHdl : public virtual ccHandleBase, public ccObjectInfo
-{
+{ // WARNING -
public:
virtual const ccObjectInfo& ri (int);
-}; // WARNING -
+};
class ccCircleHdl : public ccHandle <cc_CircleHdl> {};
{};
class cc_CircleHdl : public virtual ccHandleBase, public ccObjectInfo
-{
+{ // WARNING -
public:
virtual const ccObjectInfo& repInvariant (int);
-}; // WARNING -
+};
class ccCircleHdl : public ccHandle <cc_CircleHdl> {};
int Di;
};
-class E : public virtual D, public B {
+class E : public virtual D, public B { // WARNING - direct base inaccessible due to ambiguity
int Ei;
-}; // WARNING - direct base inaccessible due to ambiguity
+};
E e;
// Build don't link:
// GROUPS niklas uncaught default-construct
struct A { A (int); };
-struct B : A {}; // ERROR -
+struct B : A {}; // ERROR - without ctor // ERROR - candidates
void f () { B (0); }// ERROR - .*
struct A
{
union
- {
+ { // ERROR - anon union cannot have member fns
void bad();
- }; // ERROR - anon union cannot have member fns
+ };
};
friend class D2;
};
-class D : public B {
+class D : public B { // ERROR - within this context
public:
using B::a;
using B::b;
-}; // ERROR - within this context
+};
-class D2 : public B {
+class D2 : public B { // ERROR - conflicting access specifications
public:
using B::a;
using B::b;
private:
using B::b;
-}; // ERROR - conflicting access specifications
+};
};
-class B {
+class B { // WARNING - only private constructors
public:
void f();
private:
B ();
B (const B&);
-}; // WARNING - only private constructors
+};
-class C {
+class C { // WARNING - only private destructors
public:
void f();
private:
~C ();
-}; // WARNING - only private destructors
+};
-class D {
+class D { // WARNING - all member functions are private
private:
void f();
-}; // WARNING - all member functions are private
+};
template <class T>
-class X {
+class X { // WARNING - only private destructors
private:
~X ();
-}; // WARNING - only private destructors
+};
template class X<int>;
template class X<double>;
template <class T>
-class Y {
+class Y { // WARNING - only private constructors
private:
Y ();
Y (const Y&);
-}; // WARNING - only private constructors
+};
template <class T>
-class Z {
+class Z { // WARNING - all member functions are private
private:
void f();
-}; // WARNING - all member functions are private
+};
// Build don't link:
-class A {
+class A { // ERROR - synthesized copy ctor
public:
A(int); // ERROR - referenced below
A(float); // ERROR - referenced below
~A();
-}; // ERROR - synthesized copy ctor
+};
A::A() { // ERROR -
}
int r = 0;
-struct foo {
+struct foo { // ERROR - candidate
foo(int x) { r = 1; } // ERROR - candidate
-}; // ERROR - candidate
+};
struct bar : foo {
typedef int an_int;
unsigned counter;
};
-class D {
+class D { //WARNING - only private members
int ins( B*&);
-}; //WARNING - only private members
+};
int
D::ins( B*& tempN)
projects / gcc.git / commitdiff