Skip to content

Add short-circuiting logic for Expression AND/OR operators #107945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

aaronp64
Copy link
Contributor

Added OperatorNode::should_short_circuit method, to use in Expression::_execute to return early when possible.

Fixes #107025

Tested with gdscript below:

func _ready() -> void:
	test_expr("true_func() and false_func()")
	test_expr("false_func() && false_func()")
	test_expr("false_func() || false_func()")
	test_expr("true_func() or false_func()")

func true_func() -> bool:
	print("true_func() called")
	return true

func false_func() -> bool:
	print("false_func() called")
	return false
	
func test_expr(p_expr: String):
	var test_name: String = p_expr.replace("_func()", "")
	print("%s\n----------" % [test_name])
	var expr = Expression.new()
	expr.parse(p_expr)
	var result = expr.execute([], self)
	print("Result: %s\n" % [result])

old:

true and false
----------
true_func() called
false_func() called
Result: false

false && false
----------
false_func() called
false_func() called
Result: false

false || false
----------
false_func() called
false_func() called
Result: false

true or false
----------
true_func() called
false_func() called
Result: true

new:

true and false
----------
true_func() called
false_func() called
Result: false

false && false
----------
false_func() called
Result: false

false || false
----------
false_func() called
false_func() called
Result: false

true or false
----------
true_func() called
Result: true

Added OperatorNode::should_short_circuit method, to use in Expression::_execute to return early when possible.
@aaronp64 aaronp64 requested a review from a team as a code owner June 24, 2025 16:42
@dalexeev dalexeev added this to the 4.6 milestone Jun 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Expression class does not respect short-circuit evaluation in and operator
2 participants