luna/vig
1
2
Fork 0
Code Issues Pull requests Releases Wiki Activity

parser: simplify parseBlock

Browse source
This commit is contained in:
Luna 2019-08-26 14:59:14 -03:00
parent 1c8eda7305
commit c3f0b4b4d5
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/parser.zig
View file

@ -462,31 +462,27 @@ pub const Parser = struct {
.Struct => try self.parseStructDecl(),
else => |ttype| blk: {
self.doError("(basic) expected fn/const, got {}\n", ttype);
self.doError("expected Fn, Const, Struct, got {}\n", ttype);
return Result.CompileError;
},
};
}
fn parseBlock(self: *@This()) !*Node {
var stmts = ast.StmtList.init(self.allocator);
fn parseBlockInternal(self: *@This(), comptime T: type) !T {
var stmts = T.init(self.allocator);
errdefer stmts.deinit();
_ = try self.consumeSingle(.LeftBrace);
while (self.peek().ttype != .RightBrace) {
var stmt = try self.parseDecl();
var stmt = try self.parseStmt();
printer.printNode(try self.mkStmt(stmt), 0);
try stmts.append(stmt);
}
_ = try self.consumeSingle(.RightBrace);
return try self.mkBlock(stmts);
}
fn parseDecl(self: *@This()) !*Stmt {
return try self.parseStmt();
return stmts;
}
fn parseStmt(self: *@This()) anyerror!*Stmt {
@ -495,27 +491,19 @@ pub const Parser = struct {
.Loop => try self.parseLoop(),
.Println => try self.parsePrintln(),
.Return => try self.parseReturn(),
// TODO make newlines tokens and consume newline?
else => try self.parseStmtExpr(),
};
}
/// Copy of parseBlock for blocks in statements
fn parseStmtBlock(self: *@This()) !ast.Block {
var block = ast.Block.init(self.allocator);
errdefer block.deinit();
_ = try self.consumeSingle(.LeftBrace);
while (self.peek().ttype != .RightBrace) {
var stmt = try self.parseDecl();
printer.printNode(try self.mkStmt(stmt), 0);
try block.append(stmt);
/// Parse a list of statements.
fn parseBlock(self: *@This()) !*Node {
var stmts = try self.parseBlockInternal(ast.StmtList);
return try self.mkBlock(stmts);
}
_ = try self.consumeSingle(.RightBrace);
/// parse blocks inside statements
fn parseStmtBlock(self: *@This()) !ast.Block {
var block = try self.parseBlockInternal(ast.Block);
return block;
}