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

Resolve warnings in generator code (#3350)

Browse Source
This commit is contained in:
Sam El-Husseini
2019-10-28 09:35:40 -07:00
committed by GitHub
parent fa5f256a3f
commit 64c52efb5b
34 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generators/python/lists.js
View File

@@ -199,7 +199,7 @@ Blockly.Python['lists_setIndex'] = function(block) {
return '';
}
var listVar = Blockly.Python.variableDB_.getDistinctName(
'tmp_list', Blockly.Variables.NAME_TYPE);
'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
var code = listVar + ' = ' + list + '\n';
list = listVar;
return code;
@@ -240,7 +240,7 @@ Blockly.Python['lists_setIndex'] = function(block) {
Blockly.Python.definitions_['import_random'] = 'import random';
var code = cacheList();
var xVar = Blockly.Python.variableDB_.getDistinctName(
'tmp_x', Blockly.Variables.NAME_TYPE);
'tmp_x', Blockly.VARIABLE_CATEGORY_NAME);
code += xVar + ' = int(random.random() * len(' + list + '))\n';
if (mode == 'SET') {
code += list + '[' + xVar + '] = ' + value + '\n';

8
generators/python/loops.js
View File

@@ -44,7 +44,7 @@ Blockly.Python['controls_repeat_ext'] = function(block) {
var branch = Blockly.Python.statementToCode(block, 'DO');
branch = Blockly.Python.addLoopTrap(branch, block) || Blockly.Python.PASS;
var loopVar = Blockly.Python.variableDB_.getDistinctName(
'count', Blockly.Variables.NAME_TYPE);
'count', Blockly.VARIABLE_CATEGORY_NAME);
var code = 'for ' + loopVar + ' in range(' + repeats + '):\n' + branch;
return code;
};
@@ -68,7 +68,7 @@ Blockly.Python['controls_whileUntil'] = function(block) {
Blockly.Python['controls_for'] = function(block) {
// For loop.
var variable0 = Blockly.Python.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
var argument0 = Blockly.Python.valueToCode(block, 'FROM',
Blockly.Python.ORDER_NONE) || '0';
var argument1 = Blockly.Python.valueToCode(block, 'TO',
@@ -155,7 +155,7 @@ Blockly.Python['controls_for'] = function(block) {
} else {
// It's complicated.
var varName = Blockly.Python.variableDB_.getDistinctName(
variable0 + suffix, Blockly.Variables.NAME_TYPE);
variable0 + suffix, Blockly.VARIABLE_CATEGORY_NAME);
code += varName + ' = float(' + arg + ')\n';
arg = varName;
}
@@ -183,7 +183,7 @@ Blockly.Python['controls_for'] = function(block) {
Blockly.Python['controls_forEach'] = function(block) {
// For each loop.
var variable0 = Blockly.Python.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
var argument0 = Blockly.Python.valueToCode(block, 'LIST',
Blockly.Python.ORDER_RELATIONAL) || '[]';
var branch = Blockly.Python.statementToCode(block, 'DO');

2
generators/python/math.js
View File

@@ -238,7 +238,7 @@ Blockly.Python['math_change'] = function(block) {
var argument0 = Blockly.Python.valueToCode(block, 'DELTA',
Blockly.Python.ORDER_ADDITIVE) || '0';
var varName = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
Blockly.Variables.NAME_TYPE);
Blockly.VARIABLE_CATEGORY_NAME);
return varName + ' = (' + varName + ' if isinstance(' + varName +
', Number) else 0) + ' + argument0 + '\n';
};

4
generators/python/procedures.js
View File

@@ -38,7 +38,7 @@ Blockly.Python['procedures_defreturn'] = function(block) {
varName = variable.name;
if (block.arguments_.indexOf(varName) == -1) {
globals.push(Blockly.Python.variableDB_.getName(varName,
Blockly.Variables.NAME_TYPE));
Blockly.VARIABLE_CATEGORY_NAME));
}
}
// Add developer variables.
@@ -84,7 +84,7 @@ Blockly.Python['procedures_defreturn'] = function(block) {
var args = [];
for (var i = 0; i < block.arguments_.length; i++) {
args[i] = Blockly.Python.variableDB_.getName(block.arguments_[i],
Blockly.Variables.NAME_TYPE);
Blockly.VARIABLE_CATEGORY_NAME);
}
var code = 'def ' + funcName + '(' + args.join(', ') + '):\n' +
globals + xfix1 + loopTrap + branch + xfix2 + returnValue;

4
generators/python/text.js
View File

@@ -86,7 +86,7 @@ Blockly.Python['text_join'] = function(block) {
Blockly.Python.ORDER_NONE) || '\'\'';
}
var tempVar = Blockly.Python.variableDB_.getDistinctName('x',
Blockly.Variables.NAME_TYPE);
Blockly.VARIABLE_CATEGORY_NAME);
var code = '\'\'.join([str(' + tempVar + ') for ' + tempVar + ' in [' +
elements.join(', ') + ']])';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
@@ -96,7 +96,7 @@ Blockly.Python['text_join'] = function(block) {
Blockly.Python['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
Blockly.Variables.NAME_TYPE);
Blockly.VARIABLE_CATEGORY_NAME);
var value = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_NONE) || '\'\'';
return varName + ' = str(' + varName + ') + ' +

4
generators/python/variables.js
View File

@@ -29,7 +29,7 @@ goog.require('Blockly.Python');
Blockly.Python['variables_get'] = function(block) {
// Variable getter.
var code = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
Blockly.Variables.NAME_TYPE);
Blockly.VARIABLE_CATEGORY_NAME);
return [code, Blockly.Python.ORDER_ATOMIC];
};
@@ -38,6 +38,6 @@ Blockly.Python['variables_set'] = function(block) {
var argument0 = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_NONE) || '0';
var varName = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
Blockly.Variables.NAME_TYPE);
Blockly.VARIABLE_CATEGORY_NAME);
return varName + ' = ' + argument0 + '\n';
};