diff options
| author | Karroffel <therzog@mail.de> | 2017-07-25 20:01:19 +0200 |
|---|---|---|
| committer | Karroffel <therzog@mail.de> | 2017-07-25 20:01:19 +0200 |
| commit | 5319098aefc89622af9700162f2367d0cc565955 (patch) | |
| tree | 1145d0a6624936a7e1761edd21c4ec3c1e85b761 | |
| parent | 497411aa124f665e6f89bc6137c65fbd106a7859 (diff) | |
fix a regression (GDScript) from e00630b
This removes `not` from the variable safe list of
keywords.
Before that this was a valid expression:
self.!(some_arg)
The other fix is just a forgotten boolean negation.
| -rw-r--r-- | modules/gdscript/gd_parser.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gd_tokenizer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 6e873c9197..ba0413a5a9 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -3283,7 +3283,7 @@ void GDParser::_parse_class(ClassNode *p_class) { break; } - if (tokenizer->is_token_literal(0, true)) { + if (!tokenizer->is_token_literal(0, true)) { _set_error("Expected identifier in signal argument."); return; } diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp index 95774cb6d6..01e3835494 100644 --- a/modules/gdscript/gd_tokenizer.cpp +++ b/modules/gdscript/gd_tokenizer.cpp @@ -250,7 +250,7 @@ bool GDTokenizer::is_token_literal(int p_offset, bool variable_safe) const { case TK_BUILT_IN_FUNC: case TK_OP_IN: - case TK_OP_NOT: + //case TK_OP_NOT: //case TK_OP_OR: //case TK_OP_AND: |