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

refactor(generators)!: CodeGenerator per-block-type generator function dictionary (#7150)

Browse Source 
* feat(generators): Add block generator function dictionary

  Add a dictionary of block generator functions, provisionally
  called .forBlock.  Look up generator functions there first, but
  fall back to looking up on 'this' (with deprecation notice)
  for backwards compatibility.

  Also tweak error message generation to use template literal.

* refactor(generators)!: Update generator definitions to use dictionary

* fix(tests): Have blockToCodeTest clean up after itself

  Have the blockToCodeTest helper function delete the block generator
  functions it adds to generator once the test is done.

* refactor(tests): Use generator dictionary in insertion marker test

  The use of generators in insertion_marker_test.js was overlooked
  in the earlier commit making such updates, and some test here
  were failing due to lack of cleanup in
  cleanup in the generator_test.js.

BREAKING CHANGE: this PR moves the generator functions we provide
from their previous location directly on the CodeGenerator instances
to the new .forBlock dictionary on each instance. This does not oblige
external developers to do the same for their custom generators, but
they will need to update any code that references the generator
functions we provide (in generators/*/*, i.e. on javascriptGenerator,
dartGenerator etc.) e.g. to replace the implementation or reuse the
implementation for a different block type.
This commit is contained in:
Christopher Allen
2023-06-13 20:41:14 +01:00
committed by GitHub
parent f37380969a
commit f9c865b1b3
48 changed files with 386 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
generators/lua/text.js
View File

@@ -15,13 +15,13 @@ import {NameType} from '../../core/names.js';
import {luaGenerator as Lua} from '../lua.js';
Lua['text'] = function(block) {
Lua.forBlock['text'] = function(block) {
// Text value.
const code = Lua.quote_(block.getFieldValue('TEXT'));
return [code, Lua.ORDER_ATOMIC];
};
Lua['text_multiline'] = function(block) {
Lua.forBlock['text_multiline'] = function(block) {
// Text value.
const code = Lua.multiline_quote_(block.getFieldValue('TEXT'));
const order =
@@ -29,7 +29,7 @@ Lua['text_multiline'] = function(block) {
return [code, order];
};
Lua['text_join'] = function(block) {
Lua.forBlock['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
if (block.itemCount_ === 0) {
return ["''", Lua.ORDER_ATOMIC];
@@ -54,7 +54,7 @@ Lua['text_join'] = function(block) {
}
};
Lua['text_append'] = function(block) {
Lua.forBlock['text_append'] = function(block) {
// Append to a variable in place.
const varName =
Lua.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
@@ -63,19 +63,19 @@ Lua['text_append'] = function(block) {
return varName + ' = ' + varName + ' .. ' + value + '\n';
};
Lua['text_length'] = function(block) {
Lua.forBlock['text_length'] = function(block) {
// String or array length.
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_UNARY) || "''";
return ['#' + text, Lua.ORDER_UNARY];
};
Lua['text_isEmpty'] = function(block) {
Lua.forBlock['text_isEmpty'] = function(block) {
// Is the string null or array empty?
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_UNARY) || "''";
return ['#' + text + ' == 0', Lua.ORDER_RELATIONAL];
};
Lua['text_indexOf'] = function(block) {
Lua.forBlock['text_indexOf'] = function(block) {
// Search the text for a substring.
const substring = Lua.valueToCode(block, 'FIND', Lua.ORDER_NONE) || "''";
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_NONE) || "''";
@@ -105,7 +105,7 @@ end
return [code, Lua.ORDER_HIGH];
};
Lua['text_charAt'] = function(block) {
Lua.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';
@@ -151,7 +151,7 @@ end
return [code, Lua.ORDER_HIGH];
};
Lua['text_getSubstring'] = function(block) {
Lua.forBlock['text_getSubstring'] = function(block) {
// Get substring.
const text = Lua.valueToCode(block, 'STRING', Lua.ORDER_NONE) || "''";
@@ -188,7 +188,7 @@ Lua['text_getSubstring'] = function(block) {
return [code, Lua.ORDER_HIGH];
};
Lua['text_changeCase'] = function(block) {
Lua.forBlock['text_changeCase'] = function(block) {
// Change capitalization.
const operator = block.getFieldValue('CASE');
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
@@ -225,7 +225,7 @@ end
return [code, Lua.ORDER_HIGH];
};
Lua['text_trim'] = function(block) {
Lua.forBlock['text_trim'] = function(block) {
// Trim spaces.
const OPERATORS = {LEFT: '^%s*(,-)', RIGHT: '(.-)%s*$', BOTH: '^%s*(.-)%s*$'};
const operator = OPERATORS[block.getFieldValue('MODE')];
@@ -234,13 +234,13 @@ Lua['text_trim'] = function(block) {
return [code, Lua.ORDER_HIGH];
};
Lua['text_print'] = function(block) {
Lua.forBlock['text_print'] = function(block) {
// Print statement.
const msg = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
return 'print(' + msg + ')\n';
};
Lua['text_prompt_ext'] = function(block) {
Lua.forBlock['text_prompt_ext'] = function(block) {
// Prompt function.
let msg;
if (block.getField('TEXT')) {
@@ -267,9 +267,9 @@ end
return [code, Lua.ORDER_HIGH];
};
Lua['text_prompt'] = Lua['text_prompt_ext'];
Lua.forBlock['text_prompt'] = Lua.forBlock['text_prompt_ext'];
Lua['text_count'] = function(block) {
Lua.forBlock['text_count'] = function(block) {
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
const sub = Lua.valueToCode(block, 'SUB', Lua.ORDER_NONE) || "''";
const functionName = Lua.provideFunction_('text_count', `
@@ -294,7 +294,7 @@ end
return [code, Lua.ORDER_HIGH];
};
Lua['text_replace'] = function(block) {
Lua.forBlock['text_replace'] = function(block) {
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
const from = Lua.valueToCode(block, 'FROM', Lua.ORDER_NONE) || "''";
const to = Lua.valueToCode(block, 'TO', Lua.ORDER_NONE) || "''";
@@ -320,7 +320,7 @@ end
return [code, Lua.ORDER_HIGH];
};
Lua['text_reverse'] = function(block) {
Lua.forBlock['text_reverse'] = function(block) {
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
const code = 'string.reverse(' + text + ')';
return [code, Lua.ORDER_HIGH];