extendable and/or blocks

Author: CST1229

src/blocks/scratch3_operators.js

@@ -29,6 +29,8 @@ class Scratch3OperatorsBlocks {
             operator_gt: this.gt,
             operator_and: this.and,
             operator_or: this.or,
+            operator_and_extendable: this.andExtendable,
+            operator_or_extendable: this.orExtendable,
             operator_not: this.not,
             operator_random: this.random,
             operator_join: this.join,
@@ -103,6 +105,16 @@ class Scratch3OperatorsBlocks {
         return Cast.toBoolean(args.OPERAND1) || Cast.toBoolean(args.OPERAND2);
     }
 
+    andExtendable (args, util) {
+        const arr = util.extendableToArray(args, 'OPERANDS', 'OPERAND');
+        return !arr.some(input => !Cast.toBoolean(input));
+    }
+
+    orExtendable (args, util) {
+        const arr = util.extendableToArray(args, 'OPERANDS', 'OPERAND');
+        return arr.some(Cast.toBoolean);
+    }
+
     not (args) {
         return !Cast.toBoolean(args.OPERAND);
     }

src/compiler/compat-blocks.js

@@ -37,9 +37,11 @@ const inputs = [
     'motion_xscroll',
     'motion_yscroll',
     'operator_add_extendable',
+    'operator_and_extendable',
     'operator_divide_extendable',
     'operator_join_extendable',
     'operator_multiply_extendable',
+    'operator_or_extendable',
     'operator_subtract_extendable',
     'sensing_loud',
     'sensing_loudness',