CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-07 09:00:11 +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

192
generators/dart/text.js
View File

@@ -12,153 +12,157 @@ import * as goog from '../../closure/goog/goog.js';
goog.declareModuleId('Blockly.Dart.texts');
import {NameType} from '../../core/names.js';
import {dartGenerator as Dart} from '../dart.js';
import {dartGenerator, Order} from '../dart.js';
Dart.addReservedWords('Html,Math');
dartGenerator.addReservedWords('Html,Math');
Dart.forBlock['text'] = function(block) {
dartGenerator.forBlock['text'] = function(block) {
// Text value.
const code = Dart.quote_(block.getFieldValue('TEXT'));
return [code, Dart.ORDER_ATOMIC];
const code = dartGenerator.quote_(block.getFieldValue('TEXT'));
return [code, Order.ATOMIC];
};
Dart.forBlock['text_multiline'] = function(block) {
dartGenerator.forBlock['text_multiline'] = function(block) {
// Text value.
const code = Dart.multiline_quote_(block.getFieldValue('TEXT'));
const code = dartGenerator.multiline_quote_(block.getFieldValue('TEXT'));
const order =
code.indexOf('+') !== -1 ? Dart.ORDER_ADDITIVE : Dart.ORDER_ATOMIC;
code.indexOf('+') !== -1 ? Order.ADDITIVE : Order.ATOMIC;
return [code, order];
};
Dart.forBlock['text_join'] = function(block) {
dartGenerator.forBlock['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
switch (block.itemCount_) {
case 0:
return ["''", Dart.ORDER_ATOMIC];
return ["''", Order.ATOMIC];
case 1: {
const element =
Dart.valueToCode(block, 'ADD0', Dart.ORDER_UNARY_POSTFIX) || "''";
dartGenerator.valueToCode(block, 'ADD0', Order.UNARY_POSTFIX) || "''";
const code = element + '.toString()';
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
}
default: {
const elements = new Array(block.itemCount_);
for (let i = 0; i < block.itemCount_; i++) {
elements[i] =
Dart.valueToCode(block, 'ADD' + i, Dart.ORDER_NONE) || "''";
dartGenerator.valueToCode(block, 'ADD' + i, Order.NONE) || "''";
}
const code = '[' + elements.join(',') + '].join()';
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
}
}
};
Dart.forBlock['text_append'] = function(block) {
dartGenerator.forBlock['text_append'] = function(block) {
// Append to a variable in place.
const varName =
Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
const value = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
dartGenerator.nameDB_.getName(
block.getFieldValue('VAR'), NameType.VARIABLE);
const value = dartGenerator.valueToCode(block, 'TEXT', Order.NONE) || "''";
return varName + ' = [' + varName + ', ' + value + '].join();\n';
};
Dart.forBlock['text_length'] = function(block) {
dartGenerator.forBlock['text_length'] = function(block) {
// String or array length.
const text =
Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
return [text + '.length', Dart.ORDER_UNARY_POSTFIX];
dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
return [text + '.length', Order.UNARY_POSTFIX];
};
Dart.forBlock['text_isEmpty'] = function(block) {
dartGenerator.forBlock['text_isEmpty'] = function(block) {
// Is the string null or array empty?
const text =
Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
return [text + '.isEmpty', Dart.ORDER_UNARY_POSTFIX];
dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
return [text + '.isEmpty', Order.UNARY_POSTFIX];
};
Dart.forBlock['text_indexOf'] = function(block) {
dartGenerator.forBlock['text_indexOf'] = function(block) {
// Search the text for a substring.
const operator =
block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
const substring = Dart.valueToCode(block, 'FIND', Dart.ORDER_NONE) || "''";
const substring =
dartGenerator.valueToCode(block, 'FIND', Order.NONE) || "''";
const text =
Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
const code = text + '.' + operator + '(' + substring + ')';
if (block.workspace.options.oneBasedIndex) {
return [code + ' + 1', Dart.ORDER_ADDITIVE];
return [code + ' + 1', Order.ADDITIVE];
}
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
};
Dart.forBlock['text_charAt'] = function(block) {
dartGenerator.forBlock['text_charAt'] = function(block) {
// Get letter at index.
// Note: Until January 2013 this block did not have the WHERE input.
const where = block.getFieldValue('WHERE') || 'FROM_START';
const textOrder = (where === 'FIRST' || where === 'FROM_START') ?
Dart.ORDER_UNARY_POSTFIX :
Dart.ORDER_NONE;
const text = Dart.valueToCode(block, 'VALUE', textOrder) || "''";
Order.UNARY_POSTFIX :
Order.NONE;
const text = dartGenerator.valueToCode(block, 'VALUE', textOrder) || "''";
let at;
switch (where) {
case 'FIRST': {
const code = text + '[0]';
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
}
case 'FROM_START': {
at = Dart.getAdjusted(block, 'AT');
at = dartGenerator.getAdjusted(block, 'AT');
const code = text + '[' + at + ']';
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
}
case 'LAST':
at = 1;
// Fall through.
case 'FROM_END': {
at = Dart.getAdjusted(block, 'AT', 1);
const functionName = Dart.provideFunction_('text_get_from_end', `
String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text, num x) {
at = dartGenerator.getAdjusted(block, 'AT', 1);
const functionName = dartGenerator.provideFunction_('text_get_from_end', `
String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text, num x) {
return text[text.length - x];
}
`);
const code = functionName + '(' + text + ', ' + at + ')';
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
}
case 'RANDOM': {
Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
const functionName = Dart.provideFunction_('text_random_letter', `
String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text) {
dartGenerator.definitions_['import_dart_math'] =
'import \'dart:math\' as Math;';
const functionName =
dartGenerator.provideFunction_('text_random_letter', `
String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text) {
int x = new Math.Random().nextInt(text.length);
return text[x];
}
`);
const code = functionName + '(' + text + ')';
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
}
}
throw Error('Unhandled option (text_charAt).');
};
Dart.forBlock['text_getSubstring'] = function(block) {
dartGenerator.forBlock['text_getSubstring'] = function(block) {
// Get substring.
const where1 = block.getFieldValue('WHERE1');
const where2 = block.getFieldValue('WHERE2');
const requiresLengthCall = (where1 !== 'FROM_END' && where2 === 'FROM_START');
const textOrder =
requiresLengthCall ? Dart.ORDER_UNARY_POSTFIX : Dart.ORDER_NONE;
const text = Dart.valueToCode(block, 'STRING', textOrder) || "''";
requiresLengthCall ? Order.UNARY_POSTFIX : Order.NONE;
const text = dartGenerator.valueToCode(block, 'STRING', textOrder) || "''";
let code;
if (where1 === 'FIRST' && where2 === 'LAST') {
code = text;
return [code, Dart.ORDER_NONE];
return [code, Order.NONE];
} else if (text.match(/^'?\w+'?$/) || requiresLengthCall) {
// If the text is a variable or literal or doesn't require a call for
// length, don't generate a helper function.
let at1;
switch (where1) {
case 'FROM_START':
at1 = Dart.getAdjusted(block, 'AT1');
at1 = dartGenerator.getAdjusted(block, 'AT1');
break;
case 'FROM_END':
at1 = Dart.getAdjusted(block, 'AT1', 1, false, Dart.ORDER_ADDITIVE);
at1 = dartGenerator.getAdjusted(block, 'AT1', 1, false, Order.ADDITIVE);
at1 = text + '.length - ' + at1;
break;
case 'FIRST':
@@ -170,10 +174,10 @@ Dart.forBlock['text_getSubstring'] = function(block) {
let at2;
switch (where2) {
case 'FROM_START':
at2 = Dart.getAdjusted(block, 'AT2', 1);
at2 = dartGenerator.getAdjusted(block, 'AT2', 1);
break;
case 'FROM_END':
at2 = Dart.getAdjusted(block, 'AT2', 0, false, Dart.ORDER_ADDITIVE);
at2 = dartGenerator.getAdjusted(block, 'AT2', 0, false, Order.ADDITIVE);
at2 = text + '.length - ' + at2;
break;
case 'LAST':
@@ -188,10 +192,11 @@ Dart.forBlock['text_getSubstring'] = function(block) {
code = text + '.substring(' + at1 + ', ' + at2 + ')';
}
} else {
const at1 = Dart.getAdjusted(block, 'AT1');
const at2 = Dart.getAdjusted(block, 'AT2');
const functionName = Dart.provideFunction_('text_get_substring', `
String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text, String where1, num at1, String where2, num at2) {
const at1 = dartGenerator.getAdjusted(block, 'AT1');
const at2 = dartGenerator.getAdjusted(block, 'AT2');
const functionName =
dartGenerator.provideFunction_('text_get_substring', `
String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text, String where1, num at1, String where2, num at2) {
int getAt(String where, num at) {
if (where == 'FROM_END') {
at = text.length - 1 - at;
@@ -212,10 +217,10 @@ String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text, String where1, num at1, S
code = functionName + '(' + text + ', \'' + where1 + '\', ' + at1 + ', \'' +
where2 + '\', ' + at2 + ')';
}
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
};
Dart.forBlock['text_changeCase'] = function(block) {
dartGenerator.forBlock['text_changeCase'] = function(block) {
// Change capitalization.
const OPERATORS = {
'UPPERCASE': '.toUpperCase()',
@@ -223,16 +228,16 @@ Dart.forBlock['text_changeCase'] = function(block) {
'TITLECASE': null
};
const operator = OPERATORS[block.getFieldValue('CASE')];
const textOrder = operator ? Dart.ORDER_UNARY_POSTFIX : Dart.ORDER_NONE;
const text = Dart.valueToCode(block, 'TEXT', textOrder) || "''";
const textOrder = operator ? Order.UNARY_POSTFIX : Order.NONE;
const text = dartGenerator.valueToCode(block, 'TEXT', textOrder) || "''";
let code;
if (operator) {
// Upper and lower case are functions built into Dart.
// Upper and lower case are functions built into dartGenerator.
code = text + operator;
} else {
// Title case is not a native Dart function. Define one.
const functionName = Dart.provideFunction_('text_toTitleCase', `
String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String str) {
// Title case is not a native dartGenerator function. Define one.
const functionName = dartGenerator.provideFunction_('text_toTitleCase', `
String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String str) {
RegExp exp = new RegExp(r'\\b');
List<String> list = str.split(exp);
final title = new StringBuffer();
@@ -249,10 +254,10 @@ String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String str) {
`);
code = functionName + '(' + text + ')';
}
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
};
Dart.forBlock['text_trim'] = function(block) {
dartGenerator.forBlock['text_trim'] = function(block) {
// Trim spaces.
const OPERATORS = {
'LEFT': '.replaceFirst(new RegExp(r\'^\\s+\'), \'\')',
@@ -261,44 +266,47 @@ Dart.forBlock['text_trim'] = function(block) {
};
const operator = OPERATORS[block.getFieldValue('MODE')];
const text =
Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
return [text + operator, Dart.ORDER_UNARY_POSTFIX];
dartGenerator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
return [text + operator, Order.UNARY_POSTFIX];
};
Dart.forBlock['text_print'] = function(block) {
dartGenerator.forBlock['text_print'] = function(block) {
// Print statement.
const msg = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
const msg = dartGenerator.valueToCode(block, 'TEXT', Order.NONE) || "''";
return 'print(' + msg + ');\n';
};
Dart.forBlock['text_prompt_ext'] = function(block) {
dartGenerator.forBlock['text_prompt_ext'] = function(block) {
// Prompt function.
Dart.definitions_['import_dart_html'] = 'import \'dart:html\' as Html;';
dartGenerator.definitions_['import_dart_html'] =
'import \'dart:html\' as Html;';
let msg;
if (block.getField('TEXT')) {
// Internal message.
msg = Dart.quote_(block.getFieldValue('TEXT'));
msg = dartGenerator.quote_(block.getFieldValue('TEXT'));
} else {
// External message.
msg = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
msg = dartGenerator.valueToCode(block, 'TEXT', Order.NONE) || "''";
}
let code = 'Html.window.prompt(' + msg + ', \'\')';
const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
if (toNumber) {
Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
dartGenerator.definitions_['import_dart_math'] =
'import \'dart:math\' as Math;';
code = 'Math.parseDouble(' + code + ')';
}
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
};
Dart.forBlock['text_prompt'] = Dart.forBlock['text_prompt_ext'];
dartGenerator.forBlock['text_prompt'] =
dartGenerator.forBlock['text_prompt_ext'];
Dart.forBlock['text_count'] = function(block) {
const text = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
const sub = Dart.valueToCode(block, 'SUB', Dart.ORDER_NONE) || "''";
// Substring count is not a native Dart function. Define one.
const functionName = Dart.provideFunction_('text_count', `
int ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String haystack, String needle) {
dartGenerator.forBlock['text_count'] = function(block) {
const text = dartGenerator.valueToCode(block, 'TEXT', Order.NONE) || "''";
const sub = dartGenerator.valueToCode(block, 'SUB', Order.NONE) || "''";
// Substring count is not a native dartGenerator function. Define one.
const functionName = dartGenerator.provideFunction_('text_count', `
int ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String haystack, String needle) {
if (needle.length == 0) {
return haystack.length + 1;
}
@@ -315,24 +323,24 @@ int ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String haystack, String needle) {
}
`);
const code = functionName + '(' + text + ', ' + sub + ')';
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
};
Dart.forBlock['text_replace'] = function(block) {
dartGenerator.forBlock['text_replace'] = function(block) {
const text =
Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
const from = Dart.valueToCode(block, 'FROM', Dart.ORDER_NONE) || "''";
const to = Dart.valueToCode(block, 'TO', Dart.ORDER_NONE) || "''";
dartGenerator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
const from = dartGenerator.valueToCode(block, 'FROM', Order.NONE) || "''";
const to = dartGenerator.valueToCode(block, 'TO', Order.NONE) || "''";
const code = text + '.replaceAll(' + from + ', ' + to + ')';
return [code, Dart.ORDER_UNARY_POSTFIX];
return [code, Order.UNARY_POSTFIX];
};
Dart.forBlock['text_reverse'] = function(block) {
// There isn't a sensible way to do this in Dart. See:
dartGenerator.forBlock['text_reverse'] = function(block) {
// There isn't a sensible way to do this in dartGenerator. See:
// http://stackoverflow.com/a/21613700/3529104
// Implementing something is possibly better than not implementing anything?
const text =
Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
dartGenerator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
const code = 'new String.fromCharCodes(' + text + '.runes.toList().reversed)';
return [code, Dart.ORDER_UNARY_PREFIX];
return [code, Order.UNARY_PREFIX];
};