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

add fullname to the php4 kw warning

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8181 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-02 10:18:49 +00:00
commit 9a865b570b
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
SWIG/Examples/test-suite/php4/namewarn_rename.i
View file

@ -10,4 +10,11 @@
{
};
struct Hello
{
void empty() {}
};
%}

4
SWIG/Lib/php4/php4kw.swg
View file

@ -3,14 +3,14 @@
// when used as class methods.
//
#define PHPKW(x) %namewarn("314:" `x` " is a php keyword, renamed as c_"`x`,sourcefmt="%(lower)s", rename="c_%s") `x`
#define PHPKW(x) %namewarn("314:" `x` " is a php keyword, renamed as c_"`x`,sourcefmt="%(lower)s", rename="c_%s",fullname=1) `x`
%define PHPCN(x)
%namewarn("314:" `x` " is a php reserved class name, class renamed as c_"`x`,match="class",rename="c_%s") `x`;
%namewarn("314:" `x` " is a php reserved class name, constructor renamed as c_"`x`,match="constructor",rename="c_%s") `x`;
%enddef
#define PHPBN1(x) %namewarn("321:" `x` " conflicts with a built-in name in php",sourcefmt="%(lower)s") "::" `x`
#define PHPBN1(x) %namewarn("321:" `x` " conflicts with a built-in name in php",sourcefmt="%(lower)s",fullname=1) `x`
#define PHPBN2(x) %namewarn("321:" `x` " conflicts with a built-in name in php") "::" `x`

4
SWIG/Source/Swig/naming.c
View file

@ -1102,7 +1102,7 @@ Hash *Swig_name_nameobj_lget(List *namelist, Node *n, String *prefix, String *na
String *tname = HashGetAttr(rn,k_targetname);
String *sfmt = HashGetAttr(rn,k_sourcefmt);
String *sname = 0;
int fullname = GetFlag(namelist,k_fullname);
int fullname = GetFlag(rn,k_fullname);
if (sfmt) {
if (fullname && prefix) {
sname = NewStringf(sfmt, prefix, name);
@ -1271,7 +1271,7 @@ static String *apply_rename(String *newname, int fullname, String *prefix, Strin
}
/* use name as a fmt, but avoid C++ "%" and "%=" operators */
if (Len(newname) > 1 && strstr(cnewname,"%") && !(strcmp(cnewname,"%=") == 0)) {
if (fullname && prefix) {
if (fullname && prefix) {
result = NewStringf(fmt,prefix,name);
} else {
result = NewStringf(fmt,name);