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

Revert "Revert "Rebuild nov 3 16""

Browse Source 
This reverts commit c8ca24a000.
This commit is contained in:
Rachel Fenichel
2016-11-11 17:05:13 -08:00
parent d04d8280c7
commit b5822e2925
118 changed files with 1332 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
generators/lua/logic.js
View File

@@ -32,23 +32,26 @@ goog.require('Blockly.Lua');
Blockly.Lua['controls_if'] = function(block) {
// If/elseif/else condition.
var n = 0;
var argument = Blockly.Lua.valueToCode(block, 'IF' + n,
var code = '', branchCode, conditionCode;
do {
conditionCode = Blockly.Lua.valueToCode(block, 'IF' + n,
Blockly.Lua.ORDER_NONE) || 'false';
var branch = Blockly.Lua.statementToCode(block, 'DO' + n);
var code = 'if ' + argument + ' then\n' + branch;
for (n = 1; n <= block.elseifCount_; n++) {
argument = Blockly.Lua.valueToCode(block, 'IF' + n,
Blockly.Lua.ORDER_NONE) || 'false';
branch = Blockly.Lua.statementToCode(block, 'DO' + n);
code += ' elseif ' + argument + ' then\n' + branch;
}
if (block.elseCount_) {
branch = Blockly.Lua.statementToCode(block, 'ELSE');
code += ' else\n' + branch;
branchCode = Blockly.Lua.statementToCode(block, 'DO' + n);
code += (n > 0 ? 'else' : '') +
'if ' + conditionCode + ' then\n' + branchCode;
++n;
} while (block.getInput('IF' + n));
if (block.getInput('ELSE')) {
branchCode = Blockly.Lua.statementToCode(block, 'ELSE');
code += 'else\n' + branchCode;
}
return code + 'end\n';
};
Blockly.Lua['controls_ifelse'] = Blockly.Lua['controls_if'];
Blockly.Lua['logic_compare'] = function(block) {
// Comparison operator.
var OPERATORS = {