aboutsummaryrefslogtreecommitdiff
path: root/src/tokenizer.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-02-06 20:21:13 -0500
committerGitHub <noreply@github.com>2019-02-06 20:21:13 -0500
commit8a5d3e2eaf72195993e4932bfda66d08a36c6064 (patch)
tree6a09c68ee70d00e97feeae55b213203fbaddc295 /src/tokenizer.cpp
parent3abf293a84b4dc052c0d735018db520eade6274b (diff)
parent89ffb5819703c81514e4f29d2cadb5b74ea1f840 (diff)
downloadzig-8a5d3e2eaf72195993e4932bfda66d08a36c6064.tar.gz
zig-8a5d3e2eaf72195993e4932bfda66d08a36c6064.zip
Merge pull request #1924 from ziglang/tls
Implement Thread Local Variables
Diffstat (limited to 'src/tokenizer.cpp')
-rw-r--r--src/tokenizer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index d43bfabf6d..3acd605748 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -146,6 +146,7 @@ static const struct ZigKeyword zig_keywords[] = {
{"suspend", TokenIdKeywordSuspend},
{"switch", TokenIdKeywordSwitch},
{"test", TokenIdKeywordTest},
+ {"threadlocal", TokenIdKeywordThreadLocal},
{"true", TokenIdKeywordTrue},
{"try", TokenIdKeywordTry},
{"undefined", TokenIdKeywordUndefined},
@@ -1586,6 +1587,7 @@ const char * token_name(TokenId id) {
case TokenIdKeywordStruct: return "struct";
case TokenIdKeywordSwitch: return "switch";
case TokenIdKeywordTest: return "test";
+ case TokenIdKeywordThreadLocal: return "threadlocal";
case TokenIdKeywordTrue: return "true";
case TokenIdKeywordTry: return "try";
case TokenIdKeywordUndefined: return "undefined";