summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-02-01 14:19:48 +0100
committerGitHub <noreply@github.com>2018-02-01 14:19:48 +0100
commit6449af9f746b6328c7791e87b70b56eb74d8a9b9 (patch)
tree447fca75e0871d7dd34107b36fb7cc9b4edb2847 /modules
parent7fdde54586e9eacbdf5e6f07cb0c1157fade63be (diff)
parent3dcf0567a11887a460aefc76b3bce8636d688019 (diff)
Merge pull request #16175 from NathanWarden/add_async_and_await
Added async and await as C# keywords.
Diffstat (limited to 'modules')
-rw-r--r--modules/mono/csharp_script.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 62f83ee430..3119869569 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -176,7 +176,7 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
"fixed",
"float",
"for",
- "forech",
+ "foreach",
"goto",
"if",
"implicit",
@@ -222,14 +222,17 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
"ushort",
"using",
"virtual",
- "volatile",
"void",
+ "volatile",
"while",
// Contextual keywords. Not reserved words, but I guess we should include
// them because this seems to be used only for syntax highlighting.
"add",
+ "alias",
"ascending",
+ "async",
+ "await",
"by",
"descending",
"dynamic",
@@ -238,10 +241,10 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
"get",
"global",
"group",
- "in",
"into",
"join",
"let",
+ "nameof",
"on",
"orderby",
"partial",
@@ -250,6 +253,7 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
"set",
"value",
"var",
+ "when",
"where",
"yield",
0