diff options
Diffstat (limited to 'src/preprocess.c')
| -rw-r--r-- | src/preprocess.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/preprocess.c b/src/preprocess.c index 8d9394a..3a0c0bc 100644 --- a/src/preprocess.c +++ b/src/preprocess.c @@ -1,6 +1,7 @@ #include <assert.h> #include <math.h> #include <stddef.h> +#include <stdlib.h> #include <string.h> #include <log.h> @@ -8,43 +9,46 @@ static void preprocess_erase(struct ctx *ctx, size_t start) { - assert(ctx->raw[start] == '#'); + assert(ctx->data[start] == '#'); for (size_t i = start; i < ctx->size; i++) { - char cur = ctx->raw[i]; + char cur = ctx->data[i]; if (cur == '\n' || cur == '\0') break; - ctx->raw[i] = ' '; // Spaces get skipped by tokenizer anyways + ctx->data[i] = ' '; // Spaces get skipped by tokenizer anyways } } void preprocess(struct ctx *ctx) { - for (size_t i = 0; i < ctx->size; i++) { - const char cur = ctx->raw[i]; + ctx->size = ctx->location.size; + ctx->data = malloc(ctx->size); + memcpy(ctx->data, ctx->location.data, ctx->size); - ctx->column++; + for (size_t i = 0; i < ctx->location.size; i++) { + const char cur = ctx->location.data[i]; + + ctx->location.column++; if (cur == '\n') { - ctx->line++; - ctx->column = 0; + ctx->location.line++; + ctx->location.column = 0; continue; } else if (cur == '\0') { break; - } else if (cur == '#' && ctx->column == 1) { - if (strncmp(ctx->raw + i + 1, "inc ", fmin(4, ctx->size - i)) == 0) { + } else if (cur == '#' && ctx->location.column == 1) { + if (strncmp(ctx->location.data + i + 1, "inc ", + fmin(4, ctx->location.size - i)) == 0) { // TODO: Add include features - } else if (*(ctx->raw + i + 1) == '#') { + } else if (*(ctx->location.data + i + 1) == '#') { // Comment } else { - errln(ctx, "Invalid preprocessing directive"); + errln(&ctx->location, "Invalid preprocessing directive"); } preprocess_erase(ctx, i); } } - ctx->data = ctx->raw; - ctx->line = 0; - ctx->column = 0; + context_rewind(ctx); } |