scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-03-13 17:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2192 from apple502j/list-cast-safely

Browse source 
Fix Cast.LIST_ALL casting case
This commit is contained in:
Karishma Chadha 2019-09-17 17:53:00 -07:00 committed by GitHub
commit 5be322c1d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/blocks/scratch3_data.js
View file

@ -135,7 +135,7 @@ class Scratch3DataBlocks {
deleteOfList (args, util) {
const list = util.target.lookupOrCreateList(
args.LIST.id, args.LIST.name);
const index = Cast.toListIndex(args.INDEX, list.value.length);
const index = Cast.toListIndex(args.INDEX, list.value.length, true);
if (index === Cast.LIST_INVALID) {
return;
} else if (index === Cast.LIST_ALL) {
@ -157,7 +157,7 @@ class Scratch3DataBlocks {
const item = args.ITEM;
const list = util.target.lookupOrCreateList(
args.LIST.id, args.LIST.name);
const index = Cast.toListIndex(args.INDEX, list.value.length + 1);
const index = Cast.toListIndex(args.INDEX, list.value.length + 1, false);
if (index === Cast.LIST_INVALID) {
return;
}
@ -176,7 +176,7 @@ class Scratch3DataBlocks {
const item = args.ITEM;
const list = util.target.lookupOrCreateList(
args.LIST.id, args.LIST.name);
const index = Cast.toListIndex(args.INDEX, list.value.length);
const index = Cast.toListIndex(args.INDEX, list.value.length, false);
if (index === Cast.LIST_INVALID) {
return;
}
@ -187,7 +187,7 @@ class Scratch3DataBlocks {
getItemOfList (args, util) {
const list = util.target.lookupOrCreateList(
args.LIST.id, args.LIST.name);
const index = Cast.toListIndex(args.INDEX, list.value.length);
const index = Cast.toListIndex(args.INDEX, list.value.length, false);
if (index === Cast.LIST_INVALID) {
return '';
}

5
src/util/cast.js
View file

@ -184,12 +184,13 @@ class Cast {
* LIST_INVALID: if the index was invalid in any way.
* @param {*} index Scratch arg, including 1-based numbers or special cases.
* @param {number} length Length of the list.
* @param {boolean} acceptAll Whether it should accept "all" or not.
* @return {(number|string)} 1-based index for list, LIST_ALL, or LIST_INVALID.
*/
static toListIndex (index, length) {
static toListIndex (index, length, acceptAll) {
if (typeof index !== 'number') {
if (index === 'all') {
return Cast.LIST_ALL;
return acceptAll ? Cast.LIST_ALL : Cast.LIST_INVALID;
}
if (index === 'last') {
if (length > 0) {

27
test/unit/util_cast.js
View file

@ -167,32 +167,33 @@ test('toListIndex', t => {
const empty = [];
// Valid
t.strictEqual(cast.toListIndex(1, list.length), 1);
t.strictEqual(cast.toListIndex(6, list.length), 6);
t.strictEqual(cast.toListIndex(1, list.length, false), 1);
t.strictEqual(cast.toListIndex(6, list.length, false), 6);
// Invalid
t.strictEqual(cast.toListIndex(-1, list.length), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex(0.1, list.length), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex(0, list.length), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex(7, list.length), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex(-1, list.length, false), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex(0.1, list.length, false), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex(0, list.length, false), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex(7, list.length, false), cast.LIST_INVALID);
// "all"
t.strictEqual(cast.toListIndex('all', list.length), cast.LIST_ALL);
t.strictEqual(cast.toListIndex('all', list.length, true), cast.LIST_ALL);
t.strictEqual(cast.toListIndex('all', list.length, false), cast.LIST_INVALID);
// "last"
t.strictEqual(cast.toListIndex('last', list.length), list.length);
t.strictEqual(cast.toListIndex('last', empty.length), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex('last', list.length, false), list.length);
t.strictEqual(cast.toListIndex('last', empty.length, false), cast.LIST_INVALID);
// "random"
const random = cast.toListIndex('random', list.length);
const random = cast.toListIndex('random', list.length, false);
t.ok(random <= list.length);
t.ok(random > 0);
t.strictEqual(cast.toListIndex('random', empty.length), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex('random', empty.length, false), cast.LIST_INVALID);
// "any" (alias for "random")
const any = cast.toListIndex('any', list.length);
const any = cast.toListIndex('any', list.length, false);
t.ok(any <= list.length);
t.ok(any > 0);
t.strictEqual(cast.toListIndex('any', empty.length), cast.LIST_INVALID);
t.strictEqual(cast.toListIndex('any', empty.length, false), cast.LIST_INVALID);
t.end();
});