mirror of
https://github.com/google/blockly.git
synced 2025-12-16 06:10:12 +01:00
* feat(generators): Add block generator function dictionary Add a dictionary of block generator functions, provisionally called .forBlock. Look up generator functions there first, but fall back to looking up on 'this' (with deprecation notice) for backwards compatibility. Also tweak error message generation to use template literal. * refactor(generators)!: Update generator definitions to use dictionary * fix(tests): Have blockToCodeTest clean up after itself Have the blockToCodeTest helper function delete the block generator functions it adds to generator once the test is done. * refactor(tests): Use generator dictionary in insertion marker test The use of generators in insertion_marker_test.js was overlooked in the earlier commit making such updates, and some test here were failing due to lack of cleanup in cleanup in the generator_test.js. BREAKING CHANGE: this PR moves the generator functions we provide from their previous location directly on the CodeGenerator instances to the new .forBlock dictionary on each instance. This does not oblige external developers to do the same for their custom generators, but they will need to update any code that references the generator functions we provide (in generators/*/*, i.e. on javascriptGenerator, dartGenerator etc.) e.g. to replace the implementation or reuse the implementation for a different block type.
207 lines
7.0 KiB
JavaScript
207 lines
7.0 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2012 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating Python for loop blocks.
|
|
*/
|
|
|
|
import * as goog from '../../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.Python.loops');
|
|
|
|
import * as stringUtils from '../../core/utils/string.js';
|
|
import {NameType} from '../../core/names.js';
|
|
import {pythonGenerator as Python} from '../python.js';
|
|
|
|
|
|
Python.forBlock['controls_repeat_ext'] = function(block) {
|
|
// Repeat n times.
|
|
let repeats;
|
|
if (block.getField('TIMES')) {
|
|
// Internal number.
|
|
repeats = String(parseInt(block.getFieldValue('TIMES'), 10));
|
|
} else {
|
|
// External number.
|
|
repeats = Python.valueToCode(block, 'TIMES', Python.ORDER_NONE) || '0';
|
|
}
|
|
if (stringUtils.isNumber(repeats)) {
|
|
repeats = parseInt(repeats, 10);
|
|
} else {
|
|
repeats = 'int(' + repeats + ')';
|
|
}
|
|
let branch = Python.statementToCode(block, 'DO');
|
|
branch = Python.addLoopTrap(branch, block) || Python.PASS;
|
|
const loopVar = Python.nameDB_.getDistinctName('count', NameType.VARIABLE);
|
|
const code = 'for ' + loopVar + ' in range(' + repeats + '):\n' + branch;
|
|
return code;
|
|
};
|
|
|
|
Python.forBlock['controls_repeat'] = Python.forBlock['controls_repeat_ext'];
|
|
|
|
Python.forBlock['controls_whileUntil'] = function(block) {
|
|
// Do while/until loop.
|
|
const until = block.getFieldValue('MODE') === 'UNTIL';
|
|
let argument0 = Python.valueToCode(
|
|
block, 'BOOL',
|
|
until ? Python.ORDER_LOGICAL_NOT : Python.ORDER_NONE) ||
|
|
'False';
|
|
let branch = Python.statementToCode(block, 'DO');
|
|
branch = Python.addLoopTrap(branch, block) || Python.PASS;
|
|
if (until) {
|
|
argument0 = 'not ' + argument0;
|
|
}
|
|
return 'while ' + argument0 + ':\n' + branch;
|
|
};
|
|
|
|
Python.forBlock['controls_for'] = function(block) {
|
|
// For loop.
|
|
const variable0 =
|
|
Python.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
|
|
let argument0 = Python.valueToCode(block, 'FROM', Python.ORDER_NONE) || '0';
|
|
let argument1 = Python.valueToCode(block, 'TO', Python.ORDER_NONE) || '0';
|
|
let increment = Python.valueToCode(block, 'BY', Python.ORDER_NONE) || '1';
|
|
let branch = Python.statementToCode(block, 'DO');
|
|
branch = Python.addLoopTrap(branch, block) || Python.PASS;
|
|
|
|
let code = '';
|
|
let range;
|
|
|
|
// Helper functions.
|
|
const defineUpRange = function() {
|
|
return Python.provideFunction_('upRange', `
|
|
def ${Python.FUNCTION_NAME_PLACEHOLDER_}(start, stop, step):
|
|
while start <= stop:
|
|
yield start
|
|
start += abs(step)
|
|
`);
|
|
};
|
|
const defineDownRange = function() {
|
|
return Python.provideFunction_('downRange', `
|
|
def ${Python.FUNCTION_NAME_PLACEHOLDER_}(start, stop, step):
|
|
while start >= stop:
|
|
yield start
|
|
start -= abs(step)
|
|
`);
|
|
};
|
|
// Arguments are legal Python code (numbers or strings returned by scrub()).
|
|
const generateUpDownRange = function(start, end, inc) {
|
|
return '(' + start + ' <= ' + end + ') and ' + defineUpRange() + '(' +
|
|
start + ', ' + end + ', ' + inc + ') or ' + defineDownRange() + '(' +
|
|
start + ', ' + end + ', ' + inc + ')';
|
|
};
|
|
|
|
if (stringUtils.isNumber(argument0) && stringUtils.isNumber(argument1) &&
|
|
stringUtils.isNumber(increment)) {
|
|
// All parameters are simple numbers.
|
|
argument0 = Number(argument0);
|
|
argument1 = Number(argument1);
|
|
increment = Math.abs(Number(increment));
|
|
if (argument0 % 1 === 0 && argument1 % 1 === 0 && increment % 1 === 0) {
|
|
// All parameters are integers.
|
|
if (argument0 <= argument1) {
|
|
// Count up.
|
|
argument1++;
|
|
if (argument0 === 0 && increment === 1) {
|
|
// If starting index is 0, omit it.
|
|
range = argument1;
|
|
} else {
|
|
range = argument0 + ', ' + argument1;
|
|
}
|
|
// If increment isn't 1, it must be explicit.
|
|
if (increment !== 1) {
|
|
range += ', ' + increment;
|
|
}
|
|
} else {
|
|
// Count down.
|
|
argument1--;
|
|
range = argument0 + ', ' + argument1 + ', -' + increment;
|
|
}
|
|
range = 'range(' + range + ')';
|
|
} else {
|
|
// At least one of the parameters is not an integer.
|
|
if (argument0 < argument1) {
|
|
range = defineUpRange();
|
|
} else {
|
|
range = defineDownRange();
|
|
}
|
|
range += '(' + argument0 + ', ' + argument1 + ', ' + increment + ')';
|
|
}
|
|
} else {
|
|
// Cache non-trivial values to variables to prevent repeated look-ups.
|
|
const scrub = function(arg, suffix) {
|
|
if (stringUtils.isNumber(arg)) {
|
|
// Simple number.
|
|
arg = Number(arg);
|
|
} else if (!arg.match(/^\w+$/)) {
|
|
// Not a variable, it's complicated.
|
|
const varName = Python.nameDB_.getDistinctName(
|
|
variable0 + suffix, NameType.VARIABLE);
|
|
code += varName + ' = ' + arg + '\n';
|
|
arg = varName;
|
|
}
|
|
return arg;
|
|
};
|
|
const startVar = scrub(argument0, '_start');
|
|
const endVar = scrub(argument1, '_end');
|
|
const incVar = scrub(increment, '_inc');
|
|
|
|
if (typeof startVar === 'number' && typeof endVar === 'number') {
|
|
if (startVar < endVar) {
|
|
range = defineUpRange();
|
|
} else {
|
|
range = defineDownRange();
|
|
}
|
|
range += '(' + startVar + ', ' + endVar + ', ' + incVar + ')';
|
|
} else {
|
|
// We cannot determine direction statically.
|
|
range = generateUpDownRange(startVar, endVar, incVar);
|
|
}
|
|
}
|
|
code += 'for ' + variable0 + ' in ' + range + ':\n' + branch;
|
|
return code;
|
|
};
|
|
|
|
Python.forBlock['controls_forEach'] = function(block) {
|
|
// For each loop.
|
|
const variable0 =
|
|
Python.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
|
|
const argument0 =
|
|
Python.valueToCode(block, 'LIST', Python.ORDER_RELATIONAL) || '[]';
|
|
let branch = Python.statementToCode(block, 'DO');
|
|
branch = Python.addLoopTrap(branch, block) || Python.PASS;
|
|
const code = 'for ' + variable0 + ' in ' + argument0 + ':\n' + branch;
|
|
return code;
|
|
};
|
|
|
|
Python.forBlock['controls_flow_statements'] = function(block) {
|
|
// Flow statements: continue, break.
|
|
let xfix = '';
|
|
if (Python.STATEMENT_PREFIX) {
|
|
// Automatic prefix insertion is switched off for this block. Add manually.
|
|
xfix += Python.injectId(Python.STATEMENT_PREFIX, block);
|
|
}
|
|
if (Python.STATEMENT_SUFFIX) {
|
|
// Inject any statement suffix here since the regular one at the end
|
|
// will not get executed if the break/continue is triggered.
|
|
xfix += Python.injectId(Python.STATEMENT_SUFFIX, block);
|
|
}
|
|
if (Python.STATEMENT_PREFIX) {
|
|
const loop = block.getSurroundLoop();
|
|
if (loop && !loop.suppressPrefixSuffix) {
|
|
// Inject loop's statement prefix here since the regular one at the end
|
|
// of the loop will not get executed if 'continue' is triggered.
|
|
// In the case of 'break', a prefix is needed due to the loop's suffix.
|
|
xfix += Python.injectId(Python.STATEMENT_PREFIX, loop);
|
|
}
|
|
}
|
|
switch (block.getFieldValue('FLOW')) {
|
|
case 'BREAK':
|
|
return xfix + 'break\n';
|
|
case 'CONTINUE':
|
|
return xfix + 'continue\n';
|
|
}
|
|
throw Error('Unknown flow statement.');
|
|
};
|