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

Let #if be slightly more intelligent

Browse Source
This commit is contained in:
Pierre Pronchery 2011-05-03 13:23:59 +00:00
parent 3460ee8002
commit 190ffc644d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/scanner.c
View File

@ -238,6 +238,7 @@ static CppScope _if_do(Cpp * cpp, char const * str)
{ {
char * p; char * p;
char const * q; char const * q;
long l;
if(str == NULL) if(str == NULL)
/* FIXME it's probably an error case instead */ /* FIXME it's probably an error case instead */
@ -245,8 +246,9 @@ static CppScope _if_do(Cpp * cpp, char const * str)
if(str[0] == '!') if(str[0] == '!')
return (_if_do(cpp, &str[1]) == CPP_SCOPE_TAKING) return (_if_do(cpp, &str[1]) == CPP_SCOPE_TAKING)
? CPP_SCOPE_NOTYET : CPP_SCOPE_TAKING; ? CPP_SCOPE_NOTYET : CPP_SCOPE_TAKING;
if(strcmp(str, "1") == 0) l = strtol(str, &p, 0);
return CPP_SCOPE_TAKING; if(str[0] != '\0' && p != str)
return (l != 0) ? CPP_SCOPE_TAKING : CPP_SCOPE_NOTYET;
if(strncmp(str, "defined(", 8) == 0 && (p = strchr(str, ')')) != NULL) if(strncmp(str, "defined(", 8) == 0 && (p = strchr(str, ')')) != NULL)
{ {
*p = '\0'; *p = '\0';