mirror of
https://github.com/google/blockly.git
synced 2026-01-08 01:20:12 +01:00
* feat(j2ts): Add support for migrating renaming imports
Convert
const {foo: bar} = require(/*...*/);
into
import {foo as bar} from /*...*/;
^^^^^^^^^^
Also fix a bug that caused relative paths to ESM in the same
directory to be missing a leading "./".
* fix(build): Fix trivial error exports for generators
The UMD wrapper was inadvertently exporting the contents of (e.g.)
the Blockly.JavaScript closure module rather than the intended
export of Blockly.JavaScript.all module - which went unnoticed
because the latter just reexported the former - but we are
about to convert the former to ESM.
* chore(generators): Migrate language generators to ESM
Migrate the main language generators in generators/*.js to ESM.
This was done by running js2ts on the files, renaming them back
to .js, and commenting out "import type" statements, which are
legal TS but not needed in JS (at least if you are not actually
letting Closure Compiler do type checking, which we are not.)
* chore(generators): Migrate block generators to ESM
Migrate generators/*/*.js (except all.js) to ESM.
This was done by running js2ts on the files, renaming them back
to .js, and removing now-spurious @suppress {extraRequire}
directives.
* chores(generators): Migrate generator chunk entrypoints to ESM
This was done by running js2ts on the files, renaming them back
to .js, and manually fixing the export statements.
An additional change to the chunk exports configuration in
build_tasks.js was necessary in order for the UMD wrapper to
find the new module object, which is given a different name
than the old exports object.
169 lines
5.6 KiB
JavaScript
169 lines
5.6 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2016 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating Lua for loop blocks.
|
|
*/
|
|
|
|
import * as goog from '../../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.Lua.loops');
|
|
|
|
import * as stringUtils from '../../core/utils/string.js';
|
|
import {NameType} from '../../core/names.js';
|
|
import {luaGenerator as Lua} from '../lua.js';
|
|
|
|
|
|
/**
|
|
* This is the text used to implement a <pre>continue</pre>.
|
|
* It is also used to recognise <pre>continue</pre>s in generated code so that
|
|
* the appropriate label can be put at the end of the loop body.
|
|
* @const {string}
|
|
*/
|
|
const CONTINUE_STATEMENT = 'goto continue\n';
|
|
|
|
/**
|
|
* If the loop body contains a "goto continue" statement, add a continue label
|
|
* to the loop body. Slightly inefficient, as continue labels will be generated
|
|
* in all outer loops, but this is safer than duplicating the logic of
|
|
* blockToCode.
|
|
*
|
|
* @param {string} branch Generated code of the loop body
|
|
* @return {string} Generated label or '' if unnecessary
|
|
*/
|
|
const addContinueLabel = function(branch) {
|
|
if (branch.indexOf(CONTINUE_STATEMENT) !== -1) {
|
|
// False positives are possible (e.g. a string literal), but are harmless.
|
|
return branch + Lua.INDENT + '::continue::\n';
|
|
} else {
|
|
return branch;
|
|
}
|
|
};
|
|
|
|
Lua['controls_repeat_ext'] = function(block) {
|
|
// Repeat n times.
|
|
let repeats;
|
|
if (block.getField('TIMES')) {
|
|
// Internal number.
|
|
repeats = String(Number(block.getFieldValue('TIMES')));
|
|
} else {
|
|
// External number.
|
|
repeats = Lua.valueToCode(block, 'TIMES', Lua.ORDER_NONE) || '0';
|
|
}
|
|
if (stringUtils.isNumber(repeats)) {
|
|
repeats = parseInt(repeats, 10);
|
|
} else {
|
|
repeats = 'math.floor(' + repeats + ')';
|
|
}
|
|
let branch = Lua.statementToCode(block, 'DO');
|
|
branch = Lua.addLoopTrap(branch, block);
|
|
branch = addContinueLabel(branch);
|
|
const loopVar = Lua.nameDB_.getDistinctName('count', NameType.VARIABLE);
|
|
const code =
|
|
'for ' + loopVar + ' = 1, ' + repeats + ' do\n' + branch + 'end\n';
|
|
return code;
|
|
};
|
|
|
|
Lua['controls_repeat'] = Lua['controls_repeat_ext'];
|
|
|
|
Lua['controls_whileUntil'] = function(block) {
|
|
// Do while/until loop.
|
|
const until = block.getFieldValue('MODE') === 'UNTIL';
|
|
let argument0 =
|
|
Lua.valueToCode(
|
|
block, 'BOOL', until ? Lua.ORDER_UNARY : Lua.ORDER_NONE) ||
|
|
'false';
|
|
let branch = Lua.statementToCode(block, 'DO');
|
|
branch = Lua.addLoopTrap(branch, block);
|
|
branch = addContinueLabel(branch);
|
|
if (until) {
|
|
argument0 = 'not ' + argument0;
|
|
}
|
|
return 'while ' + argument0 + ' do\n' + branch + 'end\n';
|
|
};
|
|
|
|
Lua['controls_for'] = function(block) {
|
|
// For loop.
|
|
const variable0 =
|
|
Lua.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
|
|
const startVar = Lua.valueToCode(block, 'FROM', Lua.ORDER_NONE) || '0';
|
|
const endVar = Lua.valueToCode(block, 'TO', Lua.ORDER_NONE) || '0';
|
|
const increment = Lua.valueToCode(block, 'BY', Lua.ORDER_NONE) || '1';
|
|
let branch = Lua.statementToCode(block, 'DO');
|
|
branch = Lua.addLoopTrap(branch, block);
|
|
branch = addContinueLabel(branch);
|
|
let code = '';
|
|
let incValue;
|
|
if (stringUtils.isNumber(startVar) && stringUtils.isNumber(endVar) &&
|
|
stringUtils.isNumber(increment)) {
|
|
// All arguments are simple numbers.
|
|
const up = Number(startVar) <= Number(endVar);
|
|
const step = Math.abs(Number(increment));
|
|
incValue = (up ? '' : '-') + step;
|
|
} else {
|
|
code = '';
|
|
// Determine loop direction at start, in case one of the bounds
|
|
// changes during loop execution.
|
|
incValue =
|
|
Lua.nameDB_.getDistinctName(variable0 + '_inc', NameType.VARIABLE);
|
|
code += incValue + ' = ';
|
|
if (stringUtils.isNumber(increment)) {
|
|
code += Math.abs(increment) + '\n';
|
|
} else {
|
|
code += 'math.abs(' + increment + ')\n';
|
|
}
|
|
code += 'if (' + startVar + ') > (' + endVar + ') then\n';
|
|
code += Lua.INDENT + incValue + ' = -' + incValue + '\n';
|
|
code += 'end\n';
|
|
}
|
|
code +=
|
|
'for ' + variable0 + ' = ' + startVar + ', ' + endVar + ', ' + incValue;
|
|
code += ' do\n' + branch + 'end\n';
|
|
return code;
|
|
};
|
|
|
|
Lua['controls_forEach'] = function(block) {
|
|
// For each loop.
|
|
const variable0 =
|
|
Lua.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
|
|
const argument0 = Lua.valueToCode(block, 'LIST', Lua.ORDER_NONE) || '{}';
|
|
let branch = Lua.statementToCode(block, 'DO');
|
|
branch = Lua.addLoopTrap(branch, block);
|
|
branch = addContinueLabel(branch);
|
|
const code = 'for _, ' + variable0 + ' in ipairs(' + argument0 + ') do \n' +
|
|
branch + 'end\n';
|
|
return code;
|
|
};
|
|
|
|
Lua['controls_flow_statements'] = function(block) {
|
|
// Flow statements: continue, break.
|
|
let xfix = '';
|
|
if (Lua.STATEMENT_PREFIX) {
|
|
// Automatic prefix insertion is switched off for this block. Add manually.
|
|
xfix += Lua.injectId(Lua.STATEMENT_PREFIX, block);
|
|
}
|
|
if (Lua.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 += Lua.injectId(Lua.STATEMENT_SUFFIX, block);
|
|
}
|
|
if (Lua.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 += Lua.injectId(Lua.STATEMENT_PREFIX, loop);
|
|
}
|
|
}
|
|
switch (block.getFieldValue('FLOW')) {
|
|
case 'BREAK':
|
|
return xfix + 'break\n';
|
|
case 'CONTINUE':
|
|
return xfix + CONTINUE_STATEMENT;
|
|
}
|
|
throw Error('Unknown flow statement.');
|
|
};
|