CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2025-12-16 14:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: convert generators/javascript/loops.js to goog.module (#5758)

Browse Source 
* refactor: convert generators/javascript/loops.js to goog.module

* refactor: convert generators/javascript/loops.js to named requires

* chore: run clang-format

* chore: rebuild deps.js
This commit is contained in:
Rachel Fenichel
2021-11-30 18:51:11 -08:00
committed by GitHub
parent e11fe348b2
commit 93a1bce1ac
2 changed files with 76 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
generators/javascript/loops.js
View File

@@ -6,17 +6,17 @@
/** /**
* @fileoverview Generating JavaScript for loop blocks. * @fileoverview Generating JavaScript for loop blocks.
* @suppress {missingRequire}
*/ */
'use strict'; 'use strict';
goog.provide('Blockly.JavaScript.loops'); goog.module('Blockly.JavaScript.loops');
goog.require('Blockly.JavaScript'); const stringUtils = goog.require('Blockly.utils.string');
goog.require('Blockly.utils.string'); const JavaScript = goog.require('Blockly.JavaScript');
const {NameType} = goog.require('Blockly.Names');
Blockly.JavaScript['controls_repeat_ext'] = function(block) { JavaScript['controls_repeat_ext'] = function(block) {
// Repeat n times. // Repeat n times.
let repeats; let repeats;
if (block.getField('TIMES')) { if (block.getField('TIMES')) {
@@ -24,64 +24,63 @@ Blockly.JavaScript['controls_repeat_ext'] = function(block) {
repeats = String(Number(block.getFieldValue('TIMES'))); repeats = String(Number(block.getFieldValue('TIMES')));
} else { } else {
// External number. // External number.
repeats = Blockly.JavaScript.valueToCode(block, 'TIMES', repeats =
Blockly.JavaScript.ORDER_ASSIGNMENT) || '0'; JavaScript.valueToCode(block, 'TIMES', JavaScript.ORDER_ASSIGNMENT) ||
'0';
} }
let branch = Blockly.JavaScript.statementToCode(block, 'DO'); let branch = JavaScript.statementToCode(block, 'DO');
branch = Blockly.JavaScript.addLoopTrap(branch, block); branch = JavaScript.addLoopTrap(branch, block);
let code = ''; let code = '';
const loopVar = Blockly.JavaScript.nameDB_.getDistinctName( const loopVar =
'count', Blockly.VARIABLE_CATEGORY_NAME); JavaScript.nameDB_.getDistinctName('count', NameType.VARIABLE);
let endVar = repeats; let endVar = repeats;
if (!repeats.match(/^\w+$/) && !Blockly.utils.string.isNumber(repeats)) { if (!repeats.match(/^\w+$/) && !stringUtils.isNumber(repeats)) {
endVar = Blockly.JavaScript.nameDB_.getDistinctName( endVar =
'repeat_end', Blockly.VARIABLE_CATEGORY_NAME); JavaScript.nameDB_.getDistinctName('repeat_end', NameType.VARIABLE);
code += 'var ' + endVar + ' = ' + repeats + ';\n'; code += 'var ' + endVar + ' = ' + repeats + ';\n';
} }
code += 'for (var ' + loopVar + ' = 0; ' + code += 'for (var ' + loopVar + ' = 0; ' + loopVar + ' < ' + endVar + '; ' +
loopVar + ' < ' + endVar + '; ' + loopVar + '++) {\n' + branch + '}\n';
loopVar + '++) {\n' +
branch + '}\n';
return code; return code;
}; };
Blockly.JavaScript['controls_repeat'] = JavaScript['controls_repeat'] = JavaScript['controls_repeat_ext'];
Blockly.JavaScript['controls_repeat_ext'];
Blockly.JavaScript['controls_whileUntil'] = function(block) { JavaScript['controls_whileUntil'] = function(block) {
// Do while/until loop. // Do while/until loop.
const until = block.getFieldValue('MODE') === 'UNTIL'; const until = block.getFieldValue('MODE') === 'UNTIL';
let argument0 = Blockly.JavaScript.valueToCode(block, 'BOOL', let argument0 =
until ? Blockly.JavaScript.ORDER_LOGICAL_NOT : JavaScript.valueToCode(
Blockly.JavaScript.ORDER_NONE) || 'false'; block, 'BOOL',
let branch = Blockly.JavaScript.statementToCode(block, 'DO'); until ? JavaScript.ORDER_LOGICAL_NOT : JavaScript.ORDER_NONE) ||
branch = Blockly.JavaScript.addLoopTrap(branch, block); 'false';
let branch = JavaScript.statementToCode(block, 'DO');
branch = JavaScript.addLoopTrap(branch, block);
if (until) { if (until) {
argument0 = '!' + argument0; argument0 = '!' + argument0;
} }
return 'while (' + argument0 + ') {\n' + branch + '}\n'; return 'while (' + argument0 + ') {\n' + branch + '}\n';
}; };
Blockly.JavaScript['controls_for'] = function(block) { JavaScript['controls_for'] = function(block) {
// For loop. // For loop.
const variable0 = Blockly.JavaScript.nameDB_.getName( const variable0 =
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME); JavaScript.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
const argument0 = Blockly.JavaScript.valueToCode(block, 'FROM', const argument0 =
Blockly.JavaScript.ORDER_ASSIGNMENT) || '0'; JavaScript.valueToCode(block, 'FROM', JavaScript.ORDER_ASSIGNMENT) || '0';
const argument1 = Blockly.JavaScript.valueToCode(block, 'TO', const argument1 =
Blockly.JavaScript.ORDER_ASSIGNMENT) || '0'; JavaScript.valueToCode(block, 'TO', JavaScript.ORDER_ASSIGNMENT) || '0';
const increment = Blockly.JavaScript.valueToCode(block, 'BY', const increment =
Blockly.JavaScript.ORDER_ASSIGNMENT) || '1'; JavaScript.valueToCode(block, 'BY', JavaScript.ORDER_ASSIGNMENT) || '1';
let branch = Blockly.JavaScript.statementToCode(block, 'DO'); let branch = JavaScript.statementToCode(block, 'DO');
branch = Blockly.JavaScript.addLoopTrap(branch, block); branch = JavaScript.addLoopTrap(branch, block);
let code; let code;
if (Blockly.utils.string.isNumber(argument0) && Blockly.utils.string.isNumber(argument1) && if (stringUtils.isNumber(argument0) && stringUtils.isNumber(argument1) &&
Blockly.utils.string.isNumber(increment)) { stringUtils.isNumber(increment)) {
// All arguments are simple numbers. // All arguments are simple numbers.
const up = Number(argument0) <= Number(argument1); const up = Number(argument0) <= Number(argument1);
code = 'for (' + variable0 + ' = ' + argument0 + '; ' + code = 'for (' + variable0 + ' = ' + argument0 + '; ' + variable0 +
variable0 + (up ? ' <= ' : ' >= ') + argument1 + '; ' + (up ? ' <= ' : ' >= ') + argument1 + '; ' + variable0;
variable0;
const step = Math.abs(Number(increment)); const step = Math.abs(Number(increment));
if (step === 1) { if (step === 1) {
code += up ? '++' : '--'; code += up ? '++' : '--';
@@ -93,86 +92,82 @@ Blockly.JavaScript['controls_for'] = function(block) {
code = ''; code = '';
// Cache non-trivial values to variables to prevent repeated look-ups. // Cache non-trivial values to variables to prevent repeated look-ups.
let startVar = argument0; let startVar = argument0;
if (!argument0.match(/^\w+$/) && !Blockly.utils.string.isNumber(argument0)) { if (!argument0.match(/^\w+$/) && !stringUtils.isNumber(argument0)) {
startVar = Blockly.JavaScript.nameDB_.getDistinctName( startVar = JavaScript.nameDB_.getDistinctName(
variable0 + '_start', Blockly.VARIABLE_CATEGORY_NAME); variable0 + '_start', NameType.VARIABLE);
code += 'var ' + startVar + ' = ' + argument0 + ';\n'; code += 'var ' + startVar + ' = ' + argument0 + ';\n';
} }
let endVar = argument1; let endVar = argument1;
if (!argument1.match(/^\w+$/) && !Blockly.utils.string.isNumber(argument1)) { if (!argument1.match(/^\w+$/) && !stringUtils.isNumber(argument1)) {
endVar = Blockly.JavaScript.nameDB_.getDistinctName( endVar = JavaScript.nameDB_.getDistinctName(
variable0 + '_end', Blockly.VARIABLE_CATEGORY_NAME); variable0 + '_end', NameType.VARIABLE);
code += 'var ' + endVar + ' = ' + argument1 + ';\n'; code += 'var ' + endVar + ' = ' + argument1 + ';\n';
} }
// Determine loop direction at start, in case one of the bounds // Determine loop direction at start, in case one of the bounds
// changes during loop execution. // changes during loop execution.
const incVar = Blockly.JavaScript.nameDB_.getDistinctName( const incVar = JavaScript.nameDB_.getDistinctName(
variable0 + '_inc', Blockly.VARIABLE_CATEGORY_NAME); variable0 + '_inc', NameType.VARIABLE);
code += 'var ' + incVar + ' = '; code += 'var ' + incVar + ' = ';
if (Blockly.utils.string.isNumber(increment)) { if (stringUtils.isNumber(increment)) {
code += Math.abs(increment) + ';\n'; code += Math.abs(increment) + ';\n';
} else { } else {
code += 'Math.abs(' + increment + ');\n'; code += 'Math.abs(' + increment + ');\n';
} }
code += 'if (' + startVar + ' > ' + endVar + ') {\n'; code += 'if (' + startVar + ' > ' + endVar + ') {\n';
code += Blockly.JavaScript.INDENT + incVar + ' = -' + incVar + ';\n'; code += JavaScript.INDENT + incVar + ' = -' + incVar + ';\n';
code += '}\n'; code += '}\n';
code += 'for (' + variable0 + ' = ' + startVar + '; ' + code += 'for (' + variable0 + ' = ' + startVar + '; ' + incVar +
incVar + ' >= 0 ? ' + ' >= 0 ? ' + variable0 + ' <= ' + endVar + ' : ' + variable0 +
variable0 + ' <= ' + endVar + ' : ' + ' >= ' + endVar + '; ' + variable0 + ' += ' + incVar + ') {\n' +
variable0 + ' >= ' + endVar + '; ' +
variable0 + ' += ' + incVar + ') {\n' +
branch + '}\n'; branch + '}\n';
} }
return code; return code;
}; };
Blockly.JavaScript['controls_forEach'] = function(block) { JavaScript['controls_forEach'] = function(block) {
// For each loop. // For each loop.
const variable0 = Blockly.JavaScript.nameDB_.getName( const variable0 =
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME); JavaScript.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
const argument0 = Blockly.JavaScript.valueToCode(block, 'LIST', const argument0 =
Blockly.JavaScript.ORDER_ASSIGNMENT) || '[]'; JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_ASSIGNMENT) ||
let branch = Blockly.JavaScript.statementToCode(block, 'DO'); '[]';
branch = Blockly.JavaScript.addLoopTrap(branch, block); let branch = JavaScript.statementToCode(block, 'DO');
branch = JavaScript.addLoopTrap(branch, block);
let code = ''; let code = '';
// Cache non-trivial values to variables to prevent repeated look-ups. // Cache non-trivial values to variables to prevent repeated look-ups.
let listVar = argument0; let listVar = argument0;
if (!argument0.match(/^\w+$/)) { if (!argument0.match(/^\w+$/)) {
listVar = Blockly.JavaScript.nameDB_.getDistinctName( listVar = JavaScript.nameDB_.getDistinctName(
variable0 + '_list', Blockly.VARIABLE_CATEGORY_NAME); variable0 + '_list', NameType.VARIABLE);
code += 'var ' + listVar + ' = ' + argument0 + ';\n'; code += 'var ' + listVar + ' = ' + argument0 + ';\n';
} }
const indexVar = Blockly.JavaScript.nameDB_.getDistinctName( const indexVar = JavaScript.nameDB_.getDistinctName(
variable0 + '_index', Blockly.VARIABLE_CATEGORY_NAME); variable0 + '_index', NameType.VARIABLE);
branch = Blockly.JavaScript.INDENT + variable0 + ' = ' + branch = JavaScript.INDENT + variable0 + ' = ' + listVar + '[' + indexVar +
listVar + '[' + indexVar + '];\n' + branch; '];\n' + branch;
code += 'for (var ' + indexVar + ' in ' + listVar + ') {\n' + branch + '}\n'; code += 'for (var ' + indexVar + ' in ' + listVar + ') {\n' + branch + '}\n';
return code; return code;
}; };
Blockly.JavaScript['controls_flow_statements'] = function(block) { JavaScript['controls_flow_statements'] = function(block) {
// Flow statements: continue, break. // Flow statements: continue, break.
let xfix = ''; let xfix = '';
if (Blockly.JavaScript.STATEMENT_PREFIX) { if (JavaScript.STATEMENT_PREFIX) {
// Automatic prefix insertion is switched off for this block. Add manually. // Automatic prefix insertion is switched off for this block. Add manually.
xfix += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_PREFIX, xfix += JavaScript.injectId(JavaScript.STATEMENT_PREFIX, block);
block);
} }
if (Blockly.JavaScript.STATEMENT_SUFFIX) { if (JavaScript.STATEMENT_SUFFIX) {
// Inject any statement suffix here since the regular one at the end // Inject any statement suffix here since the regular one at the end
// will not get executed if the break/continue is triggered. // will not get executed if the break/continue is triggered.
xfix += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_SUFFIX, xfix += JavaScript.injectId(JavaScript.STATEMENT_SUFFIX, block);
block);
} }
if (Blockly.JavaScript.STATEMENT_PREFIX) { if (JavaScript.STATEMENT_PREFIX) {
const loop = block.getSurroundLoop(); const loop = block.getSurroundLoop();
if (loop && !loop.suppressPrefixSuffix) { if (loop && !loop.suppressPrefixSuffix) {
// Inject loop's statement prefix here since the regular one at the end // Inject loop's statement prefix here since the regular one at the end
// of the loop will not get executed if 'continue' is triggered. // 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. // In the case of 'break', a prefix is needed due to the loop's suffix.
xfix += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_PREFIX, xfix += JavaScript.injectId(JavaScript.STATEMENT_PREFIX, loop);
loop);
} }
} }
switch (block.getFieldValue('FLOW')) { switch (block.getFieldValue('FLOW')) {

2
tests/deps.js
View File

@@ -281,7 +281,7 @@ goog.addDependency('../../generators/javascript/all.js', ['Blockly.JavaScript.al
goog.addDependency('../../generators/javascript/colour.js', ['Blockly.JavaScript.colour'], ['Blockly.JavaScript'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../generators/javascript/colour.js', ['Blockly.JavaScript.colour'], ['Blockly.JavaScript'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../generators/javascript/lists.js', ['Blockly.JavaScript.lists'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../generators/javascript/lists.js', ['Blockly.JavaScript.lists'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../generators/javascript/logic.js', ['Blockly.JavaScript.logic'], ['Blockly.JavaScript'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../generators/javascript/logic.js', ['Blockly.JavaScript.logic'], ['Blockly.JavaScript'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript', 'Blockly.utils.string'], {'lang': 'es6'}); goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript', 'Blockly.Names', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../generators/javascript/math.js', ['Blockly.JavaScript.math'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../generators/javascript/math.js', ['Blockly.JavaScript.math'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../generators/javascript/procedures.js', ['Blockly.JavaScript.procedures'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../generators/javascript/procedures.js', ['Blockly.JavaScript.procedures'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../generators/javascript/text.js', ['Blockly.JavaScript.texts'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../generators/javascript/text.js', ['Blockly.JavaScript.texts'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'});