scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-08-14 07:21:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Project wide rename substack -> branch

Browse source
This commit is contained in:
Tim Mickel 2016-08-10 11:27:21 -04:00
parent 34384f1563
commit 7780b25c46
10 changed files with 2403 additions and 2916 deletions
src/engine
sequencer.js

24
src/engine/sequencer.js
View file

@ -85,7 +85,7 @@ Sequencer.prototype.stepThreads = function (threads) {
Sequencer.prototype.startThread = function (thread) {
var currentBlockId = thread.peekStack();
if (!currentBlockId) {
// A "null block" - empty substack.
// A "null block" - empty branch.
// Yield for the frame.
thread.popStack();
thread.setStatus(Thread.STATUS_YIELD_FRAME);
@ -102,22 +102,22 @@ Sequencer.prototype.startThread = function (thread) {
};
/**
* Step a thread into a block's substack.
* @param {!Thread} thread Thread object to step to substack.
* @param {Number} substackNum Which substack to step to (i.e., 1, 2).
* Step a thread into a block's branch.
* @param {!Thread} thread Thread object to step to branch.
* @param {Number} branchNum Which branch to step to (i.e., 1, 2).
*/
Sequencer.prototype.stepToSubstack = function (thread, substackNum) {
if (!substackNum) {
substackNum = 1;
Sequencer.prototype.stepToBranch = function (thread, branchNum) {
if (!branchNum) {
branchNum = 1;
}
var currentBlockId = thread.peekStack();
var substackId = this.runtime.targetForThread(thread).blocks.getSubstack(
var branchId = this.runtime.targetForThread(thread).blocks.getBranch(
currentBlockId,
substackNum
branchNum
);
if (substackId) {
// Push substack ID to the thread's stack.
thread.pushStack(substackId);
if (branchId) {
// Push branch ID to the thread's stack.
thread.pushStack(branchId);
} else {
// Push null, so we come back to the current block.
thread.pushStack(null);