From 93c6d724f5375879aa0a0b452da2f64bda548d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20M=C3=B6nig?= Date: Mon, 28 Feb 2022 22:55:22 +0100 Subject: [PATCH] adjusted relabel options for new variadic infix blocks --- HISTORY.md | 1 + src/objects.js | 50 +++++++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 426bae6d..5b1fee1e 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -19,6 +19,7 @@ * German translation update (for "minimum" and "maximum") * threads: added list-type assertions for new variadic blocks * threads: adjusted optimizations for COMBINE to the new variadic infix reporters +* objects. adjusted relabel options for new variadic infix blocks ### 2022-02-27 * variadic infix branch diff --git a/src/objects.js b/src/objects.js index bd99307d..54686a71 100644 --- a/src/objects.js +++ b/src/objects.js @@ -1812,29 +1812,33 @@ SpriteMorph.prototype.blockAlternatives = { reportMouseY: ['reportMouseX'], // operators: - reportSum: ['reportDifference', 'reportProduct', 'reportQuotient', - 'reportPower', 'reportModulus', 'reportAtan2', 'reportMin', - 'reportMax'], - reportDifference: ['reportSum', 'reportProduct', 'reportQuotient', - 'reportPower', 'reportModulus', 'reportAtan2', 'reportMin', - 'reportMax'], - reportProduct: ['reportDifference', 'reportSum', 'reportQuotient', - 'reportPower', 'reportModulus', 'reportAtan2', 'reportMin', - 'reportMax'], - reportQuotient: ['reportDifference', 'reportProduct', 'reportSum', - 'reportPower', 'reportModulus', 'reportAtan2', 'reportMin', - 'reportMax'], - reportPower: ['reportDifference', 'reportProduct', 'reportSum', - 'reportQuotient', 'reportModulus', 'reportAtan2', 'reportMin', - 'reportMax'], - reportModulus: ['reportAtan2', 'reportDifference', 'reportProduct', - 'reportSum','reportQuotient', 'reportPower', 'reportMin', 'reportMax'], - reportAtan2: ['reportModulus', 'reportDifference', 'reportProduct', - 'reportSum','reportQuotient', 'reportPower', 'reportMin', 'reportMax'], - reportMin: ['reportMax', 'reportSum', 'reportDifference', 'reportProduct', - 'reportQuotient', 'reportPower', 'reportModulus', 'reportAtan2'], - reportMax: ['reportMin', 'reportSum', 'reportDifference', 'reportProduct', - 'reportQuotient', 'reportPower', 'reportModulus', 'reportAtan2'], + reportVariadicSum: ['reportDifference', 'reportVariadicProduct', + 'reportQuotient', 'reportPower', 'reportModulus', 'reportAtan2', + 'reportVariadicMin', 'reportVariadicMax'], + reportDifference: ['reportVariadicSum', 'reportVariadicProduct', + 'reportQuotient', 'reportPower', 'reportModulus', 'reportAtan2', + 'reportVariadicMin', 'reportVariadicMax'], + reportVariadicProduct: ['reportDifference', 'reportVariadicSum', + 'reportQuotient', 'reportPower', 'reportModulus', 'reportAtan2', + 'reportVariadicMin', 'reportVariadicMax'], + reportQuotient: ['reportDifference', 'reportVariadicProduct', + 'reportVariadicSum', 'reportPower', 'reportModulus', 'reportAtan2', + 'reportVariadicMin', 'reportVariadicMax'], + reportPower: ['reportDifference', 'reportVariadicProduct', + 'reportVariadicSum', 'reportQuotient', 'reportModulus', 'reportAtan2', + 'reportVariadicMin', 'reportVariadicMax'], + reportModulus: ['reportAtan2', 'reportDifference', 'reportVariadicProduct', + 'reportVariadicSum','reportQuotient', 'reportPower', + 'reportVariadicMin', 'reportVariadicMax'], + reportAtan2: ['reportModulus', 'reportDifference', 'reportVariadicProduct', + 'reportVariadicSum','reportQuotient', 'reportPower', + 'reportVariadicMin', 'reportVariadicMax'], + reportVariadicMin: ['reportVariadicMax', 'reportVariadicSum', + 'reportDifference', 'reportVariadicProduct', 'reportQuotient', + 'reportPower', 'reportModulus', 'reportAtan2'], + reportVariadicMax: ['reportVariadicMin', 'reportVariadicSum', + 'reportDifference', 'reportVariadicProduct', 'reportQuotient', + 'reportPower', 'reportModulus', 'reportAtan2'], reportLessThan: ['reportLessThanOrEquals', 'reportEquals', 'reportIsIdentical', 'reportNotEquals', 'reportGreaterThan', 'reportGreaterThanOrEquals'],