diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-27 11:30:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 11:30:30 +0200 |
| commit | 6a088335163be87d53ece476281d9baa3fcba0a4 (patch) | |
| tree | 7aa37f034a976f44f5ecc68c42b2429d48a97429 /modules/gdscript/gd_parser.cpp | |
| parent | 168d8a57dac98ae82ff16a5c89fce63d84efc3ca (diff) | |
| parent | 015d36d18bb3f9fe21452a470aac2c3a3597b92f (diff) | |
| download | redot-engine-6a088335163be87d53ece476281d9baa3fcba0a4.tar.gz | |
Merge pull request #8933 from Hinsbart/is_keyword
GDScript: Use "is" keyword for type checking.
Diffstat (limited to 'modules/gdscript/gd_parser.cpp')
| -rw-r--r-- | modules/gdscript/gd_parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 4ae62eb1d0..d64cd86de6 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -1077,7 +1077,7 @@ GDParser::Node *GDParser::_parse_expression(Node *p_parent, bool p_static, bool case GDTokenizer::TK_OP_BIT_AND: op = OperatorNode::OP_BIT_AND; break; case GDTokenizer::TK_OP_BIT_OR: op = OperatorNode::OP_BIT_OR; break; case GDTokenizer::TK_OP_BIT_XOR: op = OperatorNode::OP_BIT_XOR; break; - case GDTokenizer::TK_PR_EXTENDS: op = OperatorNode::OP_EXTENDS; break; + case GDTokenizer::TK_PR_IS: op = OperatorNode::OP_IS; break; case GDTokenizer::TK_CF_IF: op = OperatorNode::OP_TERNARY_IF; break; case GDTokenizer::TK_CF_ELSE: op = OperatorNode::OP_TERNARY_ELSE; break; default: valid = false; break; @@ -1117,7 +1117,7 @@ GDParser::Node *GDParser::_parse_expression(Node *p_parent, bool p_static, bool switch (expression[i].op) { - case OperatorNode::OP_EXTENDS: + case OperatorNode::OP_IS: priority = -1; break; //before anything @@ -1420,7 +1420,7 @@ GDParser::Node *GDParser::_reduce_expression(Node *p_node, bool p_to_const) { } } - if (op->op == OperatorNode::OP_EXTENDS) { + if (op->op == OperatorNode::OP_IS) { //nothing much return op; } |