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

Further refinements of macro argument handling.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@4290 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2003-02-11 03:51:33 +00:00
commit 4bc0f923fe
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -496,8 +496,6 @@ get_options(String *str) {
* of error occurred. * of error occurred.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
DOH *expanded_value = 0;
static String * static String *
expand_macro(String_or_char *name, List *args) expand_macro(String_or_char *name, List *args)
{ {
@ -574,11 +572,7 @@ expand_macro(String_or_char *name, List *args)
/* Tag the macro as being expanded. This is to avoid recursion in /* Tag the macro as being expanded. This is to avoid recursion in
macro expansion */ macro expansion */
if (!expanded_value) {
expanded_value = NewString("");
DohIntern(expanded_value);
}
Setattr(macro,"*expanded*",expanded_value);
temp = NewString(""); temp = NewString("");
tempa = NewString(""); tempa = NewString("");
@ -586,7 +580,9 @@ expand_macro(String_or_char *name, List *args)
l = Len(margs); l = Len(margs);
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
DOH *arg, *aname; DOH *arg, *aname;
String *reparg;
arg = Getitem(args,i); /* Get an argument value */ arg = Getitem(args,i); /* Get an argument value */
reparg = Preprocessor_replace(arg);
aname = Getitem(margs,i); /* Get macro argument name */ aname = Getitem(margs,i); /* Get macro argument name */
if (strstr(Char(ns),"\001")) { if (strstr(Char(ns),"\001")) {
/* Try to replace a quoted version of the argument */ /* Try to replace a quoted version of the argument */
@ -596,7 +592,6 @@ expand_macro(String_or_char *name, List *args)
Printf(tempa,"\"%s\"",arg); Printf(tempa,"\"%s\"",arg);
Replace(ns, temp, tempa, DOH_REPLACE_ANY); Replace(ns, temp, tempa, DOH_REPLACE_ANY);
} }
/* Non-standard macro expansion. The value `x` is replaced by a quoted /* Non-standard macro expansion. The value `x` is replaced by a quoted
version of the argument except that if the argument is already quoted version of the argument except that if the argument is already quoted
nothing happens */ nothing happens */
@ -637,17 +632,23 @@ expand_macro(String_or_char *name, List *args)
} }
} }
} }
Replace(ns, aname, arg, DOH_REPLACE_ID); /* Replace(ns, aname, arg, DOH_REPLACE_ID); */
Replace(ns, aname, reparg, DOH_REPLACE_ID);
/* Replace(ns, "\003", arg, DOH_REPLACE_ANY);*/
Delete(reparg);
} }
} }
Replace(ns,"\002","",DOH_REPLACE_ANY); /* Get rid of concatenation tokens */ Replace(ns,"\002","",DOH_REPLACE_ANY); /* Get rid of concatenation tokens */
Replace(ns,"\001","#",DOH_REPLACE_ANY); /* Put # back (non-standard C) */ Replace(ns,"\001","#",DOH_REPLACE_ANY); /* Put # back (non-standard C) */
/* Expand this macro even further */ /* Expand this macro even further */
Setattr(macro,"*expanded*","1");
e = Preprocessor_replace(ns); e = Preprocessor_replace(ns);
Delete(ns);
Delattr(macro,"*expanded*"); Delattr(macro,"*expanded*");
Delete(ns);
if (Getattr(macro,"swigmacro")) { if (Getattr(macro,"swigmacro")) {
String *g; String *g;
String *f = NewString(""); String *f = NewString("");