CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-04 15:40:08 +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/lua/lists.js
View File

@@ -151,7 +151,7 @@ Blockly.Lua['lists_getIndex'] = function(block) {
Blockly.Lua.ORDER_NONE;
var at = Blockly.Lua.valueToCode(block, 'AT', atOrder) || '1';
var listVar = Blockly.Lua.variableDB_.getDistinctName(
'tmp_list', Blockly.Variables.NAME_TYPE);
'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
at = getIndex_(listVar, where, at);
var code = listVar + ' = ' + list + '\n' +
'table.remove(' + listVar + ', ' + at + ')\n';
@@ -230,7 +230,7 @@ Blockly.Lua['lists_setIndex'] = function(block) {
// `list` is an expression, so we may not evaluate it more than once.
// We can use multiple statements.
var listVar = Blockly.Lua.variableDB_.getDistinctName(
'tmp_list', Blockly.Variables.NAME_TYPE);
'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
code = listVar + ' = ' + list + '\n';
list = listVar;
}

8
generators/lua/loops.js
View File

@@ -72,7 +72,7 @@ Blockly.Lua['controls_repeat_ext'] = function(block) {
branch = Blockly.Lua.addLoopTrap(branch, block);
branch = Blockly.Lua.addContinueLabel_(branch);
var loopVar = Blockly.Lua.variableDB_.getDistinctName(
'count', Blockly.Variables.NAME_TYPE);
'count', Blockly.VARIABLE_CATEGORY_NAME);
var code = 'for ' + loopVar + ' = 1, ' + repeats + ' do\n' +
branch + 'end\n';
return code;
@@ -98,7 +98,7 @@ Blockly.Lua['controls_whileUntil'] = function(block) {
Blockly.Lua['controls_for'] = function(block) {
// For loop.
var variable0 = Blockly.Lua.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
var startVar = Blockly.Lua.valueToCode(block, 'FROM',
Blockly.Lua.ORDER_NONE) || '0';
var endVar = Blockly.Lua.valueToCode(block, 'TO',
@@ -121,7 +121,7 @@ Blockly.Lua['controls_for'] = function(block) {
// Determine loop direction at start, in case one of the bounds
// changes during loop execution.
incValue = Blockly.Lua.variableDB_.getDistinctName(
variable0 + '_inc', Blockly.Variables.NAME_TYPE);
variable0 + '_inc', Blockly.VARIABLE_CATEGORY_NAME);
code += incValue + ' = ';
if (Blockly.isNumber(increment)) {
code += Math.abs(increment) + '\n';
@@ -141,7 +141,7 @@ Blockly.Lua['controls_for'] = function(block) {
Blockly.Lua['controls_forEach'] = function(block) {
// For each loop.
var variable0 = Blockly.Lua.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
var argument0 = Blockly.Lua.valueToCode(block, 'LIST',
Blockly.Lua.ORDER_NONE) || '{}';
var branch = Blockly.Lua.statementToCode(block, 'DO');

2
generators/lua/math.js
View File

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

2
generators/lua/procedures.js
View File

@@ -62,7 +62,7 @@ Blockly.Lua['procedures_defreturn'] = function(block) {
var args = [];
for (var i = 0; i < block.arguments_.length; i++) {
args[i] = Blockly.Lua.variableDB_.getName(block.arguments_[i],
Blockly.Variables.NAME_TYPE);
Blockly.VARIABLE_CATEGORY_NAME);
}
var code = 'function ' + funcName + '(' + args.join(', ') + ')\n' +
xfix1 + loopTrap + branch + xfix2 + returnValue + 'end\n';

2
generators/lua/text.js
View File

@@ -68,7 +68,7 @@ Blockly.Lua['text_join'] = function(block) {
Blockly.Lua['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.Lua.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
var value = Blockly.Lua.valueToCode(block, 'TEXT',
Blockly.Lua.ORDER_CONCATENATION) || '\'\'';
return varName + ' = ' + varName + ' .. ' + value + '\n';

4
generators/lua/variables.js
View File

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