jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for friend declarations, and other 'repeated' declarations.

Browse source 
Now, this doesn't generate warnings:

 class A; class B*;

 int foo(A*, B*);

 struct A {
   friend int foo(A*, B*);
 };

but this generates

 struct B {
   friend double foo(A*, B*);
 };

which is correct, since they have different return types.

See the redefined.i file for most cases where
repeated (but not redefined) declarations are
not generating warnings now, such as:

// no warning
#define REPEATED 1
#define REPEATED 1

// yes warning
#define REDEFINED 1
#define REDEFINED 2

this is following the C, C++ and preprocessor
standard behavior.

The function 'need_redefined_warn(..)' was added to
util.c, if some strange corner appears, and therefore,
the parser.y file doesn't need to be changed latter.

Also, the redefined warning format in parser.y
was changed, so now it respond to William's -Fmicrosoft
flag.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5633 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-01-15 03:16:40 +00:00
commit 587ecadac7
5 changed files with 205 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
SWIG/Source/CParse/parser.y
View file

@ -271,7 +271,6 @@ static String *make_unnamed() {
}
/* Return the node name when it requires to emit a name warning */
extern int need_name_warning(Node *n);
static String *name_warning(Node *n,String *name,SwigType *decl) {
/* Return in the obvious cases */
if (!namewarn_hash || !name || !need_name_warning(n)) return 0;
@ -375,18 +374,26 @@ static void add_symbols(Node *n) {
Setattr(n,"sym:name",symname);
} else {
String *e = NewString("");
Printf(e,"Identifier '%s' redeclared (ignored).", symname);
String *en = NewString("");
String *ec = NewString("");
Printf(en,"Identifier '%s' redeclared (ignored)", symname);
if (Cmp(symname,Getattr(n,"name"))) {
Printf(e," (Renamed from '%s')", SwigType_namestr(Getattr(n,"name")));
Printf(en," (Renamed from '%s')", SwigType_namestr(Getattr(n,"name")));
}
Printf(e,"\n%s:%d: Previous declaration of '%s'", Getfile(c),Getline(c),symname);
Printf(en,",");
Printf(ec," previous declaration of '%s'", symname);
if (Cmp(symname,Getattr(c,"name"))) {
Printf(e," (Renamed from '%s')", SwigType_namestr(Getattr(c,"name")));
Printf(ec," (Renamed from '%s')", SwigType_namestr(Getattr(c,"name")));
}
/* avoid warning for friend declarations */
if (!is_friend(n) && !is_friend(c))
Swig_warning(WARN_PARSE_REDEFINED,Getfile(n), Getline(n),"%s\n", e);
Printf(ec,".");
if (need_redefined_warn(n, c, inclass)) {
Swig_warning(WARN_PARSE_REDEFINED,Getfile(n),Getline(n),"%s\n",en);
Swig_warning(WARN_PARSE_REDEFINED,Getfile(c),Getline(c),"%s\n",ec);
}
Printf(e,"%s\n%s:%d:%s\n", en, Getfile(c), Getline(c), ec);
Setattr(n,"error",e);
Delete(en);
Delete(ec);
}
}
} else {
@ -526,10 +533,16 @@ static void merge_extensions(Node *cls, Node *am) {
if (csym != n) {
/* Conflict with previous definition. Nuke previous definition */
String *e = NewString("");
Printf(e,"Identifier '%s' redeclared (ignored).\n", symname);
Printf(e,"%s:%d: Previous definition of tag '%s'", Getfile(n),Getline(n), symname);
Swig_warning(WARN_PARSE_REDEFINED,Getfile(csym), Getline(csym), "%s\n", e);
String *en = NewString("");
String *ec = NewString("");
Printf(ec,"Identifier '%s' redeclared (ignored),\n", symname);
Printf(en," %%extend definition of '%s'.", symname);
Swig_warning(WARN_PARSE_REDEFINED,Getfile(csym), Getline(csym), "%s\n", ec);
Swig_warning(WARN_PARSE_REDEFINED,Getfile(n), Getline(n), "%s\n", en);
Printf(e,"%s\n%s:%d:%s\n", ec, Getfile(n), Getline(n), en);
Setattr(csym,"error",e);
Delete(en);
Delete(ec);
Swig_symbol_remove(csym); /* Remove class definition */
Swig_symbol_add(symname,n); /* Insert extend definition */
}