Lint fixes.

This commit is contained in:
Neil Fraser
2015-01-22 15:58:10 -08:00
parent f8365e9eba
commit 1c39a638e3
27 changed files with 71 additions and 2129 deletions

View File

@@ -34,16 +34,19 @@ Blockly.Python['controls_if'] = function(block) {
var n = 0;
var argument = Blockly.Python.valueToCode(block, 'IF' + n,
Blockly.Python.ORDER_NONE) || 'False';
var branch = Blockly.Python.statementToCode(block, 'DO' + n) || ' pass\n';
var branch = Blockly.Python.statementToCode(block, 'DO' + n) ||
Blockly.Python.PASS;
var code = 'if ' + argument + ':\n' + branch;
for (n = 1; n <= block.elseifCount_; n++) {
argument = Blockly.Python.valueToCode(block, 'IF' + n,
Blockly.Python.ORDER_NONE) || 'False';
branch = Blockly.Python.statementToCode(block, 'DO' + n) || ' pass\n';
branch = Blockly.Python.statementToCode(block, 'DO' + n) ||
Blockly.Python.PASS;
code += 'elif ' + argument + ':\n' + branch;
}
if (block.elseCount_) {
branch = Blockly.Python.statementToCode(block, 'ELSE') || ' pass\n';
branch = Blockly.Python.statementToCode(block, 'ELSE') ||
Blockly.Python.PASS;
code += 'else:\n' + branch;
}
return code;

View File

@@ -28,14 +28,12 @@ goog.provide('Blockly.Python.loops');
goog.require('Blockly.Python');
Blockly.Python.LOOP_PASS = ' pass\n';
Blockly.Python['controls_repeat'] = function(block) {
// Repeat n times (internal number).
var repeats = parseInt(block.getFieldValue('TIMES'), 10);
var branch = Blockly.Python.statementToCode(block, 'DO');
branch = Blockly.Python.addLoopTrap(branch, block.id) ||
Blockly.Python.LOOP_PASS;
Blockly.Python.PASS;
var loopVar = Blockly.Python.variableDB_.getDistinctName(
'count', Blockly.Variables.NAME_TYPE);
var code = 'for ' + loopVar + ' in range(' + repeats + '):\n' + branch;
@@ -53,7 +51,7 @@ Blockly.Python['controls_repeat_ext'] = function(block) {
}
var branch = Blockly.Python.statementToCode(block, 'DO');
branch = Blockly.Python.addLoopTrap(branch, block.id) ||
Blockly.Python.LOOP_PASS;
Blockly.Python.PASS;
var loopVar = Blockly.Python.variableDB_.getDistinctName(
'count', Blockly.Variables.NAME_TYPE);
var code = 'for ' + loopVar + ' in range(' + repeats + '):\n' + branch;
@@ -68,7 +66,7 @@ Blockly.Python['controls_whileUntil'] = function(block) {
Blockly.Python.ORDER_NONE) || 'False';
var branch = Blockly.Python.statementToCode(block, 'DO');
branch = Blockly.Python.addLoopTrap(branch, block.id) ||
Blockly.Python.LOOP_PASS;
Blockly.Python.PASS;
if (until) {
argument0 = 'not ' + argument0;
}
@@ -87,7 +85,7 @@ Blockly.Python['controls_for'] = function(block) {
Blockly.Python.ORDER_NONE) || '1';
var branch = Blockly.Python.statementToCode(block, 'DO');
branch = Blockly.Python.addLoopTrap(branch, block.id) ||
Blockly.Python.LOOP_PASS;
Blockly.Python.PASS;
var code = '';
var range;
@@ -199,7 +197,7 @@ Blockly.Python['controls_forEach'] = function(block) {
Blockly.Python.ORDER_RELATIONAL) || '[]';
var branch = Blockly.Python.statementToCode(block, 'DO');
branch = Blockly.Python.addLoopTrap(branch, block.id) ||
Blockly.Python.LOOP_PASS;
Blockly.Python.PASS;
var code = 'for ' + variable0 + ' in ' + argument0 + ':\n' + branch;
return code;
};

View File

@@ -62,7 +62,7 @@ Blockly.Python['procedures_defreturn'] = function(block) {
if (returnValue) {
returnValue = ' return ' + returnValue + '\n';
} else if (!branch) {
branch = ' pass';
branch = Blockly.Python.PASS;
}
var args = [];
for (var x = 0; x < block.arguments_.length; x++) {