diff options
| author | Anton Yabchinskiy | 2014-12-23 23:44:07 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2014-12-23 23:44:07 +0300 |
| commit | 4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (patch) | |
| tree | b476b0f4aa8df1801361a04390c98cf0e2e3d98b /modules/gdscript/gd_tokenizer.cpp | |
| parent | ff755f93eb86e3f7f6801918457ca77a3001671b (diff) | |
| parent | 530d717a67cc3acab10270dca700db328aa12891 (diff) | |
| download | godot-4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a.tar.gz godot-4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a.tar.zst godot-4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
drivers/SCsub
platform/x11/detect.py
platform/x11/os_x11.h
Diffstat (limited to 'modules/gdscript/gd_tokenizer.cpp')
| -rw-r--r-- | modules/gdscript/gd_tokenizer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp index 0f6ee4161..6f968f208 100644 --- a/modules/gdscript/gd_tokenizer.cpp +++ b/modules/gdscript/gd_tokenizer.cpp @@ -110,7 +110,8 @@ const char* GDTokenizer::token_names[TK_MAX]={ "':'", "'\\n'", "Error", -"EOF"}; +"EOF", +"Cursor"}; const char *GDTokenizer::get_token_name(Token p_token) { @@ -648,6 +649,9 @@ void GDTokenizerText::_advance() { } } break; + case 0xFFFF: { + _make_token(TK_CURSOR); + } break; default: { if (_is_number(GETCHAR(0)) || (GETCHAR(0)=='.' && _is_number(GETCHAR(1)))) { |