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

Merge pull request #1547 from rachel-fenichel/feature/dev_var_ordering

Browse Source 
Declare developer variables before user variables.  Rebuild generators.
This commit is contained in:
Rachel Fenichel
2018-01-18 10:24:37 -08:00
committed by GitHub
parent c5d6577d16 9a3dc70031
commit dc5267da65
8 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
generators/dart.js
View File

@@ -105,13 +105,6 @@ Blockly.Dart.init = function(workspace) {
Blockly.Dart.variableDB_.setVariableMap(workspace.getVariableMap());
var defvars = [];
// Add user variables.
var variables = workspace.getAllVariables();
for (var i = 0; i < variables.length; i++) {
defvars[i] = Blockly.Dart.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE);
}
// Add developer variables (not created or named by the user).
var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
for (var i = 0; i < devVarList.length; i++) {
@@ -119,6 +112,13 @@ Blockly.Dart.init = function(workspace) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE));
}
// Add user variables.
var variables = workspace.getAllVariables();
for (var i = 0; i < variables.length; i++) {
defvars.push(Blockly.Dart.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE));
}
// Declare all of the variables.
if (defvars.length) {
Blockly.Dart.definitions_['variables'] =

14
generators/javascript.js
View File

@@ -155,13 +155,6 @@ Blockly.JavaScript.init = function(workspace) {
Blockly.JavaScript.variableDB_.setVariableMap(workspace.getVariableMap());
var defvars = [];
// Add user variables.
var variables = workspace.getAllVariables();
for (var i = 0; i < variables.length; i++) {
defvars[i] = Blockly.JavaScript.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE);
}
// Add developer variables (not created or named by the user).
var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
for (var i = 0; i < devVarList.length; i++) {
@@ -169,6 +162,13 @@ Blockly.JavaScript.init = function(workspace) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE));
}
// Add user variables.
var variables = workspace.getAllVariables();
for (var i = 0; i < variables.length; i++) {
defvars.push(Blockly.JavaScript.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE));
}
// Declare all of the variables.
if (defvars.length) {
Blockly.JavaScript.definitions_['variables'] =

13
generators/php.js
View File

@@ -152,12 +152,6 @@ Blockly.PHP.init = function(workspace) {
Blockly.PHP.variableDB_.setVariableMap(workspace.getVariableMap());
var defvars = [];
var variables = workspace.getAllVariables();
for (var i = 0, variable; variable = variables[i]; i++) {
defvars[i] = Blockly.PHP.variableDB_.getName(variable.getId(),
Blockly.Variables.NAME_TYPE) + ';';
}
// Add developer variables (not created or named by the user).
var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
for (var i = 0; i < devVarList.length; i++) {
@@ -165,6 +159,13 @@ Blockly.PHP.init = function(workspace) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE) + ';');
}
// Add user-created variables.
var variables = workspace.getAllVariables();
for (var i = 0, variable; variable = variables[i]; i++) {
defvars.push(Blockly.PHP.variableDB_.getName(variable.getId(),
Blockly.Variables.NAME_TYPE) + ';');
}
// Declare all of the variables.
Blockly.PHP.definitions_['variables'] = defvars.join('\n');
};

14
generators/python.js
View File

@@ -163,18 +163,20 @@ Blockly.Python.init = function(workspace) {
Blockly.Python.variableDB_.setVariableMap(workspace.getVariableMap());
var defvars = [];
var variables = workspace.getAllVariables();
for (var i = 0; i < variables.length; i++) {
defvars[i] = Blockly.Python.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE) + ' = None';
}
// Add developer variables (not created or named by the user).
var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
for (var i = 0; i < devVarList.length; i++) {
defvars.push(Blockly.Python.variableDB_.getName(devVarList[i],
Blockly.Names.DEVELOPER_VARIABLE_TYPE) + ' = None');
}
// Add user-created variables.
var variables = workspace.getAllVariables();
for (var i = 0; i < variables.length; i++) {
defvars.push(Blockly.Python.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE) + ' = None');
}
Blockly.Python.definitions_['variables'] = defvars.join('\n');
};