diff options
| author | Rémi Verschelde | 2017-04-06 23:05:29 +0200 |
|---|---|---|
| committer | GitHub | 2017-04-06 23:05:29 +0200 |
| commit | 3916d964de9f8697fb129c08fcee2d72b4696880 (patch) | |
| tree | 795b412485a1bc4fad21336897a7fa17d74c9c96 /modules/gdscript/gd_tokenizer.cpp | |
| parent | 6ff1436fde9aac33b685129fd12a488ab0a15c36 (diff) | |
| parent | dad8e04139100143e4a2884c84c5c32bdff9c951 (diff) | |
| download | godot-3916d964de9f8697fb129c08fcee2d72b4696880.tar.gz godot-3916d964de9f8697fb129c08fcee2d72b4696880.tar.zst godot-3916d964de9f8697fb129c08fcee2d72b4696880.zip | |
Merge pull request #8293 from Faless/2.1-enum
[2.1] Cherry pick GDScript enum support ( #6292 )
Diffstat (limited to 'modules/gdscript/gd_tokenizer.cpp')
| -rw-r--r-- | modules/gdscript/gd_tokenizer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp index 3d9d49303..65156f0a9 100644 --- a/modules/gdscript/gd_tokenizer.cpp +++ b/modules/gdscript/gd_tokenizer.cpp @@ -95,6 +95,7 @@ const char *GDTokenizer::token_names[TK_MAX] = { "setget", "const", "var", + "enum", "preload", "assert", "yield", @@ -861,6 +862,7 @@ void GDTokenizerText::_advance() { { TK_PR_SIGNAL, "signal" }, { TK_PR_BREAKPOINT, "breakpoint" }, { TK_PR_CONST, "const" }, + { TK_PR_ENUM, "enum" }, //controlflow { TK_CF_IF, "if" }, { TK_CF_ELIF, "elif" }, |