mirror of
https://github.com/google/blockly.git
synced 2026-01-07 09:00:11 +01:00
* refactor(generators): Move lang.js -> lang/lang_gernator.js
Move the LangGenerator definitions into their respective
subdirectories and add a _generator suffix to their filenames,
i.e. generators/javascript.js becomes
generators/javascript/javascript_generator.js.
This is to keep related code together and allow the `lang/all.js`
entrypoints to be moved to the top level generators/ directory.
No goog module IDs were changed, so playground and test code
that accesses this modules by filename does not need to be modified.
* refactor(generators) Move lang/all.js -> lang.js
- Move the entrypoints in generators/*/all.js to correspondingly-named
files in generators/ instead—i.e., generators/javascript/all.js
becomes generators/javascript.js.
- Update build_tasks.js accordingly.
* fix(generators): Add missing exports for LuaGenerator, PhpGenerator
These were inadvertently omitted from #7161 and #7162, respectively.
* refactor(generators): Make block generator modules side-effect free
- Move declaration of <lang>Generator instance from
generators/<lang>/<lang>_generator.js to generators/<lang>.js.
- Move .addReservedWords() calls from generators/<lang>/*.js to
generators/<lang>.js
- Modify generators/<lang>/*.js to export block generator functions
individually, rather than installing on <lang>Generator instance.
- Modify generators/<lang>.js to import and install block generator
functions on <lang>Generator instance.
* fix(tests): Fix tests broken by restructuring of generators
Where these tests needed block generator functions preinstalled
they should have been importing the Blockly.<Lang>.all module.
Where they do not need the provided block generator functions
they can now create their own empty <Lang>Generator instances.
* chore: Update renamings file
- Fix a malformation in previous entries that was not detected by
the renaming file validator test.
- Add entries describing the work done in this and related recent
PRs.
* fix: Correct minor errors in PR #7173
- Fix a search-and-replace error in renamings.json5
- Fix an incorrect-but-usable import in generator_test.js
210 lines
7.0 KiB
JavaScript
210 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 {Order} from './python_generator.js';
|
|
|
|
|
|
export function controls_repeat_ext(block, generator) {
|
|
// Repeat n times.
|
|
let repeats;
|
|
if (block.getField('TIMES')) {
|
|
// Internal number.
|
|
repeats = String(parseInt(block.getFieldValue('TIMES'), 10));
|
|
} else {
|
|
// External number.
|
|
repeats = generator.valueToCode(block, 'TIMES', Order.NONE) || '0';
|
|
}
|
|
if (stringUtils.isNumber(repeats)) {
|
|
repeats = parseInt(repeats, 10);
|
|
} else {
|
|
repeats = 'int(' + repeats + ')';
|
|
}
|
|
let branch = generator.statementToCode(block, 'DO');
|
|
branch = generator.addLoopTrap(branch, block) || generator.PASS;
|
|
const loopVar =
|
|
generator.nameDB_.getDistinctName('count', NameType.VARIABLE);
|
|
const code = 'for ' + loopVar + ' in range(' + repeats + '):\n' + branch;
|
|
return code;
|
|
};
|
|
|
|
export const controls_repeat = controls_repeat_ext;
|
|
|
|
export function controls_whileUntil(block, generator) {
|
|
// Do while/until loop.
|
|
const until = block.getFieldValue('MODE') === 'UNTIL';
|
|
let argument0 = generator.valueToCode(
|
|
block, 'BOOL',
|
|
until ? Order.LOGICAL_NOT : Order.NONE) ||
|
|
'False';
|
|
let branch = generator.statementToCode(block, 'DO');
|
|
branch = generator.addLoopTrap(branch, block) || generator.PASS;
|
|
if (until) {
|
|
argument0 = 'not ' + argument0;
|
|
}
|
|
return 'while ' + argument0 + ':\n' + branch;
|
|
};
|
|
|
|
export function controls_for(block, generator) {
|
|
// For loop.
|
|
const variable0 =
|
|
generator.nameDB_.getName(
|
|
block.getFieldValue('VAR'), NameType.VARIABLE);
|
|
let argument0 = generator.valueToCode(block, 'FROM', Order.NONE) || '0';
|
|
let argument1 = generator.valueToCode(block, 'TO', Order.NONE) || '0';
|
|
let increment = generator.valueToCode(block, 'BY', Order.NONE) || '1';
|
|
let branch = generator.statementToCode(block, 'DO');
|
|
branch = generator.addLoopTrap(branch, block) || generator.PASS;
|
|
|
|
let code = '';
|
|
let range;
|
|
|
|
// Helper functions.
|
|
const defineUpRange = function() {
|
|
return generator.provideFunction_('upRange', `
|
|
def ${generator.FUNCTION_NAME_PLACEHOLDER_}(start, stop, step):
|
|
while start <= stop:
|
|
yield start
|
|
start += abs(step)
|
|
`);
|
|
};
|
|
const defineDownRange = function() {
|
|
return generator.provideFunction_('downRange', `
|
|
def ${generator.FUNCTION_NAME_PLACEHOLDER_}(start, stop, step):
|
|
while start >= stop:
|
|
yield start
|
|
start -= abs(step)
|
|
`);
|
|
};
|
|
// Arguments are legal generator 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 = generator.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;
|
|
};
|
|
|
|
export function controls_forEach(block, generator) {
|
|
// For each loop.
|
|
const variable0 =
|
|
generator.nameDB_.getName(
|
|
block.getFieldValue('VAR'), NameType.VARIABLE);
|
|
const argument0 =
|
|
generator.valueToCode(block, 'LIST', Order.RELATIONAL) || '[]';
|
|
let branch = generator.statementToCode(block, 'DO');
|
|
branch = generator.addLoopTrap(branch, block) || generator.PASS;
|
|
const code = 'for ' + variable0 + ' in ' + argument0 + ':\n' + branch;
|
|
return code;
|
|
};
|
|
|
|
export function controls_flow_statements(block, generator) {
|
|
// Flow statements: continue, break.
|
|
let xfix = '';
|
|
if (generator.STATEMENT_PREFIX) {
|
|
// Automatic prefix insertion is switched off for this block. Add manually.
|
|
xfix += generator.injectId(generator.STATEMENT_PREFIX, block);
|
|
}
|
|
if (generator.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 += generator.injectId(generator.STATEMENT_SUFFIX, block);
|
|
}
|
|
if (generator.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 += generator.injectId(generator.STATEMENT_PREFIX, loop);
|
|
}
|
|
}
|
|
switch (block.getFieldValue('FLOW')) {
|
|
case 'BREAK':
|
|
return xfix + 'break\n';
|
|
case 'CONTINUE':
|
|
return xfix + 'continue\n';
|
|
}
|
|
throw Error('Unknown flow statement.');
|
|
};
|