authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-10 15:55:38-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-10 15:55:54-04:00
log918dbd4551f6c737d1c4b7416ef40b59c902eac8
treeb2bc9b5958e392912a1a44901d44d8c62a31c6a8
parentfa9fcab620ada24d9bb7c51a86a1a8944056da02
signaturelock-open Commit is signed but in an unrecognized format.

std.zig: `this` is no longer a keyword

6 files changed, 0 insertions(+), 30 deletions(-)

doc/docgen.zig-1
...@@ -795,7 +795,6 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok...@@ -795,7 +795,6 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok
795 std.zig.Token.Id.Keyword_null,795 std.zig.Token.Id.Keyword_null,
796 std.zig.Token.Id.Keyword_true,796 std.zig.Token.Id.Keyword_true,
797 std.zig.Token.Id.Keyword_false,797 std.zig.Token.Id.Keyword_false,
798 std.zig.Token.Id.Keyword_this,
799 => {798 => {
800 try out.write("<span class=\"tok-null\">");799 try out.write("<span class=\"tok-null\">");
801 try writeEscaped(out, src[token.start..token.end]);800 try writeEscaped(out, src[token.start..token.end]);
src-self-hosted/ir.zig-1
...@@ -1151,7 +1151,6 @@ pub const Builder = struct {...@@ -1151,7 +1151,6 @@ pub const Builder = struct {
1151 ast.Node.Id.BoolLiteral => return error.Unimplemented,1151 ast.Node.Id.BoolLiteral => return error.Unimplemented,
1152 ast.Node.Id.NullLiteral => return error.Unimplemented,1152 ast.Node.Id.NullLiteral => return error.Unimplemented,
1153 ast.Node.Id.UndefinedLiteral => return error.Unimplemented,1153 ast.Node.Id.UndefinedLiteral => return error.Unimplemented,
1154 ast.Node.Id.ThisLiteral => return error.Unimplemented,
1155 ast.Node.Id.Unreachable => return error.Unimplemented,1154 ast.Node.Id.Unreachable => return error.Unimplemented,
1156 ast.Node.Id.Identifier => {1155 ast.Node.Id.Identifier => {
1157 const identifier = @fieldParentPtr(ast.Node.Identifier, "base", node);1156 const identifier = @fieldParentPtr(ast.Node.Identifier, "base", node);
std/zig/ast.zig-18
...@@ -302,7 +302,6 @@ pub const Node = struct {...@@ -302,7 +302,6 @@ pub const Node = struct {
302 BoolLiteral,302 BoolLiteral,
303 NullLiteral,303 NullLiteral,
304 UndefinedLiteral,304 UndefinedLiteral,
305 ThisLiteral,
306 Unreachable,305 Unreachable,
307 Identifier,306 Identifier,
308 GroupedExpression,307 GroupedExpression,
...@@ -1997,23 +1996,6 @@ pub const Node = struct {...@@ -1997,23 +1996,6 @@ pub const Node = struct {
1997 }1996 }
1998 };1997 };
19991998
2000 pub const ThisLiteral = struct {
2001 base: Node,
2002 token: TokenIndex,
2003
2004 pub fn iterate(self: *ThisLiteral, index: usize) ?*Node {
2005 return null;
2006 }
2007
2008 pub fn firstToken(self: *const ThisLiteral) TokenIndex {
2009 return self.token;
2010 }
2011
2012 pub fn lastToken(self: *const ThisLiteral) TokenIndex {
2013 return self.token;
2014 }
2015 };
2016
2017 pub const AsmOutput = struct {1999 pub const AsmOutput = struct {
2018 base: Node,2000 base: Node,
2019 lbracket: TokenIndex,2001 lbracket: TokenIndex,
std/zig/parse.zig-4
...@@ -2563,10 +2563,6 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {...@@ -2563,10 +2563,6 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
2563 _ = try createToCtxLiteral(arena, opt_ctx, ast.Node.NullLiteral, token.index);2563 _ = try createToCtxLiteral(arena, opt_ctx, ast.Node.NullLiteral, token.index);
2564 continue;2564 continue;
2565 },2565 },
2566 Token.Id.Keyword_this => {
2567 _ = try createToCtxLiteral(arena, opt_ctx, ast.Node.ThisLiteral, token.index);
2568 continue;
2569 },
2570 Token.Id.Keyword_var => {2566 Token.Id.Keyword_var => {
2571 _ = try createToCtxLiteral(arena, opt_ctx, ast.Node.VarType, token.index);2567 _ = try createToCtxLiteral(arena, opt_ctx, ast.Node.VarType, token.index);
2572 continue;2568 continue;
std/zig/render.zig-4
...@@ -880,10 +880,6 @@ fn renderExpression(...@@ -880,10 +880,6 @@ fn renderExpression(
880 const null_literal = @fieldParentPtr(ast.Node.NullLiteral, "base", base);880 const null_literal = @fieldParentPtr(ast.Node.NullLiteral, "base", base);
881 return renderToken(tree, stream, null_literal.token, indent, start_col, space);881 return renderToken(tree, stream, null_literal.token, indent, start_col, space);
882 },882 },
883 ast.Node.Id.ThisLiteral => {
884 const this_literal = @fieldParentPtr(ast.Node.ThisLiteral, "base", base);
885 return renderToken(tree, stream, this_literal.token, indent, start_col, space);
886 },
887 ast.Node.Id.Unreachable => {883 ast.Node.Id.Unreachable => {
888 const unreachable_node = @fieldParentPtr(ast.Node.Unreachable, "base", base);884 const unreachable_node = @fieldParentPtr(ast.Node.Unreachable, "base", base);
889 return renderToken(tree, stream, unreachable_node.token, indent, start_col, space);885 return renderToken(tree, stream, unreachable_node.token, indent, start_col, space);
std/zig/tokenizer.zig-2
...@@ -52,7 +52,6 @@ pub const Token = struct {...@@ -52,7 +52,6 @@ pub const Token = struct {
52 Keyword{ .bytes = "suspend", .id = Id.Keyword_suspend },52 Keyword{ .bytes = "suspend", .id = Id.Keyword_suspend },
53 Keyword{ .bytes = "switch", .id = Id.Keyword_switch },53 Keyword{ .bytes = "switch", .id = Id.Keyword_switch },
54 Keyword{ .bytes = "test", .id = Id.Keyword_test },54 Keyword{ .bytes = "test", .id = Id.Keyword_test },
55 Keyword{ .bytes = "this", .id = Id.Keyword_this },
56 Keyword{ .bytes = "threadlocal", .id = Id.Keyword_threadlocal },55 Keyword{ .bytes = "threadlocal", .id = Id.Keyword_threadlocal },
57 Keyword{ .bytes = "true", .id = Id.Keyword_true },56 Keyword{ .bytes = "true", .id = Id.Keyword_true },
58 Keyword{ .bytes = "try", .id = Id.Keyword_try },57 Keyword{ .bytes = "try", .id = Id.Keyword_try },
...@@ -183,7 +182,6 @@ pub const Token = struct {...@@ -183,7 +182,6 @@ pub const Token = struct {
183 Keyword_suspend,182 Keyword_suspend,
184 Keyword_switch,183 Keyword_switch,
185 Keyword_test,184 Keyword_test,
186 Keyword_this,
187 Keyword_threadlocal,185 Keyword_threadlocal,
188 Keyword_true,186 Keyword_true,
189 Keyword_try,187 Keyword_try,