mirrors
/
chibicc
mirror of https://github.com/rui314/chibicc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add #ifdef and #ifndef

This commit is contained in:
Rui Ueyama 2020-03-29 17:18:31 +09:00
parent f86cb47357
commit db2815b4fb
2 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
preprocess.c
View File

@ -143,7 +143,9 @@ static Token *append(Token *tok1, Token *tok2) {
static Token *skip_cond_incl2(Token *tok) {
while (tok->kind != TK_EOF) {
if (is_hash(tok) && equal(tok->next, "if")) {
if (is_hash(tok) &&
(equal(tok->next, "if") || equal(tok->next, "ifdef") ||
equal(tok->next, "ifndef"))) {
tok = skip_cond_incl2(tok->next->next);
continue;
}
@ -158,7 +160,9 @@ static Token *skip_cond_incl2(Token *tok) {
// Nested `#if` and `#endif` are skipped.
static Token *skip_cond_incl(Token *tok) {
while (tok->kind != TK_EOF) {
if (is_hash(tok) && equal(tok->next, "if")) {
if (is_hash(tok) &&
(equal(tok->next, "if") || equal(tok->next, "ifdef") ||
equal(tok->next, "ifndef"))) {
tok = skip_cond_incl2(tok->next->next);
continue;
}
@ -318,6 +322,24 @@ static Token *preprocess2(Token *tok) {
continue;
}
if (equal(tok, "ifdef")) {
bool defined = find_macro(tok->next);
push_cond_incl(tok, defined);
tok = skip_line(tok->next->next);
if (!defined)
tok = skip_cond_incl(tok);
continue;
}
if (equal(tok, "ifndef")) {
bool defined = find_macro(tok->next);
push_cond_incl(tok, !defined);
tok = skip_line(tok->next->next);
if (defined)
tok = skip_cond_incl(tok);
continue;
}
if (equal(tok, "elif")) {
if (!cond_incl || cond_incl->ctx == IN_ELSE)
error_tok(start, "stray #elif");

38
test/macro.c
View File

@ -156,6 +156,44 @@ int main() {
#define M5 M4 + 2
assert(13, M4, "M4");
#ifdef M6
m = 5;
#else
m = 3;
#endif
assert(3, m, "m");
#define M6
#ifdef M6
m = 5;
#else
m = 3;
#endif
assert(5, m, "m");
#ifndef M7
m = 3;
#else
m = 5;
#endif
assert(3, m, "m");
#define M7
#ifndef M7
m = 3;
#else
m = 5;
#endif
assert(5, m, "m");
#if 0
#ifdef NO_SUCH_MACRO
#endif
#ifndef NO_SUCH_MACRO
#endif
#else
#endif
printf("OK\n");
return 0;
}