mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-12 01:56:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Index: cp/ChangeLog

Browse Source 
2002-11-26  Geoffrey Keating  <geoffk@apple.com>

	* decl.c (check_initializer): Don't error on initialisation of
	a scalar with a brace-enclosed expression.

Index: testsuite/ChangeLog
2002-11-26  Geoffrey Keating  <geoffk@apple.com>

	* g++.dg/init/brace2.C: New test.
	* g++.old-deja/g++.mike/p9129.C: Correct.

From-SVN: r59553
This commit is contained in:
Geoffrey Keating 2002-11-27 01:59:43 +00:00 committed by Geoffrey Keating
parent 0ef08cc42e
commit a16f235752
5 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2002-11-26 Geoffrey Keating <geoffk@apple.com>
* decl.c (check_initializer): Don't error on initialisation of
a scalar with a brace-enclosed expression.
2002-11-26 Nathan Sidwell <nathan@codesourcery.com>
* cp-tree.h (DECL_LANG_FLAG_4): Document more uses.

14
gcc/cp/decl.c
View File

@ -8017,7 +8017,19 @@ check_initializer (tree decl, tree init, int flags)
else if (init)
{
if (TREE_CODE (init) == CONSTRUCTOR && TREE_HAS_CONSTRUCTOR (init))
init = reshape_init (type, &init);
{
/* [dcl.init] paragraph 13,
If T is a scalar type, then a declaration of the form
T x = { a };
is equivalent to
T x = a;
reshape_init will complain about the extra braces,
and doesn't do anything useful in the case where TYPE is
scalar, so just don't call it. */
if (CP_AGGREGATE_TYPE_P (type))
init = reshape_init (type, &init);
}
/* If DECL has an array type without a specific bound, deduce the
array size from the initializer. */

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2002-11-26 Geoffrey Keating <geoffk@apple.com>
* g++.dg/init/brace2.C: New test.
* g++.old-deja/g++.mike/p9129.C: Correct.
2002-11-26 Mark Mitchell <mark@codesourcery.com>
* g++.dg/abi/empty10.C: Don't run on non-x86 targets.

8
gcc/testsuite/g++.dg/init/brace2.C Normal file
View File

@ -0,0 +1,8 @@
// { dg-do compile }
// [dcl.init] paragraph 13.
int x = { 2 };
const char * y = { "hello" };
int a = 2;
int b = { 2,3 }; // { dg-error "requires one element" }
int c = { { 2 } } ; // { dg-error "braces around scalar initializer" }

2
gcc/testsuite/g++.old-deja/g++.mike/p9129.C
View File

@ -7,6 +7,6 @@ public:
int DoSomething();
};
int (Foo::*pA)() = { &Foo::DoSomething }; // ERROR -
int (Foo::*pA)() = { &Foo::DoSomething };
int (Foo::*X[1])(int) = { { &Foo::DoSomething } }; // ERROR -
int (Foo::*Y[])(int) = { { &Foo::DoSomething, &Foo::DoSomething, 0 } }; // ERROR -