extendable math operators

Author: CST1229

src/blocks/scratch3_operators.js

@@ -20,6 +20,10 @@ class Scratch3OperatorsBlocks {
             operator_subtract: this.subtract,
             operator_multiply: this.multiply,
             operator_divide: this.divide,
+            operator_add_extendable: this.addExtendable,
+            operator_subtract_extendable: this.subtractExtendable,
+            operator_multiply_extendable: this.multiplyExtendable,
+            operator_divide_extendable: this.divideExtendable,
             operator_lt: this.lt,
             operator_equals: this.equals,
             operator_gt: this.gt,
@@ -40,7 +44,7 @@ class Scratch3OperatorsBlocks {
     }
 
     checkbox () {
-      return true;
+        return true;
     }
 
     add (args) {
@@ -58,6 +62,26 @@ class Scratch3OperatorsBlocks {
     divide (args) {
         return Cast.toNumber(args.NUM1) / Cast.toNumber(args.NUM2);
     }
+    
+    addExtendable (args, util) {
+        const arr = util.extendableToArray(args, 'NUMS', 'NUM');
+        return arr.reduce((a, b) => Cast.toNumber(a) + Cast.toNumber(b));
+    }
+    
+    subtractExtendable (args, util) {
+        const arr = util.extendableToArray(args, 'NUMS', 'NUM');
+        return arr.reduce((a, b) => Cast.toNumber(a) + Cast.toNumber(b));
+    }
+    
+    multiplyExtendable (args, util) {
+        const arr = util.extendableToArray(args, 'NUMS', 'NUM');
+        return arr.reduce((a, b) => Cast.toNumber(a) * Cast.toNumber(b));
+    }
+    
+    divideExtendable (args, util) {
+        const arr = util.extendableToArray(args, 'NUMS', 'NUM');
+        return arr.reduce((a, b) => Cast.toNumber(a) / Cast.toNumber(b));
+    }
 
     lt (args) {
         return Cast.compare(args.OPERAND1, args.OPERAND2) < 0;
@@ -103,13 +127,9 @@ class Scratch3OperatorsBlocks {
         return Cast.toString(args.STRING1) + Cast.toString(args.STRING2);
     }
 
-    joinExtendable (args) {
-        let string = "";
-        const argCount = +args.STRINGS;
-        for (let i = 0; i < argCount; i++) {
-            string += Cast.toString(args["STRINGS_" + i + "_STRING"]);
-        }
-        return string;
+    joinExtendable (args, util) {
+        const arr = util.extendableToArray(args, 'STRINGS', 'STRING');
+        return arr.reduce((a, b) => a + Cast.toString(b), '');
     }
 
     letterOf (args) {

src/compiler/compat-blocks.js

@@ -36,7 +36,11 @@ const stacked = [
 const inputs = [
     'motion_xscroll',
     'motion_yscroll',
+    'operator_add_extendable',
+    'operator_divide_extendable',
     'operator_join_extendable',
+    'operator_multiply_extendable',
+    'operator_subtract_extendable',
     'sensing_loud',
     'sensing_loudness',
     'sensing_userid',

src/engine/block-utility.js

@@ -197,6 +197,24 @@ class BlockUtility {
         return this.thread.getParam(paramName);
     }
 
+    /**
+     * Gets all arguments of a specific name in an extendable input in an args object as an array.
+     * @param {object} args The args object.
+     * @param {string} arg The name of the extendable arugment.
+     * @param {string} innerArg The name of the inner extendable arugment to get.
+     * @returns {array} All 
+     */
+    extendableToArray (args, arg, innerArg) {
+        let length = +args[arg];
+        // NaN and negative
+        if (!(length > 0)) length = 0;
+        const array = new Array(length);
+        for (let i = 0; i < length; i++) {
+            array[i] = args[`${arg}_${i.toString()}_${innerArg}`];
+        }
+        return array;
+    }
+
     /**
      * Start all relevant hats.
      * @param {!string} requestedHat Opcode of hats to start.