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

fixes and docs in %rename

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8160 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-01 11:01:12 +00:00
commit dfd35441ec
7 changed files with 586 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

15
SWIG/Source/Preprocessor/cpp.c
View file

@ -696,11 +696,12 @@ expand_macro(String *name, List *args)
ns = NewStringEmpty();
StringAppend(ns,name);
if (args) {
if (Len(args))
int lenargs = Len(args);
if (lenargs)
StringPutc('(',ns);
for (i = 0; i < Len(args); i++) {
for (i = 0; i < lenargs; i++) {
StringAppend(ns,Getitem(args,i));
if (i < (Len(args) -1)) StringPutc(',',ns);
if (i < (lenargs -1)) StringPutc(',',ns);
}
if (i)
StringPutc(')',ns);
@ -970,6 +971,7 @@ Preprocessor_replace(DOH *s)
StringUngetc(c,s);
/* See if this is the special "defined" macro */
if (StringEqual(k_defined,id)) {
int lenargs = 0;
DOH *args = 0;
/* See whether or not a paranthesis has been used */
skip_whitespace(s,0);
@ -993,19 +995,20 @@ Preprocessor_replace(DOH *s)
} else {
Seek(s,-1,SEEK_CUR);
}
if ((!args) || (!Len(args))) {
lenargs = Len(args);
if ((!args) || (!lenargs)) {
/* This is not a defined() macro. */
StringAppend(ns,id);
state = 0;
break;
}
for (i = 0; i < Len(args); i++) {
for (i = 0; i < lenargs; i++) {
DOH *o = Getitem(args,i);
if (!HashGetAttr(symbols,o)) {
break;
}
}
if (i < Len(args)) StringPutc('0',ns);
if (i < lenargs) StringPutc('0',ns);
else StringPutc('1',ns);
Delete(args);
state = 0;