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

More fixes.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4299 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2003-02-11 21:31:54 +00:00
commit 118ae4d9ba
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/Preprocessor/cpp.c
View file

@ -590,8 +590,22 @@ expand_macro(String_or_char *name, List *args)
Clear(tempa); Clear(tempa);
Printf(temp,"\001%s", aname); Printf(temp,"\001%s", aname);
Printf(tempa,"\"%s\"",arg); Printf(tempa,"\"%s\"",arg);
Replace(ns, temp, tempa, DOH_REPLACE_ANY); Replace(ns, temp, tempa, DOH_REPLACE_ID_END);
} }
if (strstr(Char(ns),"\002")) {
/* Look for concatenation tokens */
Clear(temp);
Clear(tempa);
Printf(temp,"\002%s",aname);
Append(tempa,"\002\003");
Replace(ns, temp, tempa, DOH_REPLACE_ID_END);
Clear(temp);
Clear(tempa);
Printf(temp,"%s\002",aname);
Append(tempa,"\003\002");
Replace(ns,temp,tempa, DOH_REPLACE_ID_BEGIN);
}
/* 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 */
@ -633,8 +647,8 @@ 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, aname, reparg, DOH_REPLACE_ID); /* Replace expanded args */
/* Replace(ns, "\003", arg, DOH_REPLACE_ANY);*/ Replace(ns, "\003", arg, DOH_REPLACE_ANY); /* Replace unexpanded arg */
Delete(reparg); Delete(reparg);
} }
} }