krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 14:54:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Added short-circuiting support to && and ||

Browse Source
This commit is contained in:
Kayne Ruse
2023-03-11 17:59:09 +11:00
parent 68ed52b347
commit f2f8aed23a
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/toy_interpreter.c
View File

@@ -1082,11 +1082,12 @@ static bool execAnd(Toy_Interpreter* interpreter) {
return false; return false;
} }
if (TOY_IS_TRUTHY(lhs) && TOY_IS_TRUTHY(rhs)) { //short-circuit support
Toy_pushLiteralArray(&interpreter->stack, TOY_TO_BOOLEAN_LITERAL(true)); if (!TOY_IS_TRUTHY(lhs)) {
Toy_pushLiteralArray(&interpreter->stack, lhs);
} }
else { else {
Toy_pushLiteralArray(&interpreter->stack, TOY_TO_BOOLEAN_LITERAL(false)); Toy_pushLiteralArray(&interpreter->stack, rhs);
} }
Toy_freeLiteral(lhs); Toy_freeLiteral(lhs);
@@ -1115,11 +1116,12 @@ static bool execOr(Toy_Interpreter* interpreter) {
return false; return false;
} }
if (TOY_IS_TRUTHY(lhs) || TOY_IS_TRUTHY(rhs)) { //short-circuit support
Toy_pushLiteralArray(&interpreter->stack, TOY_TO_BOOLEAN_LITERAL(true)); if (TOY_IS_TRUTHY(lhs)) {
Toy_pushLiteralArray(&interpreter->stack, lhs);
} }
else { else {
Toy_pushLiteralArray(&interpreter->stack, TOY_TO_BOOLEAN_LITERAL(false)); Toy_pushLiteralArray(&interpreter->stack, rhs);
} }
Toy_freeLiteral(lhs); Toy_freeLiteral(lhs);

3
test/scripts/comparisons.toy
View File

@@ -23,5 +23,8 @@ assert !false, "!false";
var c = false; var c = false;
assert !c, "!c"; assert !c, "!c";
//test multiple comparisons
assert 1 == 2 == false, "Left-accociative equality failed";
print "All good"; print "All good";

9
test/scripts/short-circuiting-support.toy Normal file
View File

@@ -0,0 +1,9 @@
//explicitly support && and || short circuits
assert 1 && 2 == 2, "&& short-circuit failed";
assert 1 || 2 == 1, "|| short-circuit failed";
print "All good";

1
test/test_interpreter.c
View File

@@ -132,6 +132,7 @@ int main() {
"panic-within-functions.toy", "panic-within-functions.toy",
"polyfill-insert.toy", "polyfill-insert.toy",
"polyfill-remove.toy", "polyfill-remove.toy",
"short-circuiting-support.toy",
"ternary-expressions.toy", "ternary-expressions.toy",
"types.toy", "types.toy",
NULL NULL