ControlBlocks: Add for each loop

Author: adazem009

src/blocks/controlblocks.cpp

@@ -13,6 +13,7 @@ ControlBlocks::ControlBlocks()
     addCompileFunction("control_forever", &compileRepeatForever);
     addCompileFunction("control_repeat", &compileRepeat);
     addCompileFunction("control_repeat_until", &compileRepeatUntil);
+    addCompileFunction("control_for_each", &compileRepeatForEach);
     addCompileFunction("control_if", &compileIfStatement);
     addCompileFunction("control_if_else", &compileIfElseStatement);
     addCompileFunction("control_stop", &compileStop);
@@ -25,9 +26,11 @@ ControlBlocks::ControlBlocks()
     addInput("TIMES", TIMES);
     addInput("CONDITION", CONDITION);
     addInput("DURATION", DURATION);
+    addInput("VALUE", VALUE);
 
     // Fields
     addField("STOP_OPTION", STOP_OPTION);
+    addField("VARIABLE", VARIABLE);
 
     // Field values
     addFieldValue("all", StopAll);
@@ -79,6 +82,19 @@ void ControlBlocks::compileRepeatWhile(Compiler *compiler)
     }
 }
 
+void ControlBlocks::compileRepeatForEach(Compiler *compiler)
+{
+    compiler->addInput(VALUE);
+    auto substack = compiler->inputBlock(SUBSTACK);
+    if (substack) {
+        compiler->addInstruction(vm::OP_REPEAT_LOOP);
+        compiler->addInstruction(vm::OP_REPEAT_LOOP_INDEX1);
+        compiler->addInstruction(vm::OP_SET_VAR, { compiler->variableIndex(compiler->field(VARIABLE)->valuePtr()) });
+        compiler->moveToSubstack(substack, Compiler::SubstackType::Loop);
+    } else
+        compiler->addInstruction(vm::OP_SET_VAR, { compiler->variableIndex(compiler->field(VARIABLE)->valuePtr()) });
+}
+
 void ControlBlocks::compileIfStatement(Compiler *compiler)
 {
     auto substack = compiler->inputBlock(SUBSTACK);

src/blocks/controlblocks.h

@@ -17,12 +17,14 @@ class LIBSCRATCHCPP_EXPORT ControlBlocks : public IBlockSection
             SUBSTACK2,
             TIMES,
             CONDITION,
-            DURATION
+            DURATION,
+            VALUE
         };
 
         enum Fields
         {
-            STOP_OPTION
+            STOP_OPTION,
+            VARIABLE
         };
 
         enum FieldValues
@@ -40,6 +42,7 @@ class LIBSCRATCHCPP_EXPORT ControlBlocks : public IBlockSection
         static void compileRepeat(Compiler *compiler);
         static void compileRepeatUntil(Compiler *compiler);
         static void compileRepeatWhile(Compiler *compiler);
+        static void compileRepeatForEach(Compiler *compiler);
         static void compileIfStatement(Compiler *compiler);
         static void compileIfElseStatement(Compiler *compiler);
         static void compileStop(Compiler *compiler);