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

Preprocessor/parser improvements

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@904 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-09-29 16:57:07 +00:00
commit fc84a3085c
4 changed files with 97 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -283,19 +283,21 @@ find_args(DOHString *s)
DOHList *args;
DOHString *str;
int c, level;
long pos;
/* Create a new list */
args = NewList();
copy_location(s,args);
/* First look for a '(' */
pos = Tell(s);
skip_whitespace(s,0);
/* Now see if the next character is a '(' */
c = Getc(s);
if (c != '(') {
/* Not a macro, bail out now! */
cpp_error(Getfile(s),Getline(s),"Missing macro arguments\n");
Seek(s,pos, SEEK_SET);
return args;
}
c = Getc(s);
@ -401,12 +403,14 @@ expand_macro(DOHString_or_char *name, DOHList *args)
ns = NewString("");
Printf(ns,"%s",name);
if (args) {
Putc('(',ns);
if (Len(args))
Putc('(',ns);
for (i = 0; i < Len(args); i++) {
Printf(ns,"%s",Getitem(args,i));
if (i < (Len(args) -1)) Putc(',',ns);
}
Putc(')',ns);
if (i)
Putc(')',ns);
}
return ns;
}
@ -456,6 +460,26 @@ expand_macro(DOHString_or_char *name, DOHList *args)
Printf(tempa,"\"%s\"",arg);
Replace(ns, temp, tempa, DOH_REPLACE_ANY);
}
/* Non-standard macro expansion. The value `x` is replaced by a quoted
version of the argument except that if the argument is already quoted
nothing happens */
if (strstr(Char(ns),"`")) {
String *rep;
char *c;
Clear(temp);
Printf(temp,"`%s`",aname);
c = Char(arg);
if (*c == '\"') {
rep = arg;
} else {
Clear(tempa);
Printf(tempa,"\"%s\"",arg);
rep = tempa;
}
Replace(ns,temp,rep, DOH_REPLACE_ANY);
}
Replace(ns, aname, arg, DOH_REPLACE_ID);
}
}