scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add inputOp to every input arg in the sb2 specmap

Browse source 
Add missing meta information in the inputOp value for some arguments.
`boolean` and `substack`, the new inputOp values, are not considered to
be shadowed values.
This commit is contained in:
Michael "Z" Goddard 2018-09-13 12:42:54 -04:00
parent d8309e9d24
commit ea55b3ed55
No known key found for this signature in database
GPG key ID: 762CD40DD5349872
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/serialization/sb2.js
View file

@ -70,6 +70,8 @@ const parseProcedureArgMap = function (procCode) {
arg.inputOp = 'math_number';
} else if (argType === 's') {
arg.inputOp = 'text';
} else if (argType === 'b') {
arg.inputOp = 'boolean';
}
argMap.push(arg);
}
@ -865,6 +867,11 @@ const parseBlock = function (sb2block, addBroadcastMsg, getVariableId, extension
}
// Generate a shadow block to occupy the input.
if (!expectedArg.inputOp) {
// Undefined inputOp. inputOp should always be defined for inputs.
log.warn(`Unknown input operation for input ${expectedArg.inputName} of opcode ${activeBlock.opcode}.`);
continue;
}
if (expectedArg.inputOp === 'boolean' || expectedArg.inputOp === 'substack') {
// No editable shadow input; e.g., for a boolean.
continue;
}
@ -1082,14 +1089,7 @@ const parseBlock = function (sb2block, addBroadcastMsg, getVariableId, extension
let returnCode = sb2block[2];
// Ensure the returnCode is "b" if used in a boolean input.
if (parentExpectedArg && (
// Used as a CONDITION input like for control_if.
parentExpectedArg.inputName === 'CONDITION' ||
// Used as a procedure call boolean input.
(
parentExpectedArg.inputName.startsWith('input') && !parentExpectedArg.inputOp
)
) && returnCode !== 'b') {
if (parentExpectedArg && parentExpectedArg.inputOp === 'boolean' && returnCode !== 'b') {
returnCode = 'b';
}

19
src/serialization/sb2_specmap.js
View file

@ -803,6 +803,7 @@ const specMap = {
},
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK'
}
]
@ -812,6 +813,7 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK'
}
]
@ -821,10 +823,12 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'boolean',
inputName: 'CONDITION'
},
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK'
}
]
@ -834,14 +838,17 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'boolean',
inputName: 'CONDITION'
},
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK'
},
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK2'
}
]
@ -851,6 +858,7 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'boolean',
inputName: 'CONDITION'
}
]
@ -860,10 +868,12 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'boolean',
inputName: 'CONDITION'
},
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK'
}
]
@ -873,10 +883,12 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'boolean',
inputName: 'CONDITION'
},
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK'
}
]
@ -895,6 +907,7 @@ const specMap = {
},
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK'
}
]
@ -948,6 +961,7 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'substack',
inputName: 'SUBSTACK'
}
]
@ -1255,10 +1269,12 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'boolean',
inputName: 'OPERAND1'
},
{
type: 'input',
inputOp: 'boolean',
inputName: 'OPERAND2'
}
]
@ -1268,10 +1284,12 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'boolean',
inputName: 'OPERAND1'
},
{
type: 'input',
inputOp: 'boolean',
inputName: 'OPERAND2'
}
]
@ -1281,6 +1299,7 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'boolean',
inputName: 'OPERAND'
}
]