scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-06-27 06:40:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Refactor: always push reports to the stack frame

Browse source
This commit is contained in:
Tim Mickel 2016-06-20 14:11:21 -04:00
parent 6181bcd5cb
commit 173f0615d3
1 changed files with 8 additions and 8 deletions

16
src/engine/execute.js
View file

@ -10,7 +10,6 @@ var DEBUG_BLOCK_CALLS = true;
* Execute a block.
* @param {!Sequencer} sequencer Which sequencer is executing.
* @param {!Thread} thread Thread which to read and execute.
* @return {?Any} Reported value, if available immediately.
*/
var execute = function (sequencer, thread) {
var runtime = sequencer.runtime;
@ -47,7 +46,7 @@ var execute = function (sequencer, thread) {
var input = inputs[inputName];
var inputBlockId = input.block;
// Is there a value for this input waiting in the stack frame?
if (!currentStackFrame.reported[inputName]) {
if (typeof currentStackFrame.reported[inputName] === 'undefined') {
// Otherwise, we need to evaluate the block.
// Push to the stack to evaluate this input.
thread.pushStack(inputBlockId);
@ -55,9 +54,8 @@ var execute = function (sequencer, thread) {
console.time('Yielding reporter evaluation');
}
runtime.glowBlock(inputBlockId, true);
var result = execute(sequencer, thread);
// Did the reporter yield?
currentStackFrame.waitingReporter = inputName;
execute(sequencer, thread);
if (thread.status === Thread.STATUS_YIELD) {
// Reporter yielded; don't pop stack and wait for it to unyield.
// The value will be populated once the reporter unyields,
@ -66,8 +64,6 @@ var execute = function (sequencer, thread) {
return;
}
runtime.glowBlock(inputBlockId, false);
thread.pushReportedValue(result);
argValues[inputName] = result;
thread.popStack();
}
argValues[inputName] = currentStackFrame.reported[inputName];
@ -98,12 +94,16 @@ var execute = function (sequencer, thread) {
sequencer.stepToSubstack(thread, substackNum);
}
});
if (thread.status === Thread.STATUS_RUNNING) {
if (DEBUG_BLOCK_CALLS) {
console.log('reporting value: ', primitiveReturnValue);
}
thread.pushReportedValue(primitiveReturnValue);
}
if (DEBUG_BLOCK_CALLS) {
console.log('ending stack frame: ', currentStackFrame);
console.log('returned immediately: ', primitiveReturnValue);
console.groupEnd();
}
return primitiveReturnValue;
};
module.exports = execute;