small fixes to the parser

This commit is contained in:
DanielGavin
2020-12-09 21:33:10 +01:00
parent b6aa549eb8
commit 934809397f
4 changed files with 13 additions and 4 deletions
+8 -2
View File
@@ -121,7 +121,7 @@ parse_file :: proc(p: ^Parser, file: ^ast.File) -> bool {
}
p.file = file;
tokenizer.init(&p.tok, file.src, file.fullpath);
tokenizer.init(&p.tok, file.src, file.fullpath, p.err);
if p.tok.ch <= 0 {
return true;
}
@@ -625,6 +625,8 @@ parse_if_stmt :: proc(p: ^Parser) -> ^ast.If_Stmt {
skip_possible_newline_for_literal(p);
}
else_tok := p.curr_tok.pos;
if allow_token(p, .Else) {
#partial switch p.curr_tok.kind {
case .If:
@@ -650,6 +652,7 @@ parse_if_stmt :: proc(p: ^Parser) -> ^ast.If_Stmt {
if_stmt.cond = cond;
if_stmt.body = body;
if_stmt.else_stmt = else_stmt;
if_stmt.else_pos = else_tok;
return if_stmt;
}
@@ -784,6 +787,7 @@ parse_case_clause :: proc(p: ^Parser, is_type_switch: bool) -> ^ast.Case_Clause
cc.list = list;
cc.terminator = terminator;
cc.body = stmts;
cc.case_pos = tok.pos;
return cc;
}
@@ -845,6 +849,7 @@ parse_switch_stmt :: proc(p: ^Parser) -> ^ast.Stmt {
ts := ast.new(ast.Type_Switch_Stmt, tok.pos, body.end);
ts.tag = tag;
ts.body = body;
ts.switch_pos = tok.pos;
return ts;
} else {
cond := convert_stmt_to_expr(p, tag, "switch expression");
@@ -852,6 +857,7 @@ parse_switch_stmt :: proc(p: ^Parser) -> ^ast.Stmt {
ts.init = init;
ts.cond = cond;
ts.body = body;
ts.switch_pos = tok.pos;
return ts;
}
}
@@ -1155,7 +1161,7 @@ parse_stmt :: proc(p: ^Parser) -> ^ast.Stmt {
end := end_pos(tok);
if len(results) > 0 {
end = results[len(results)-1].pos;
end = results[len(results)-1].end;
}
rs := ast.new(ast.Return_Stmt, tok.pos, end);