OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/51 (g++ reports error for ISO C++ example)

Browse Source 
cp:
	PR g++/51
	* parse.y (frob_specs): Indicate it is a language linkage which
	contained the extern.
	* decl.c (grokdeclarator): Allow extern language linkage with
	other specifiers.
testsuite:
	* g++.dg/other/linkage1.C: New test.
	* g++.old-deja/g++.brendan/err-msg2.C: Alter to avoid two
	specifiers.

From-SVN: r47891
This commit is contained in:
Nathan Sidwell 2001-12-11 20:11:34 +00:00 committed by Nathan Sidwell
parent 9aa8a1df05
commit 270d8c65bd
6 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2001-12-11 Nathan Sidwell <nathan@codesourcery.com>
PR g++/51
* parse.y (frob_specs): Indicate it is a language linkage which
contained the extern.
* decl.c (grokdeclarator): Allow extern language linkage with
other specifiers.
2001-12-10 Nathan Sidwell <nathan@codesourcery.com>
PR g++/72

10
gcc/cp/decl.c
View File

@ -9603,6 +9603,8 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
int explicit_int = 0;
int explicit_char = 0;
int defaulted_int = 0;
int extern_langp = 0;
tree typedef_decl = NULL_TREE;
const char *name;
tree typedef_type = NULL_TREE;
@ -10043,6 +10045,10 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
}
else if (RIDBIT_SETP (i, specbits))
pedwarn ("duplicate `%s'", IDENTIFIER_POINTER (id));
if (i == (int)RID_EXTERN
&& TREE_PURPOSE (spec) == error_mark_node)
/* This extern was part of a language linkage. */
extern_langp = 1;
RIDBIT_SET (i, specbits);
goto found;
}
@ -10318,7 +10324,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
if (RIDBIT_ANY_SET (specbits))
{
if (RIDBIT_SETP (RID_STATIC, specbits)) nclasses++;
if (RIDBIT_SETP (RID_EXTERN, specbits)) nclasses++;
if (RIDBIT_SETP (RID_EXTERN, specbits) && !extern_langp) nclasses++;
if (decl_context == PARM && nclasses > 0)
error ("storage class specifiers invalid in parameter declarations");
if (RIDBIT_SETP (RID_TYPEDEF, specbits))
@ -10329,6 +10335,8 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
}
if (RIDBIT_SETP (RID_AUTO, specbits)) nclasses++;
if (RIDBIT_SETP (RID_REGISTER, specbits)) nclasses++;
if (!nclasses && !friendp && extern_langp)
nclasses++;
}
/* Give error if `virtual' is used outside of class declaration. */

8
gcc/cp/parse.y
View File

@ -119,7 +119,13 @@ frob_specs (specs_attrs, lookups)
current_declspecs = build_tree_list (NULL_TREE, current_declspecs);
if (have_extern_spec && !used_extern_spec)
{
current_declspecs = tree_cons (NULL_TREE,
/* We have to indicate that there is an "extern", but that it
was part of a language specifier. For instance,
extern "C" typedef int (*Ptr) ();
is well formed. */
current_declspecs = tree_cons (error_mark_node,
get_identifier ("extern"),
current_declspecs);
used_extern_spec = 1;

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2001-12-11 Nathan Sidwell <nathan@codesourcery.com>
* g++.dg/other/linkage1.C: New test.
* g++.old-deja/g++.brendan/err-msg2.C: Alter to avoid two
specifiers.
2001-12-11 Neil Booth <neil@daikokuya.demon.co.uk>
* gcc.dg/concat.c: New test.

14
gcc/testsuite/g++.dg/other/linkage1.C Normal file
View File

@ -0,0 +1,14 @@
// { dg-do compile }
// Copyright (C) 2001 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 9 Dec 2001 <nathan@nathan@codesourcery.com>
// PR 51
// This example snippet is from the ISO C++ standard, sect 7.5 para 4:
extern "C" typedef void FUNC_c();
class C {
public:
static FUNC_c* q;
};

6
gcc/testsuite/g++.old-deja/g++.brendan/err-msg2.C
View File

@ -1,4 +1,8 @@
// Build don't link:
// GROUPS passed error-messages
typedef void (*pfv)(double, double);
extern "C" typedef void (*pfv)(double, double);// ERROR - multiple.*
extern "C" {
typedef void (*pfv)(double, double); // ERROR - conflicting linkage - XFAIL
}