summaryrefslogtreecommitdiffabout
path: root/src/preproc.c
Side-by-side diff
Diffstat (limited to 'src/preproc.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/preproc.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/preproc.c b/src/preproc.c
index 1eeddd0..a5dda52 100644
--- a/src/preproc.c
+++ b/src/preproc.c
@@ -55,6 +55,7 @@ static size_t linebufsize = 0;
#define INFILE context_stack->infile
#define LOCUS context_stack->locus
+#define POINT context_stack->locus.beg
static char *linebuf;
static size_t bufsize;
@@ -123,8 +124,8 @@ pp_line_stmt()
if (grecs_asprintf(&linebufbase, &linebufsize,
"#line %lu \"%s\" %lu\n",
- (unsigned long) LOCUS.line,
- LOCUS.file, (unsigned long) context_stack->xlines))
+ (unsigned long) POINT.line,
+ POINT.file, (unsigned long) context_stack->xlines))
grecs_alloc_die();
ls_size = strlen(linebufbase);
@@ -211,7 +212,7 @@ grecs_preproc_fill_buffer(char *buf, size_t size)
}
if (!is_line && len > 0 && linebuf[len - 1] == '\n')
- LOCUS.line++;
+ POINT.line++;
}
return bufsize - size;
}
@@ -397,7 +398,7 @@ push_source(const char *name, int once)
return 1;
}
- if (LOCUS.file && STAT_ID_EQ(st, context_stack->id)) {
+ if (POINT.file && STAT_ID_EQ(st, context_stack->id)) {
grecs_error(&LOCUS, 0, _("Recursive inclusion"));
return 1;
}
@@ -431,10 +432,13 @@ push_source(const char *name, int once)
/* Push current context */
ctx = grecs_malloc(sizeof(*ctx));
- ctx->locus.file = grecs_install_text(name);
- ctx->locus.line = 1;
+ ctx->locus.beg.file = grecs_install_text(name);
+ ctx->locus.beg.line = 1;
+ ctx->locus.beg.col = 0;
+ ctx->locus.end.file = NULL;
+ ctx->locus.end.line = ctx->locus.end.col = 0;
ctx->xlines = 0;
- ctx->namelen = strlen(ctx->locus.file);
+ ctx->namelen = strlen(ctx->locus.beg.file);
ctx->id.i_node = st.st_ino;
ctx->id.device = st.st_dev;
ctx->infile = fp;
@@ -470,11 +474,11 @@ pop_source()
return 1;
}
- LOCUS.line++;
+ POINT.line++;
if (grecs_grecs__flex_debug)
fprintf(stderr, "Resuming file `%s' at line %lu\n",
- LOCUS.file, (unsigned long) LOCUS.line);
+ POINT.file, (unsigned long) POINT.line);
pp_line_stmt();

Return to:

Send suggestions and report system problems to the System administrator.