authorgravatar for 14938807+xackus@users.noreply.github.comxackus <14938807+xackus@users.noreply.github.com> 2020-01-10 22:48:51+01:00
committergravatar for 14938807+xackus@users.noreply.github.comxackus <14938807+xackus@users.noreply.github.com> 2020-01-10 22:48:51+01:00
log5880eb3a75b41d8ac26faa0185a83e001197a6e4
treef1384393129fd63a70ca5eb60223ebfda04b9c6b
parentf81529fab17fe1a7ded4f1aae959159563f09efb

stage2 parser: document undefined and clean up

3 files changed, 30 insertions(+), 26 deletions(-)

lib/std/zig/ast.zig+2-1
...@@ -10,6 +10,7 @@ pub const TokenIndex = usize;...@@ -10,6 +10,7 @@ pub const TokenIndex = usize;
10pub const Tree = struct {10pub const Tree = struct {
11 source: []const u8,11 source: []const u8,
12 tokens: TokenList,12 tokens: TokenList,
13 /// undefined on parse error (errors not empty)
13 root_node: *Node.Root,14 root_node: *Node.Root,
14 arena_allocator: std.heap.ArenaAllocator,15 arena_allocator: std.heap.ArenaAllocator,
15 errors: ErrorList,16 errors: ErrorList,
...@@ -612,7 +613,7 @@ pub const Node = struct {...@@ -612,7 +613,7 @@ pub const Node = struct {
612 visib_token: ?TokenIndex,613 visib_token: ?TokenIndex,
613 thread_local_token: ?TokenIndex,614 thread_local_token: ?TokenIndex,
614 name_token: TokenIndex,615 name_token: TokenIndex,
615 eq_token: TokenIndex,616 eq_token: ?TokenIndex,
616 mut_token: TokenIndex,617 mut_token: TokenIndex,
617 comptime_token: ?TokenIndex,618 comptime_token: ?TokenIndex,
618 extern_export_token: ?TokenIndex,619 extern_export_token: ?TokenIndex,
lib/std/zig/parse.zig+27-24
...@@ -13,7 +13,7 @@ pub const Error = error{ParseError} || Allocator.Error;...@@ -13,7 +13,7 @@ pub const Error = error{ParseError} || Allocator.Error;
1313
14/// Result should be freed with tree.deinit() when there are14/// Result should be freed with tree.deinit() when there are
15/// no more references to any of the tokens or nodes.15/// no more references to any of the tokens or nodes.
16pub fn parse(allocator: *Allocator, source: []const u8) !*Tree {16pub fn parse(allocator: *Allocator, source: []const u8) Allocator.Error!*Tree {
17 const tree = blk: {17 const tree = blk: {
18 // This block looks unnecessary, but is a "foot-shield" to prevent the SegmentedLists18 // This block looks unnecessary, but is a "foot-shield" to prevent the SegmentedLists
19 // from being initialized with a pointer to this `arena`, which is created on19 // from being initialized with a pointer to this `arena`, which is created on
...@@ -48,29 +48,32 @@ pub fn parse(allocator: *Allocator, source: []const u8) !*Tree {...@@ -48,29 +48,32 @@ pub fn parse(allocator: *Allocator, source: []const u8) !*Tree {
4848
49 while (it.peek().?.id == .LineComment) _ = it.next();49 while (it.peek().?.id == .LineComment) _ = it.next();
5050
51 tree.root_node = try parseRoot(arena, &it, tree);51 tree.root_node = parseRoot(arena, &it, tree) catch |err| blk: {
52 switch (err) {
53 error.ParseError => {
54 assert(tree.errors.len != 0);
55 break :blk undefined;
56 },
57 error.OutOfMemory => {
58 return error.OutOfMemory;
59 },
60 }
61 };
62
52 return tree;63 return tree;
53}64}
5465
55/// Root <- skip ContainerMembers eof66/// Root <- skip ContainerMembers eof
56fn parseRoot(arena: *Allocator, it: *TokenIterator, tree: *Tree) Allocator.Error!*Node.Root {67fn parseRoot(arena: *Allocator, it: *TokenIterator, tree: *Tree) Error!*Node.Root {
57 const node = try arena.create(Node.Root);68 const node = try arena.create(Node.Root);
58 node.* = Node.Root{69 node.* = Node.Root{
59 .decls = undefined,70 .decls = try parseContainerMembers(arena, it, tree),
60 .eof_token = undefined,71 .eof_token = eatToken(it, .Eof) orelse {
61 };72 try tree.errors.push(AstError{
62 node.decls = parseContainerMembers(arena, it, tree) catch |err| {73 .ExpectedContainerMembers = .{ .token = it.index },
63 // TODO: Switch on the error type74 });
64 // https://github.com/ziglang/zig/issues/247375 return error.ParseError;
65 if (err == error.ParseError) return node;76 },
66 assert(err == Allocator.Error.OutOfMemory);
67 return Allocator.Error.OutOfMemory;
68 };
69 node.eof_token = eatToken(it, .Eof) orelse {
70 try tree.errors.push(AstError{
71 .ExpectedContainerMembers = AstError.ExpectedContainerMembers{ .token = it.index },
72 });
73 return node;
74 };77 };
75 return node;78 return node;
76}79}
...@@ -400,7 +403,7 @@ fn parseVarDecl(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {...@@ -400,7 +403,7 @@ fn parseVarDecl(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
400 .visib_token = null,403 .visib_token = null,
401 .thread_local_token = null,404 .thread_local_token = null,
402 .name_token = name_token,405 .name_token = name_token,
403 .eq_token = eq_token orelse undefined,406 .eq_token = eq_token,
404 .mut_token = mut_token,407 .mut_token = mut_token,
405 .comptime_token = null,408 .comptime_token = null,
406 .extern_export_token = null,409 .extern_export_token = null,
...@@ -2187,7 +2190,7 @@ fn parsePrefixOp(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {...@@ -2187,7 +2190,7 @@ fn parsePrefixOp(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
2187 node.* = Node.PrefixOp{2190 node.* = Node.PrefixOp{
2188 .op_token = token.index,2191 .op_token = token.index,
2189 .op = op,2192 .op = op,
2190 .rhs = undefined,2193 .rhs = undefined, // set by caller
2191 };2194 };
2192 return &node.base;2195 return &node.base;
2193}2196}
...@@ -2829,8 +2832,8 @@ fn parseUse(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {...@@ -2829,8 +2832,8 @@ fn parseUse(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
2829 .doc_comments = null,2832 .doc_comments = null,
2830 .visib_token = null,2833 .visib_token = null,
2831 .use_token = token,2834 .use_token = token,
2832 .expr = undefined,2835 .expr = undefined, // set by caller
2833 .semicolon_token = undefined,2836 .semicolon_token = undefined, // set by caller
2834 };2837 };
2835 return &node.base;2838 return &node.base;
2836}2839}
...@@ -2989,9 +2992,9 @@ fn createInfixOp(arena: *Allocator, index: TokenIndex, op: Node.InfixOp.Op) !*No...@@ -2989,9 +2992,9 @@ fn createInfixOp(arena: *Allocator, index: TokenIndex, op: Node.InfixOp.Op) !*No
2989 const node = try arena.create(Node.InfixOp);2992 const node = try arena.create(Node.InfixOp);
2990 node.* = Node.InfixOp{2993 node.* = Node.InfixOp{
2991 .op_token = index,2994 .op_token = index,
2992 .lhs = undefined,2995 .lhs = undefined, // set by caller
2993 .op = op,2996 .op = op,
2994 .rhs = undefined,2997 .rhs = undefined, // set by caller
2995 };2998 };
2996 return &node.base;2999 return &node.base;
2997}3000}
lib/std/zig/render.zig+1-1
...@@ -2020,7 +2020,7 @@ fn renderVarDecl(...@@ -2020,7 +2020,7 @@ fn renderVarDecl(
20202020
2021 if (var_decl.init_node) |init_node| {2021 if (var_decl.init_node) |init_node| {
2022 const s = if (init_node.id == .MultilineStringLiteral) Space.None else Space.Space;2022 const s = if (init_node.id == .MultilineStringLiteral) Space.None else Space.Space;
2023 try renderToken(tree, stream, var_decl.eq_token, indent, start_col, s); // =2023 try renderToken(tree, stream, var_decl.eq_token.?, indent, start_col, s); // =
2024 try renderExpression(allocator, stream, tree, indent, start_col, init_node, Space.None);2024 try renderExpression(allocator, stream, tree, indent, start_col, init_node, Space.None);
2025 }2025 }
20262026