Declare developer variables before user variables. Rebuild generators.

This commit is contained in:
Rachel Fenichel
2018-01-17 17:38:26 -08:00
parent 3f61f71f35
commit 9a3dc70031
8 changed files with 38 additions and 35 deletions

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');
};