Fix python and php procedures.

This commit is contained in:
marisaleung
2017-06-26 11:51:32 -07:00
parent 997487568d
commit 693bdbb10e
3 changed files with 10 additions and 4 deletions

View File

@@ -150,9 +150,11 @@ Blockly.PHP.init = function(workspace) {
}
var defvars = [];
var varName;
var variables = Blockly.Variables.allVariables(workspace);
for (var i = 0; i < variables.length; i++) {
defvars[i] = Blockly.PHP.variableDB_.getName(variables[i],
for (var i = 0, variable; variable = variables[i]; i++) {
varName = variable.name;
defvars[i] = Blockly.PHP.variableDB_.getName(varName,
Blockly.Variables.NAME_TYPE) + ';';
}
Blockly.PHP.definitions_['variables'] = defvars.join('\n');

View File

@@ -33,8 +33,10 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
// First, add a 'global' statement for every variable that is not shadowed by
// a local parameter.
var globals = [];
var varName;
var variables = workspace.getAllVariables();
for (var i = 0, varName; varName = variables[i].name; i++) {
for (var i = 0, variable; variable = variables[i]; i++) {
varName = variable.name;
if (block.arguments_.indexOf(varName) == -1) {
globals.push(Blockly.PHP.variableDB_.getName(varName,
Blockly.Variables.NAME_TYPE));

View File

@@ -34,8 +34,10 @@ Blockly.Python['procedures_defreturn'] = function(block) {
// First, add a 'global' statement for every variable that is not shadowed by
// a local parameter.
var globals = [];
var varName;
var variables = workspace.getAllVariables();
for (var i = 0, varName; varName = variables[i]; i++) {
for (var i = 0, variable; variable = variables[i]; i++) {
varName = variable.name;
if (block.arguments_.indexOf(varName) == -1) {
globals.push(Blockly.Python.variableDB_.getName(varName,
Blockly.Variables.NAME_TYPE));