scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-09 14:32:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move stepping logic for reporters to sequencer

Browse source
This commit is contained in:
Tim Mickel 2016-06-20 15:04:28 -04:00
parent f802faa461
commit c63747e61b
2 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/engine/execute.js
View file

@ -48,24 +48,13 @@ var execute = function (sequencer, thread) {
// Is there no value for this input waiting in the stack frame?
if (typeof currentStackFrame.reported[inputName] === 'undefined') {
// If there's not, we need to evaluate the block.
// Push to the stack to evaluate this input.
thread.pushStack(inputBlockId);
if (DEBUG_BLOCK_CALLS) {
console.time('Reporter evaluation');
}
runtime.glowBlock(inputBlockId, true);
// Save name of input for `Thread.pushReportedValue`.
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,
// and passed up to the currentStackFrame on next execution.
var reporterYielded = (
sequencer.stepToReporter(thread, inputBlockId, inputName)
);
// If the reporter yielded, return immediately;
// it needs time to finish and report its value.
if (reporterYielded) {
return;
} else {
// Reporter finished right away; pop the stack.
runtime.glowBlock(inputBlockId, false);
thread.popStack();
}
}
argValues[inputName] = currentStackFrame.reported[inputName];

27
src/engine/sequencer.js
View file

@ -127,6 +127,33 @@ Sequencer.prototype.stepToSubstack = function (thread, substackNum) {
}
};
/**
* Step a thread into an input reporter, and manage its status appropriately.
* @param {!Thread} thread Thread object to step to reporter.
* @param {!string} blockId ID of reporter block.
* @param {!string} inputName Name of input on parent block.
* @return {boolean} True if yielded, false if it finished immediately.
*/
Sequencer.prototype.stepToReporter = function (thread, blockId, inputName) {
var currentStackFrame = thread.peekStackFrame();
// Push to the stack to evaluate the reporter block.
thread.pushStack(blockId);
// Save name of input for `Thread.pushReportedValue`.
currentStackFrame.waitingReporter = inputName;
// Actually execute the block.
this.startThread(thread);
if (thread.status === Thread.STATUS_YIELD) {
// Reporter yielded; caller must wait for it to unyield.
// The value will be populated once the reporter unyields,
// and passed up to the currentStackFrame on next execution.
return true;
} else if (thread.status === Thread.STATUS_DONE) {
// Reporter finished, mark the thread as running.
thread.status = Thread.STATUS_RUNNING;
return false;
}
};
/**
* Finish stepping a thread and proceed it to the next block.
* @param {!Thread} thread Thread object to proceed.