CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 18:37:09 +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

25
generators/python/loops.js
View File

@@ -28,22 +28,17 @@ goog.provide('Blockly.Python.loops');
goog.require('Blockly.Python');
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.PASS;
var loopVar = Blockly.Python.variableDB_.getDistinctName(
'count', Blockly.Variables.NAME_TYPE);
var code = 'for ' + loopVar + ' in range(' + repeats + '):\n' + branch;
return code;
};
Blockly.Python['controls_repeat_ext'] = function(block) {
// Repeat n times (external number).
var repeats = Blockly.Python.valueToCode(block, 'TIMES',
Blockly.Python.ORDER_NONE) || '0';
// Repeat n times.
if (block.getField('TIMES')) {
// Internal number.
var repeats = parseInt(block.getFieldValue('TIMES'), 10);
} else {
// External number.
var repeats = Blockly.Python.valueToCode(block, 'TIMES',
Blockly.Python.ORDER_NONE) || '0';
}
if (Blockly.isNumber(repeats)) {
repeats = parseInt(repeats, 10);
} else {
@@ -58,6 +53,8 @@ Blockly.Python['controls_repeat_ext'] = function(block) {
return code;
};
Blockly.Python['controls_repeat'] = Blockly.Python['controls_repeat_ext'];
Blockly.Python['controls_whileUntil'] = function(block) {
// Do while/until loop.
var until = block.getFieldValue('MODE') == 'UNTIL';

32
generators/python/text.js
View File

@@ -234,8 +234,8 @@ Blockly.Python['text_print'] = function(block) {
return 'print(' + argument0 + ')\n';
};
Blockly.Python['text_prompt'] = function(block) {
// Prompt function (internal message).
Blockly.Python['text_prompt_ext'] = function(block) {
// Prompt function.
var functionName = Blockly.Python.provideFunction_(
'text_prompt',
['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(msg):',
@@ -243,7 +243,14 @@ Blockly.Python['text_prompt'] = function(block) {
' return raw_input(msg)',
' except NameError:',
' return input(msg)']);
var msg = Blockly.Python.quote_(block.getFieldValue('TEXT'));
if (block.getField('TEXT')) {
// Internal message.
var msg = Blockly.Python.quote_(block.getFieldValue('TEXT'));
} else {
// External message.
var msg = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_NONE) || '\'\'';
}
var code = functionName + '(' + msg + ')';
var toNumber = block.getFieldValue('TYPE') == 'NUMBER';
if (toNumber) {
@@ -252,21 +259,4 @@ Blockly.Python['text_prompt'] = function(block) {
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_prompt_ext'] = function(block) {
// Prompt function (external message).
var functionName = Blockly.Python.provideFunction_(
'text_prompt',
['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(msg):',
' try:',
' return raw_input(msg)',
' except NameError:',
' return input(msg)']);
var msg = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_NONE) || '\'\'';
var code = functionName + '(' + msg + ')';
var toNumber = block.getFieldValue('TYPE') == 'NUMBER';
if (toNumber) {
code = 'float(' + code + ')';
}
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_prompt'] = Blockly.Python['text_prompt_ext'];