poop

Author: jwklong

src/compiler/enums.js

@@ -193,7 +193,8 @@ const StackOpcode = {
     COMMENTS_LOOP: 'comments.loop',
 
     PROCEDURE_RETURN: 'procedures.return',
-    PROCEDURE_CALL: 'procedures.call'
+    PROCEDURE_CALL: 'procedures.call',
+    PROCEDURE_BRANCH: 'procedures.branch'
 };
 
 /**

src/compiler/irgen.js

@@ -761,6 +761,13 @@ class ScriptTreeGenerator {
         }
 
         switch (block.opcode) {
+        case 'argument_reporter_statement': {
+            // see argument_reporter_string_number above
+            const name = block.fields.VALUE.value;
+            const index = this.script.arguments.lastIndexOf(name);
+            return new IntermediateStackBlock(StackOpcode.PROCEDURE_BRANCH, {index});
+        }
+
         case 'control_all_at_once':
             // In Scratch 3, this block behaves like "if 1 = 1"
             return new IntermediateStackBlock(StackOpcode.CONTROL_IF_ELSE, {
@@ -1249,7 +1256,12 @@ class ScriptTreeGenerator {
         for (let i = 0; i < paramIds.length; i++) {
             let value;
             if (block.inputs[paramIds[i]] && block.inputs[paramIds[i]].block) {
-                value = this.descendInputOfBlock(block, paramIds[i], true);
+                if (paramIds[i].startsWith("SUBSTACK")) {
+                    value = this.descendSubstack(block, paramIds[i]);
+                } else {
+                    value = this.descendInputOfBlock(block, paramIds[i], true);
+                }
+                
             } else {
                 value = this.createConstantInput(paramDefaults[i], true);
             }

src/compiler/jsgen.js

@@ -106,6 +106,7 @@ class JSGenerator {
         this.isWarp = script.isWarp;
         this.isProcedure = script.isProcedure;
         this.warpTimer = script.warpTimer;
+        this.allowReturns = false;
 
         /**
          * Stack of frames, most recent is last item.
@@ -461,7 +462,22 @@ class JSGenerator {
             const procedureReference = `thread.procedures["${sanitize(procedureVariant)}"]`;
             const args = [];
             for (const input of node.arguments) {
-                args.push(this.descendInput(input));
+                if (input instanceof IntermediateStack) {
+                    const oldSource = this.source;
+                    this.source = "function*(thread, target, runtime, stage) {\n";
+                    const oldWarp = this.isWarp;
+                    this.isWarp = procedureData.isWarp;
+                    const oldReturns = this.allowReturns;
+                    this.allowReturns = true;
+                    this.descendStack(input);
+                    this.source += `}`;
+                    args.push(this.source);
+                    this.allowReturns = oldReturns;
+                    this.isWarp = oldWarp;
+                    this.source = oldSource;
+                } else {
+                    args.push(this.descendInput(input));
+                }
             }
             const joinedArgs = args.join(',');
 
@@ -929,6 +945,8 @@ class JSGenerator {
                 // Direct yields.
                 this.yieldNotWarp();
             }
+            let outputVariable = this.localVariables.next();
+            this.source += `let ${outputVariable} = `;
             if (procedureData.yields) {
                 this.source += 'yield* ';
                 if (!this.script.yields) {
@@ -938,15 +956,43 @@ class JSGenerator {
             this.source += `thread.procedures["${sanitize(procedureVariant)}"](`;
             const args = [];
             for (const input of node.arguments) {
-                args.push(this.descendInput(input));
+                if (input instanceof IntermediateStack) {
+                    const oldSource = this.source;
+                    this.source = "function*(thread, target, runtime, stage) {\n";
+                    const oldWarp = this.isWarp;
+                    this.isWarp = procedureData.isWarp;
+                    const oldReturns = this.allowReturns;
+                    this.allowReturns = true;
+                    this.descendStack(input);
+                    this.source += `}`;
+                    args.push(this.source);
+                    this.allowReturns = oldReturns;
+                    this.isWarp = oldWarp;
+                    this.source = oldSource;
+                } else {
+                    args.push(this.descendInput(input));
+                }
             }
             this.source += args.join(',');
             this.source += `);\n`;
+            const thisData = this.ir.procedures[this.script.procedureVariant];
+            if (thisData && !thisData.returns) {
+                this.source += `if (${outputVariable} !== undefined) { return ${outputVariable}; };\n`
+            }
             break;
         }
         case StackOpcode.PROCEDURE_RETURN:
             this.stopScriptAndReturn(this.descendInput(node.value));
             break;
+        case StackOpcode.PROCEDURE_BRANCH:
+            if (node.index !== -1) {
+                let outputVariable = this.localVariables.next();
+                this.source += `let ${outputVariable} = yield* (p${node.index} || function*(){})(thread, target, runtime, stage);\n`;
+                this.source += `if (${outputVariable} !== undefined) {\n`;
+                this.stopScriptAndReturn(outputVariable);
+                this.source += `};\n`
+            }
+            break;
 
         case StackOpcode.SENSING_TIMER_RESET:
             this.source += 'runtime.ioDevices.clock.resetProjectTimer();\n';
@@ -1190,7 +1236,7 @@ class JSGenerator {
      * @param {string} valueJS JS code of value to return.
      */
     stopScriptAndReturn (valueJS) {
-        if (this.isProcedure) {
+        if (this.isProcedure || this.allowReturns) {
             this.source += `return ${valueJS};\n`;
         } else {
             this.retire();