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

Remove duplicated generators.

Browse Source
This commit is contained in:
Neil Fraser
2015-07-23 13:11:51 -07:00
parent ce6ad13fbb
commit bafb3016fd
14 changed files with 116 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
generators/javascript/loops.js
View File

@@ -29,24 +29,16 @@ goog.provide('Blockly.JavaScript.loops');
goog.require('Blockly.JavaScript');
Blockly.JavaScript['controls_repeat'] = function(block) {
// Repeat n times (internal number).
var repeats = Number(block.getFieldValue('TIMES'));
var branch = Blockly.JavaScript.statementToCode(block, 'DO');
branch = Blockly.JavaScript.addLoopTrap(branch, block.id);
var loopVar = Blockly.JavaScript.variableDB_.getDistinctName(
'count', Blockly.Variables.NAME_TYPE);
var code = 'for (var ' + loopVar + ' = 0; ' +
loopVar + ' < ' + repeats + '; ' +
loopVar + '++) {\n' +
branch + '}\n';
return code;
};
Blockly.JavaScript['controls_repeat_ext'] = function(block) {
// Repeat n times (external number).
var repeats = Blockly.JavaScript.valueToCode(block, 'TIMES',
Blockly.JavaScript.ORDER_ASSIGNMENT) || '0';
// Repeat n times.
if (block.getField('TIMES')) {
// Internal number.
var repeats = Number(block.getFieldValue('TIMES'));
} else {
// External number.
var repeats = Blockly.JavaScript.valueToCode(block, 'TIMES',
Blockly.JavaScript.ORDER_ASSIGNMENT) || '0';
}
var branch = Blockly.JavaScript.statementToCode(block, 'DO');
branch = Blockly.JavaScript.addLoopTrap(branch, block.id);
var code = '';
@@ -65,6 +57,9 @@ Blockly.JavaScript['controls_repeat_ext'] = function(block) {
return code;
};
Blockly.JavaScript['controls_repeat'] =
Blockly.JavaScript['controls_repeat_ext'];
Blockly.JavaScript['controls_whileUntil'] = function(block) {
// Do while/until loop.
var until = block.getFieldValue('MODE') == 'UNTIL';