godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52705 from vnen/gdscript-error-unary-no-arg 

GDScript: Show error on unary operators without argument
This commit is contained in:
Rémi Verschelde 2021-09-15 16:43:38 +02:00 committed by GitHub
parent a5c299630d d49046938a
commit ed11d03b56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/gdscript/gdscript_parser.cpp
View File

@ -2123,22 +2123,34 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_unary_operator(ExpressionN
operation->operation = UnaryOpNode::OP_NEGATIVE;
operation->variant_op = Variant::OP_NEGATE;
operation->operand = parse_precedence(PREC_SIGN, false);
if (operation->operand == nullptr) {
push_error(R"(Expected expression after "-" operator.)");
}
break;
case GDScriptTokenizer::Token::PLUS:
operation->operation = UnaryOpNode::OP_POSITIVE;
operation->variant_op = Variant::OP_POSITIVE;
operation->operand = parse_precedence(PREC_SIGN, false);
if (operation->operand == nullptr) {
push_error(R"(Expected expression after "+" operator.)");
}
break;
case GDScriptTokenizer::Token::TILDE:
operation->operation = UnaryOpNode::OP_COMPLEMENT;
operation->variant_op = Variant::OP_BIT_NEGATE;
operation->operand = parse_precedence(PREC_BIT_NOT, false);
if (operation->operand == nullptr) {
push_error(R"(Expected expression after "~" operator.)");
}
break;
case GDScriptTokenizer::Token::NOT:
case GDScriptTokenizer::Token::BANG:
operation->operation = UnaryOpNode::OP_LOGIC_NOT;
operation->variant_op = Variant::OP_NOT;
operation->operand = parse_precedence(PREC_LOGIC_NOT, false);
if (operation->operand == nullptr) {
push_error(vformat(R"(Expected expression after "%s" operator.)", op_type == GDScriptTokenizer::Token::NOT ? "not" : "!"));
}
break;
default:
return nullptr; // Unreachable.

2
modules/gdscript/tests/scripts/parser/errors/binary_complement_without_argument.gd Normal file
View File

@ -0,0 +1,2 @@
func test():
print(~)

2
modules/gdscript/tests/scripts/parser/errors/binary_complement_without_argument.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Expected expression after "~" operator.

2
modules/gdscript/tests/scripts/parser/errors/boolean_negation_without_argument.gd Normal file
View File

@ -0,0 +1,2 @@
func test():
print(not)

2
modules/gdscript/tests/scripts/parser/errors/boolean_negation_without_argument.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Expected expression after "not" operator.

2
modules/gdscript/tests/scripts/parser/errors/boolean_negation_without_argument_using_bang.gd Normal file
View File

@ -0,0 +1,2 @@
func test():
print(!)

2
modules/gdscript/tests/scripts/parser/errors/boolean_negation_without_argument_using_bang.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Expected expression after "!" operator.

3
modules/gdscript/tests/scripts/parser/errors/mistaken_decrement_operator.gd Normal file
View File

@ -0,0 +1,3 @@
func test():
var a = 0
print(a--)

2
modules/gdscript/tests/scripts/parser/errors/mistaken_decrement_operator.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Expected expression after "-" operator.

3
modules/gdscript/tests/scripts/parser/errors/mistaken_increment_operator.gd Normal file
View File

@ -0,0 +1,3 @@
func test():
var a = 0
print(a++)

2
modules/gdscript/tests/scripts/parser/errors/mistaken_increment_operator.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Expected expression after "+" operator.