aboutsummaryrefslogtreecommitdiff
path: root/src/tokenizer.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-02-23 12:56:41 -0500
committerAndrew Kelley <superjoe30@gmail.com>2018-02-23 12:56:41 -0500
commit9cfd7dea19c4c54e2754119c04c06cd57cfb759d (patch)
tree3b7950d86f77467b43aa323f80563f678cf6d2fb /src/tokenizer.cpp
parent78bc62fd3415dc1db72c916075c9956fdec407aa (diff)
parentb66547e98c9034e52c5647735b47dc24939c8d15 (diff)
downloadzig-9cfd7dea19c4c54e2754119c04c06cd57cfb759d.tar.gz
zig-9cfd7dea19c4c54e2754119c04c06cd57cfb759d.zip
Merge remote-tracking branch 'origin/master' into llvm6
Diffstat (limited to 'src/tokenizer.cpp')
-rw-r--r--src/tokenizer.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 44d838a723..dd60815b7f 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -125,7 +125,6 @@ static const struct ZigKeyword zig_keywords[] = {
{"false", TokenIdKeywordFalse},
{"fn", TokenIdKeywordFn},
{"for", TokenIdKeywordFor},
- {"goto", TokenIdKeywordGoto},
{"if", TokenIdKeywordIf},
{"inline", TokenIdKeywordInline},
{"nakedcc", TokenIdKeywordNakedCC},
@@ -1542,7 +1541,6 @@ const char * token_name(TokenId id) {
case TokenIdKeywordFalse: return "false";
case TokenIdKeywordFn: return "fn";
case TokenIdKeywordFor: return "for";
- case TokenIdKeywordGoto: return "goto";
case TokenIdKeywordIf: return "if";
case TokenIdKeywordInline: return "inline";
case TokenIdKeywordNakedCC: return "nakedcc";