From 5424b4320def194b205dcfe8e937035d2d80ae09 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 28 Feb 2019 10:11:32 -0500 Subject: remove namespace type; files are empty structs closes #1047 --- src/parser.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/parser.cpp') diff --git a/src/parser.cpp b/src/parser.cpp index 6fe78c14c3..2fd453c67f 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -18,7 +18,7 @@ struct ParseContext { Buf *buf; size_t current_token; ZigList *tokens; - ImportTableEntry *owner; + ZigType *owner; ErrColor err_color; }; @@ -130,8 +130,10 @@ static void ast_error(ParseContext *pc, Token *token, const char *format, ...) { va_end(ap); - ErrorMsg *err = err_msg_create_with_line(pc->owner->path, token->start_line, token->start_column, - pc->owner->source_code, pc->owner->line_offsets, msg); + ErrorMsg *err = err_msg_create_with_line(pc->owner->data.structure.root_struct->path, + token->start_line, token->start_column, + pc->owner->data.structure.root_struct->source_code, + pc->owner->data.structure.root_struct->line_offsets, msg); err->line_start = token->start_line; err->column_start = token->start_column; @@ -148,8 +150,10 @@ static void ast_asm_error(ParseContext *pc, AstNode *node, size_t offset, const Buf *msg = buf_vprintf(format, ap); va_end(ap); - ErrorMsg *err = err_msg_create_with_line(pc->owner->path, node->line, node->column, - pc->owner->source_code, pc->owner->line_offsets, msg); + ErrorMsg *err = err_msg_create_with_line(pc->owner->data.structure.root_struct->path, + node->line, node->column, + pc->owner->data.structure.root_struct->source_code, + pc->owner->data.structure.root_struct->line_offsets, msg); print_err_msg(err, pc->err_color); exit(EXIT_FAILURE); @@ -570,9 +574,7 @@ static void ast_parse_asm_template(ParseContext *pc, AstNode *node) { } } -AstNode *ast_parse(Buf *buf, ZigList *tokens, ImportTableEntry *owner, - ErrColor err_color) -{ +AstNode *ast_parse(Buf *buf, ZigList *tokens, ZigType *owner, ErrColor err_color) { ParseContext pc = {}; pc.err_color = err_color; pc.owner = owner; -- cgit v1.2.3