CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 18:37:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use getter for variables in procedure generator. (#3971)

Browse Source
This commit is contained in:
Monica Kozbial
2020-06-15 09:47:51 -07:00
committed by GitHub
parent 4ac4332f5e
commit df1508b547
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generators/php/procedures.js
View File

@@ -24,7 +24,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
var variables = Blockly.Variables.allUsedVarModels(workspace) || [];
for (var i = 0, variable; variable = variables[i]; i++) {
varName = variable.name;
if (block.arguments_.indexOf(varName) == -1) {
if (block.getVars().indexOf(varName) == -1) {
globals.push(Blockly.PHP.variableDB_.getName(varName,
Blockly.VARIABLE_CATEGORY_NAME));
}
@@ -68,8 +68,9 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
returnValue = Blockly.PHP.INDENT + 'return ' + returnValue + ';\n';
}
var args = [];
for (var i = 0; i < block.arguments_.length; i++) {
args[i] = Blockly.PHP.variableDB_.getName(block.arguments_[i],
var variables = block.getVars();
for (var i = 0; i < variables.length; i++) {
args[i] = Blockly.PHP.variableDB_.getName(variables[i],
Blockly.VARIABLE_CATEGORY_NAME);
}
var code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' +
@@ -90,7 +91,8 @@ Blockly.PHP['procedures_callreturn'] = function(block) {
var funcName = Blockly.PHP.variableDB_.getName(
block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
var args = [];
for (var i = 0; i < block.arguments_.length; i++) {
var variables = block.getVars();
for (var i = 0; i < variables.length; i++) {
args[i] = Blockly.PHP.valueToCode(block, 'ARG' + i,
Blockly.PHP.ORDER_COMMA) || 'null';
}