mirror of
https://github.com/google/blockly.git
synced 2026-01-04 15:40:08 +01:00
* fix(build): Minor corrections to build_tasks.js
- Use TSC_OUTPUT_DIR to find goog/goog.js when suppressing warnings.
- Remove unnecessary trailing semicolons.
* refactor(blocks): Remove declareLegacyNamespace
Remove the call to goog.module.declareLegacyNamespace from
Blockly.libraryBlocks. This entails:
- Changes to the UMD wrapper to be able to find the exports object.
- Changes to tests/bootstrap_helper.js to save the exports object
in the libraryBlocks global variable.
- As a precaution, renaming the tests/compile/test_blocks.js module
so that goog.provide does not touch Blockly or
Blockly.libraryBlocks, which may not exist / be writable.
* feat(build): Add support named exports from chunks
We need to convert the generators to named exports. For backwards
compatibility we still want e.g. Blockly.JavaScript to point at
the generator object when the chunk is loaded using a script tag.
Modify chunkWrapper to honour a .reexportOnly property in the
chunks table and generate suitable additional code in the UMD
wrapper.
* refactor(generators): Migrate JavaScript generator to named export
- Export the JavaScript generator object as javascriptGenerator
from the Blockly.JavaScript module(generators/javascript.js).
- Modify the Blockly.JavaScript.all module
(generators/javascript/all.js) to reexport the exports from
Blockly.JavaScript.
- Update chunk configuration so the generator object remains
available as Blockly.JavaScript when loading
javascript_compressed.js via a <script> tag.
(N.B. it is otherwise necessary to destructure the require
/ import.)
- Modify bootstrap_helper.js to store that export as
window.javascriptGenerator for use in test code.
- Modify test code to use javascriptGenerator instead of
Blockly.JavaScript.
- Modify .eslintrc.json so that javascriptGenerator is allowed
as a global in test/. (Also restrict use of Blockly global
to test/.)
N.B. that demo code in demos/code/code.js uses <script> tag
loading and so will continue to access Blockly.JavaScript.
* refactor(generators): Migrate Lua generator to named export
* refactor(generators): Migrate PHP generator to named export
* refactor(generators): Migrate Python generator to named export
* refactor(generators): Remove declareLegacyNamespace calls
Remove the goog.module.declareLegacyNamespace calls from the
generators.
This turns out to have the unexpected side-effect of causing the
compiler to rename the core/blockly.js exports object from
$.Blockly to just Blockly in blockly_compressed.js - presumably
because it no longer needs to be accessed in any subsequent chunk
because they no longer add properties to it. This requires
some changes (mainly simplification) to the chunkWrapper function
in build_tasks.js.
* refactor(core): Remove declareLegacyNamespace from blockly.js
So easy to do _now_: just need to:
- Make sure the UMD wrapper for the first chunk knows where the
exports object is.
- Use that same value to set the Blockly.VERSION @define.
- Have bootstrap_helper.js set window.Blockly to the exports
object.
- Fix tests/compile/test_blocks.js to not assume a Blockly
global variable, by converting it to a goog.module so we
can use a named require.
210 lines
6.9 KiB
JavaScript
210 lines
6.9 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2012 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating Python for loop blocks.
|
|
*/
|
|
'use strict';
|
|
|
|
goog.module('Blockly.Python.loops');
|
|
|
|
const stringUtils = goog.require('Blockly.utils.string');
|
|
const {NameType} = goog.require('Blockly.Names');
|
|
const {pythonGenerator: Python} = goog.require('Blockly.Python');
|
|
|
|
|
|
Python['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['controls_repeat'] = Python['controls_repeat_ext'];
|
|
|
|
Python['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['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+$/)) {
|
|
// Variable.
|
|
arg = 'float(' + arg + ')';
|
|
} else {
|
|
// It's complicated.
|
|
const varName = Python.nameDB_.getDistinctName(
|
|
variable0 + suffix, NameType.VARIABLE);
|
|
code += varName + ' = float(' + 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['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['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.');
|
|
};
|