DeforaOS/CPP
DeforaOS/CPP
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added workaround to parse macro definitions while they are still not implemented

Browse Source
This commit is contained in:
Pierre Pronchery 2008-05-27 01:24:11 +00:00
parent 187a04704d
commit e6cf667584
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpp.c
View File

@ -686,12 +686,22 @@ static int _directive_define(Cpp * cpp, Token * token, char const * str)
{ {
size_t i; size_t i;
size_t j; size_t j;
size_t k = 0;
int tmp; int tmp;
char * var; char * var;
char const * val; char const * val;
token_set_code(token, CPP_CODE_META_DEFINE); token_set_code(token, CPP_CODE_META_DEFINE);
for(i = 1; (tmp = str[i]) != '\0' && !isspace(tmp); i++); for(i = 1; (tmp = str[i]) != '\0' && !isspace(tmp); i++)
{
/* FIXME actually implement macros */
if(str[i] != '(')
continue;
for(k = i; str[i] != '\0' && str[i] != ')'; i++);
if(str[i] == ')')
i++;
break;
}
for(j = i; (tmp = str[j]) != '\0' && isspace(tmp); j++); for(j = i; (tmp = str[j]) != '\0' && isspace(tmp); j++);
val = (str[j] != '\0') ? &str[j] : NULL; val = (str[j] != '\0') ? &str[j] : NULL;
/* FIXME inject an error token instead */ /* FIXME inject an error token instead */
@ -701,7 +711,7 @@ static int _directive_define(Cpp * cpp, Token * token, char const * str)
token_set_string(token, strerror(errno)); token_set_string(token, strerror(errno));
return 0; return 0;
} }
var[i] = '\0'; var[k != 0 ? k : i] = '\0';
if(cpp_define_add(cpp, var, val) != 0) if(cpp_define_add(cpp, var, val) != 0)
{ {
token_set_code(token, CPP_CODE_META_ERROR); token_set_code(token, CPP_CODE_META_ERROR);