CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-06 08:30:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(generators): Introduce DartGenerator class, Order enum (#7160)

Browse Source 
* refactor(generators): Introduce DartGenerator class, Order enum

* refactor(generators): Use Order.* instead of .ORDER_*

* refactor(generators): Don't rename dartGenerator
This commit is contained in:
Christopher Allen
2023-06-14 00:39:12 +01:00
committed by GitHub
parent aeee278767
commit 26901654ea
10 changed files with 760 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
generators/dart/loops.js
View File

@@ -11,12 +11,12 @@
import * as goog from '../../closure/goog/goog.js';
goog.declareModuleId('Blockly.Dart.loops');
import {dartGenerator as Dart} from '../dart.js';
import {dartGenerator, Order} from '../dart.js';
import * as stringUtils from '../../core/utils/string.js';
import {NameType} from '../../core/names.js';
Dart.forBlock['controls_repeat_ext'] = function(block) {
dartGenerator.forBlock['controls_repeat_ext'] = function(block) {
let repeats;
// Repeat n times.
if (block.getField('TIMES')) {
@@ -24,15 +24,18 @@ Dart.forBlock['controls_repeat_ext'] = function(block) {
repeats = String(Number(block.getFieldValue('TIMES')));
} else {
// External number.
repeats = Dart.valueToCode(block, 'TIMES', Dart.ORDER_ASSIGNMENT) || '0';
repeats =
dartGenerator.valueToCode(block, 'TIMES', Order.ASSIGNMENT) || '0';
}
let branch = Dart.statementToCode(block, 'DO');
branch = Dart.addLoopTrap(branch, block);
let branch = dartGenerator.statementToCode(block, 'DO');
branch = dartGenerator.addLoopTrap(branch, block);
let code = '';
const loopVar = Dart.nameDB_.getDistinctName('count', NameType.VARIABLE);
const loopVar =
dartGenerator.nameDB_.getDistinctName('count', NameType.VARIABLE);
let endVar = repeats;
if (!repeats.match(/^\w+$/) && !stringUtils.isNumber(repeats)) {
endVar = Dart.nameDB_.getDistinctName('repeat_end', NameType.VARIABLE);
endVar =
dartGenerator.nameDB_.getDistinctName('repeat_end', NameType.VARIABLE);
code += 'var ' + endVar + ' = ' + repeats + ';\n';
}
code += 'for (int ' + loopVar + ' = 0; ' + loopVar + ' < ' + endVar + '; ' +
@@ -40,33 +43,37 @@ Dart.forBlock['controls_repeat_ext'] = function(block) {
return code;
};
Dart.forBlock['controls_repeat'] = Dart.forBlock['controls_repeat_ext'];
dartGenerator.forBlock['controls_repeat'] =
dartGenerator.forBlock['controls_repeat_ext'];
Dart.forBlock['controls_whileUntil'] = function(block) {
dartGenerator.forBlock['controls_whileUntil'] = function(block) {
// Do while/until loop.
const until = block.getFieldValue('MODE') === 'UNTIL';
let argument0 =
Dart.valueToCode(
block, 'BOOL', until ? Dart.ORDER_UNARY_PREFIX : Dart.ORDER_NONE) ||
dartGenerator.valueToCode(
block, 'BOOL', until ? Order.UNARY_PREFIX : Order.NONE) ||
'false';
let branch = Dart.statementToCode(block, 'DO');
branch = Dart.addLoopTrap(branch, block);
let branch = dartGenerator.statementToCode(block, 'DO');
branch = dartGenerator.addLoopTrap(branch, block);
if (until) {
argument0 = '!' + argument0;
}
return 'while (' + argument0 + ') {\n' + branch + '}\n';
};
Dart.forBlock['controls_for'] = function(block) {
dartGenerator.forBlock['controls_for'] = function(block) {
// For loop.
const variable0 =
Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
dartGenerator.nameDB_.getName(
block.getFieldValue('VAR'), NameType.VARIABLE);
const argument0 =
Dart.valueToCode(block, 'FROM', Dart.ORDER_ASSIGNMENT) || '0';
const argument1 = Dart.valueToCode(block, 'TO', Dart.ORDER_ASSIGNMENT) || '0';
const increment = Dart.valueToCode(block, 'BY', Dart.ORDER_ASSIGNMENT) || '1';
let branch = Dart.statementToCode(block, 'DO');
branch = Dart.addLoopTrap(branch, block);
dartGenerator.valueToCode(block, 'FROM', Order.ASSIGNMENT) || '0';
const argument1 =
dartGenerator.valueToCode(block, 'TO', Order.ASSIGNMENT) || '0';
const increment =
dartGenerator.valueToCode(block, 'BY', Order.ASSIGNMENT) || '1';
let branch = dartGenerator.statementToCode(block, 'DO');
branch = dartGenerator.addLoopTrap(branch, block);
let code;
if (stringUtils.isNumber(argument0) && stringUtils.isNumber(argument1) &&
stringUtils.isNumber(increment)) {
@@ -87,19 +94,22 @@ Dart.forBlock['controls_for'] = function(block) {
let startVar = argument0;
if (!argument0.match(/^\w+$/) && !stringUtils.isNumber(argument0)) {
startVar =
Dart.nameDB_.getDistinctName(variable0 + '_start', NameType.VARIABLE);
dartGenerator.nameDB_.getDistinctName(
variable0 + '_start', NameType.VARIABLE);
code += 'var ' + startVar + ' = ' + argument0 + ';\n';
}
let endVar = argument1;
if (!argument1.match(/^\w+$/) && !stringUtils.isNumber(argument1)) {
endVar =
Dart.nameDB_.getDistinctName(variable0 + '_end', NameType.VARIABLE);
dartGenerator.nameDB_.getDistinctName(
variable0 + '_end', NameType.VARIABLE);
code += 'var ' + endVar + ' = ' + argument1 + ';\n';
}
// Determine loop direction at start, in case one of the bounds
// changes during loop execution.
const incVar =
Dart.nameDB_.getDistinctName(variable0 + '_inc', NameType.VARIABLE);
dartGenerator.nameDB_.getDistinctName(
variable0 + '_inc', NameType.VARIABLE);
code += 'num ' + incVar + ' = ';
if (stringUtils.isNumber(increment)) {
code += Math.abs(increment) + ';\n';
@@ -107,7 +117,7 @@ Dart.forBlock['controls_for'] = function(block) {
code += '(' + increment + ').abs();\n';
}
code += 'if (' + startVar + ' > ' + endVar + ') {\n';
code += Dart.INDENT + incVar + ' = -' + incVar + ';\n';
code += dartGenerator.INDENT + incVar + ' = -' + incVar + ';\n';
code += '}\n';
code += 'for (' + variable0 + ' = ' + startVar + '; ' + incVar +
' >= 0 ? ' + variable0 + ' <= ' + endVar + ' : ' + variable0 +
@@ -117,38 +127,39 @@ Dart.forBlock['controls_for'] = function(block) {
return code;
};
Dart.forBlock['controls_forEach'] = function(block) {
dartGenerator.forBlock['controls_forEach'] = function(block) {
// For each loop.
const variable0 =
Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
dartGenerator.nameDB_.getName(
block.getFieldValue('VAR'), NameType.VARIABLE);
const argument0 =
Dart.valueToCode(block, 'LIST', Dart.ORDER_ASSIGNMENT) || '[]';
let branch = Dart.statementToCode(block, 'DO');
branch = Dart.addLoopTrap(branch, block);
dartGenerator.valueToCode(block, 'LIST', Order.ASSIGNMENT) || '[]';
let branch = dartGenerator.statementToCode(block, 'DO');
branch = dartGenerator.addLoopTrap(branch, block);
const code =
'for (var ' + variable0 + ' in ' + argument0 + ') {\n' + branch + '}\n';
return code;
};
Dart.forBlock['controls_flow_statements'] = function(block) {
dartGenerator.forBlock['controls_flow_statements'] = function(block) {
// Flow statements: continue, break.
let xfix = '';
if (Dart.STATEMENT_PREFIX) {
if (dartGenerator.STATEMENT_PREFIX) {
// Automatic prefix insertion is switched off for this block. Add manually.
xfix += Dart.injectId(Dart.STATEMENT_PREFIX, block);
xfix += dartGenerator.injectId(dartGenerator.STATEMENT_PREFIX, block);
}
if (Dart.STATEMENT_SUFFIX) {
if (dartGenerator.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 += Dart.injectId(Dart.STATEMENT_SUFFIX, block);
xfix += dartGenerator.injectId(dartGenerator.STATEMENT_SUFFIX, block);
}
if (Dart.STATEMENT_PREFIX) {
if (dartGenerator.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 += Dart.injectId(Dart.STATEMENT_PREFIX, loop);
xfix += dartGenerator.injectId(dartGenerator.STATEMENT_PREFIX, loop);
}
}
switch (block.getFieldValue('FLOW')) {