diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-29 09:44:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 09:44:03 +0200 |
| commit | d0b62ce1558766134ea2fc6bcf912e837d0ae40b (patch) | |
| tree | a0ce8cb1d18ff5000d30bc854102cd7681ff474d /modules/gdscript/gdscript_tokenizer.cpp | |
| parent | e2bf28e80599d5bbe362410f2261a1abf495afa5 (diff) | |
| parent | a5e8a3be5e0ed2e7c6b1a9cc5803d96391b180f3 (diff) | |
| download | redot-engine-d0b62ce1558766134ea2fc6bcf912e837d0ae40b.tar.gz | |
Merge pull request #19021 from Faless/rpc_sync_fix
RPCMode refactor, more sync modes
Diffstat (limited to 'modules/gdscript/gdscript_tokenizer.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_tokenizer.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index 6a844cd651..3c8e1ddbe4 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -110,6 +110,9 @@ const char *GDScriptTokenizer::token_names[TK_MAX] = { "sync", "master", "slave", + "remotesync", + "mastersync", + "slavesync", "'['", "']'", "'{'", @@ -201,6 +204,9 @@ static const _kws _keyword_list[] = { { GDScriptTokenizer::TK_PR_MASTER, "master" }, { GDScriptTokenizer::TK_PR_SLAVE, "slave" }, { GDScriptTokenizer::TK_PR_SYNC, "sync" }, + { GDScriptTokenizer::TK_PR_REMOTESYNC, "remotesync" }, + { GDScriptTokenizer::TK_PR_MASTERSYNC, "mastersync" }, + { GDScriptTokenizer::TK_PR_SLAVESYNC, "slavesync" }, { GDScriptTokenizer::TK_PR_CONST, "const" }, { GDScriptTokenizer::TK_PR_ENUM, "enum" }, //controlflow @@ -247,6 +253,9 @@ bool GDScriptTokenizer::is_token_literal(int p_offset, bool variable_safe) const case TK_PR_MASTER: case TK_PR_SLAVE: case TK_PR_SYNC: + case TK_PR_REMOTESYNC: + case TK_PR_MASTERSYNC: + case TK_PR_SLAVESYNC: return true; // Literal for non-variables only: |