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

8
generators/javascript/colour.js
View File

@@ -14,13 +14,13 @@ goog.declareModuleId('Blockly.JavaScript.colour');
import {javascriptGenerator as JavaScript} from '../javascript.js';
JavaScript['colour_picker'] = function(block) {
JavaScript.forBlock['colour_picker'] = function(block) {
// Colour picker.
const code = JavaScript.quote_(block.getFieldValue('COLOUR'));
return [code, JavaScript.ORDER_ATOMIC];
};
JavaScript['colour_random'] = function(block) {
JavaScript.forBlock['colour_random'] = function(block) {
// Generate a random colour.
const functionName = JavaScript.provideFunction_('colourRandom', `
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}() {
@@ -32,7 +32,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}() {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['colour_rgb'] = function(block) {
JavaScript.forBlock['colour_rgb'] = function(block) {
// Compose a colour from RGB components expressed as percentages.
const red = JavaScript.valueToCode(block, 'RED', JavaScript.ORDER_NONE) || 0;
const green =
@@ -54,7 +54,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['colour_blend'] = function(block) {
JavaScript.forBlock['colour_blend'] = function(block) {
// Blend two colours together.
const c1 = JavaScript.valueToCode(block, 'COLOUR1', JavaScript.ORDER_NONE) ||
"'#000000'";

24
generators/javascript/lists.js
View File

@@ -16,12 +16,12 @@ import {NameType} from '../../core/names.js';
import {javascriptGenerator as JavaScript} from '../javascript.js';
JavaScript['lists_create_empty'] = function(block) {
JavaScript.forBlock['lists_create_empty'] = function(block) {
// Create an empty list.
return ['[]', JavaScript.ORDER_ATOMIC];
};
JavaScript['lists_create_with'] = function(block) {
JavaScript.forBlock['lists_create_with'] = function(block) {
// Create a list with any number of elements of any type.
const elements = new Array(block.itemCount_);
for (let i = 0; i < block.itemCount_; i++) {
@@ -33,7 +33,7 @@ JavaScript['lists_create_with'] = function(block) {
return [code, JavaScript.ORDER_ATOMIC];
};
JavaScript['lists_repeat'] = function(block) {
JavaScript.forBlock['lists_repeat'] = function(block) {
// Create a list with one element repeated.
const functionName = JavaScript.provideFunction_('listsRepeat', `
function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(value, n) {
@@ -52,21 +52,21 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(value, n) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['lists_length'] = function(block) {
JavaScript.forBlock['lists_length'] = function(block) {
// String or array length.
const list =
JavaScript.valueToCode(block, 'VALUE', JavaScript.ORDER_MEMBER) || '[]';
return [list + '.length', JavaScript.ORDER_MEMBER];
};
JavaScript['lists_isEmpty'] = function(block) {
JavaScript.forBlock['lists_isEmpty'] = function(block) {
// Is the string null or array empty?
const list =
JavaScript.valueToCode(block, 'VALUE', JavaScript.ORDER_MEMBER) || '[]';
return ['!' + list + '.length', JavaScript.ORDER_LOGICAL_NOT];
};
JavaScript['lists_indexOf'] = function(block) {
JavaScript.forBlock['lists_indexOf'] = function(block) {
// Find an item in the list.
const operator =
block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
@@ -81,7 +81,7 @@ JavaScript['lists_indexOf'] = function(block) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['lists_getIndex'] = function(block) {
JavaScript.forBlock['lists_getIndex'] = function(block) {
// Get element at index.
// Note: Until January 2013 this block did not have MODE or WHERE inputs.
const mode = block.getFieldValue('MODE') || 'GET';
@@ -162,7 +162,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(list, remove) {
throw Error('Unhandled combination (lists_getIndex).');
};
JavaScript['lists_setIndex'] = function(block) {
JavaScript.forBlock['lists_setIndex'] = function(block) {
// Set element at index.
// Note: Until February 2013 this block did not have MODE or WHERE inputs.
let list =
@@ -262,7 +262,7 @@ const getSubstringIndex = function(listName, where, opt_at) {
}
};
JavaScript['lists_getSublist'] = function(block) {
JavaScript.forBlock['lists_getSublist'] = function(block) {
// Get sublist.
const list =
JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_MEMBER) || '[]';
@@ -342,7 +342,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(sequence${at1Param}${at2Param}
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['lists_sort'] = function(block) {
JavaScript.forBlock['lists_sort'] = function(block) {
// Block for sorting a list.
const list =
JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_FUNCTION_CALL) ||
@@ -371,7 +371,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(type, direction) {
];
};
JavaScript['lists_split'] = function(block) {
JavaScript.forBlock['lists_split'] = function(block) {
// Block for splitting text into a list, or joining a list into text.
let input = JavaScript.valueToCode(block, 'INPUT', JavaScript.ORDER_MEMBER);
const delimiter =
@@ -395,7 +395,7 @@ JavaScript['lists_split'] = function(block) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['lists_reverse'] = function(block) {
JavaScript.forBlock['lists_reverse'] = function(block) {
// Block for reversing a list.
const list =
JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_FUNCTION_CALL) ||

16
generators/javascript/logic.js
View File

@@ -14,7 +14,7 @@ goog.declareModuleId('Blockly.JavaScript.logic');
import {javascriptGenerator as JavaScript} from '../javascript.js';
JavaScript['controls_if'] = function(block) {
JavaScript.forBlock['controls_if'] = function(block) {
// If/elseif/else condition.
let n = 0;
let code = '';
@@ -51,9 +51,9 @@ JavaScript['controls_if'] = function(block) {
return code + '\n';
};
JavaScript['controls_ifelse'] = JavaScript['controls_if'];
JavaScript.forBlock['controls_ifelse'] = JavaScript.forBlock['controls_if'];
JavaScript['logic_compare'] = function(block) {
JavaScript.forBlock['logic_compare'] = function(block) {
// Comparison operator.
const OPERATORS =
{'EQ': '==', 'NEQ': '!=', 'LT': '<', 'LTE': '<=', 'GT': '>', 'GTE': '>='};
@@ -67,7 +67,7 @@ JavaScript['logic_compare'] = function(block) {
return [code, order];
};
JavaScript['logic_operation'] = function(block) {
JavaScript.forBlock['logic_operation'] = function(block) {
// Operations 'and', 'or'.
const operator = (block.getFieldValue('OP') === 'AND') ? '&&' : '||';
const order = (operator === '&&') ? JavaScript.ORDER_LOGICAL_AND :
@@ -92,7 +92,7 @@ JavaScript['logic_operation'] = function(block) {
return [code, order];
};
JavaScript['logic_negate'] = function(block) {
JavaScript.forBlock['logic_negate'] = function(block) {
// Negation.
const order = JavaScript.ORDER_LOGICAL_NOT;
const argument0 = JavaScript.valueToCode(block, 'BOOL', order) || 'true';
@@ -100,18 +100,18 @@ JavaScript['logic_negate'] = function(block) {
return [code, order];
};
JavaScript['logic_boolean'] = function(block) {
JavaScript.forBlock['logic_boolean'] = function(block) {
// Boolean values true and false.
const code = (block.getFieldValue('BOOL') === 'TRUE') ? 'true' : 'false';
return [code, JavaScript.ORDER_ATOMIC];
};
JavaScript['logic_null'] = function(block) {
JavaScript.forBlock['logic_null'] = function(block) {
// Null data type.
return ['null', JavaScript.ORDER_ATOMIC];
};
JavaScript['logic_ternary'] = function(block) {
JavaScript.forBlock['logic_ternary'] = function(block) {
// Ternary operator.
const value_if =
JavaScript.valueToCode(block, 'IF', JavaScript.ORDER_CONDITIONAL) ||

12
generators/javascript/loops.js
View File

@@ -16,7 +16,7 @@ import {NameType} from '../../core/names.js';
import {javascriptGenerator as JavaScript} from '../javascript.js';
JavaScript['controls_repeat_ext'] = function(block) {
JavaScript.forBlock['controls_repeat_ext'] = function(block) {
// Repeat n times.
let repeats;
if (block.getField('TIMES')) {
@@ -44,9 +44,9 @@ JavaScript['controls_repeat_ext'] = function(block) {
return code;
};
JavaScript['controls_repeat'] = JavaScript['controls_repeat_ext'];
JavaScript.forBlock['controls_repeat'] = JavaScript.forBlock['controls_repeat_ext'];
JavaScript['controls_whileUntil'] = function(block) {
JavaScript.forBlock['controls_whileUntil'] = function(block) {
// Do while/until loop.
const until = block.getFieldValue('MODE') === 'UNTIL';
let argument0 =
@@ -62,7 +62,7 @@ JavaScript['controls_whileUntil'] = function(block) {
return 'while (' + argument0 + ') {\n' + branch + '}\n';
};
JavaScript['controls_for'] = function(block) {
JavaScript.forBlock['controls_for'] = function(block) {
// For loop.
const variable0 =
JavaScript.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
@@ -124,7 +124,7 @@ JavaScript['controls_for'] = function(block) {
return code;
};
JavaScript['controls_forEach'] = function(block) {
JavaScript.forBlock['controls_forEach'] = function(block) {
// For each loop.
const variable0 =
JavaScript.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
@@ -149,7 +149,7 @@ JavaScript['controls_forEach'] = function(block) {
return code;
};
JavaScript['controls_flow_statements'] = function(block) {
JavaScript.forBlock['controls_flow_statements'] = function(block) {
// Flow statements: continue, break.
let xfix = '';
if (JavaScript.STATEMENT_PREFIX) {

28
generators/javascript/math.js
View File

@@ -16,7 +16,7 @@ import {NameType} from '../../core/names.js';
import {javascriptGenerator as JavaScript} from '../javascript.js';
JavaScript['math_number'] = function(block) {
JavaScript.forBlock['math_number'] = function(block) {
// Numeric value.
const code = Number(block.getFieldValue('NUM'));
const order = code >= 0 ? JavaScript.ORDER_ATOMIC :
@@ -24,7 +24,7 @@ JavaScript['math_number'] = function(block) {
return [code, order];
};
JavaScript['math_arithmetic'] = function(block) {
JavaScript.forBlock['math_arithmetic'] = function(block) {
// Basic arithmetic operators, and power.
const OPERATORS = {
'ADD': [' + ', JavaScript.ORDER_ADDITION],
@@ -48,7 +48,7 @@ JavaScript['math_arithmetic'] = function(block) {
return [code, order];
};
JavaScript['math_single'] = function(block) {
JavaScript.forBlock['math_single'] = function(block) {
// Math operators with single operand.
const operator = block.getFieldValue('OP');
let code;
@@ -132,7 +132,7 @@ JavaScript['math_single'] = function(block) {
return [code, JavaScript.ORDER_DIVISION];
};
JavaScript['math_constant'] = function(block) {
JavaScript.forBlock['math_constant'] = function(block) {
// Constants: PI, E, the Golden Ratio, sqrt(2), 1/sqrt(2), INFINITY.
const CONSTANTS = {
'PI': ['Math.PI', JavaScript.ORDER_MEMBER],
@@ -145,7 +145,7 @@ JavaScript['math_constant'] = function(block) {
return CONSTANTS[block.getFieldValue('CONSTANT')];
};
JavaScript['math_number_property'] = function(block) {
JavaScript.forBlock['math_number_property'] = function(block) {
// Check if a number is even, odd, prime, whole, positive, or negative
// or if it is divisible by certain number. Returns true or false.
const PROPERTIES = {
@@ -198,7 +198,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(n) {
return [code, outputOrder];
};
JavaScript['math_change'] = function(block) {
JavaScript.forBlock['math_change'] = function(block) {
// Add to a variable in place.
const argument0 = JavaScript.valueToCode(block, 'DELTA',
JavaScript.ORDER_ADDITION) || '0';
@@ -209,11 +209,11 @@ JavaScript['math_change'] = function(block) {
};
// Rounding functions have a single operand.
JavaScript['math_round'] = JavaScript['math_single'];
JavaScript.forBlock['math_round'] = JavaScript.forBlock['math_single'];
// Trigonometry functions have a single operand.
JavaScript['math_trig'] = JavaScript['math_single'];
JavaScript.forBlock['math_trig'] = JavaScript.forBlock['math_single'];
JavaScript['math_on_list'] = function(block) {
JavaScript.forBlock['math_on_list'] = function(block) {
// Math functions for lists.
const func = block.getFieldValue('OP');
let list;
@@ -341,7 +341,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(list) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['math_modulo'] = function(block) {
JavaScript.forBlock['math_modulo'] = function(block) {
// Remainder computation.
const argument0 = JavaScript.valueToCode(block, 'DIVIDEND',
JavaScript.ORDER_MODULUS) || '0';
@@ -351,7 +351,7 @@ JavaScript['math_modulo'] = function(block) {
return [code, JavaScript.ORDER_MODULUS];
};
JavaScript['math_constrain'] = function(block) {
JavaScript.forBlock['math_constrain'] = function(block) {
// Constrain a number between two limits.
const argument0 = JavaScript.valueToCode(block, 'VALUE',
JavaScript.ORDER_NONE) || '0';
@@ -364,7 +364,7 @@ JavaScript['math_constrain'] = function(block) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['math_random_int'] = function(block) {
JavaScript.forBlock['math_random_int'] = function(block) {
// Random integer between [X] and [Y].
const argument0 = JavaScript.valueToCode(block, 'FROM',
JavaScript.ORDER_NONE) || '0';
@@ -385,12 +385,12 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(a, b) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['math_random_float'] = function(block) {
JavaScript.forBlock['math_random_float'] = function(block) {
// Random fraction between 0 and 1.
return ['Math.random()', JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['math_atan2'] = function(block) {
JavaScript.forBlock['math_atan2'] = function(block) {
// Arctangent of point (X, Y) in degrees from -180 to 180.
const argument0 = JavaScript.valueToCode(block, 'X',
JavaScript.ORDER_NONE) || '0';

12
generators/javascript/procedures.js
View File

@@ -15,7 +15,7 @@ import {NameType} from '../../core/names.js';
import {javascriptGenerator as JavaScript} from '../javascript.js';
JavaScript['procedures_defreturn'] = function(block) {
JavaScript.forBlock['procedures_defreturn'] = function(block) {
// Define a procedure with a return value.
const funcName = JavaScript.nameDB_.getName(
block.getFieldValue('NAME'), NameType.PROCEDURE);
@@ -61,9 +61,9 @@ JavaScript['procedures_defreturn'] = function(block) {
// Defining a procedure without a return value uses the same generator as
// a procedure with a return value.
JavaScript['procedures_defnoreturn'] = JavaScript['procedures_defreturn'];
JavaScript.forBlock['procedures_defnoreturn'] = JavaScript.forBlock['procedures_defreturn'];
JavaScript['procedures_callreturn'] = function(block) {
JavaScript.forBlock['procedures_callreturn'] = function(block) {
// Call a procedure with a return value.
const funcName = JavaScript.nameDB_.getName(
block.getFieldValue('NAME'), NameType.PROCEDURE);
@@ -77,15 +77,15 @@ JavaScript['procedures_callreturn'] = function(block) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['procedures_callnoreturn'] = function(block) {
JavaScript.forBlock['procedures_callnoreturn'] = function(block) {
// Call a procedure with no return value.
// Generated code is for a function call as a statement is the same as a
// function call as a value, with the addition of line ending.
const tuple = JavaScript['procedures_callreturn'](block);
const tuple = JavaScript.forBlock['procedures_callreturn'](block);
return tuple[0] + ';\n';
};
JavaScript['procedures_ifreturn'] = function(block) {
JavaScript.forBlock['procedures_ifreturn'] = function(block) {
// Conditionally return value from a procedure.
const condition =
JavaScript.valueToCode(block, 'CONDITION', JavaScript.ORDER_NONE) ||

34
generators/javascript/text.js
View File

@@ -53,13 +53,13 @@ const getSubstringIndex = function(stringName, where, opt_at) {
}
};
JavaScript['text'] = function(block) {
JavaScript.forBlock['text'] = function(block) {
// Text value.
const code = JavaScript.quote_(block.getFieldValue('TEXT'));
return [code, JavaScript.ORDER_ATOMIC];
};
JavaScript['text_multiline'] = function(block) {
JavaScript.forBlock['text_multiline'] = function(block) {
// Text value.
const code = JavaScript.multiline_quote_(block.getFieldValue('TEXT'));
const order = code.indexOf('+') !== -1 ? JavaScript.ORDER_ADDITION :
@@ -67,7 +67,7 @@ JavaScript['text_multiline'] = function(block) {
return [code, order];
};
JavaScript['text_join'] = function(block) {
JavaScript.forBlock['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
switch (block.itemCount_) {
case 0:
@@ -99,7 +99,7 @@ JavaScript['text_join'] = function(block) {
}
};
JavaScript['text_append'] = function(block) {
JavaScript.forBlock['text_append'] = function(block) {
// Append to a variable in place.
const varName = JavaScript.nameDB_.getName(
block.getFieldValue('VAR'), NameType.VARIABLE);
@@ -110,21 +110,21 @@ JavaScript['text_append'] = function(block) {
return code;
};
JavaScript['text_length'] = function(block) {
JavaScript.forBlock['text_length'] = function(block) {
// String or array length.
const text = JavaScript.valueToCode(block, 'VALUE',
JavaScript.ORDER_MEMBER) || "''";
return [text + '.length', JavaScript.ORDER_MEMBER];
};
JavaScript['text_isEmpty'] = function(block) {
JavaScript.forBlock['text_isEmpty'] = function(block) {
// Is the string null or array empty?
const text = JavaScript.valueToCode(block, 'VALUE',
JavaScript.ORDER_MEMBER) || "''";
return ['!' + text + '.length', JavaScript.ORDER_LOGICAL_NOT];
};
JavaScript['text_indexOf'] = function(block) {
JavaScript.forBlock['text_indexOf'] = function(block) {
// Search the text for a substring.
const operator = block.getFieldValue('END') === 'FIRST' ?
'indexOf' : 'lastIndexOf';
@@ -140,7 +140,7 @@ JavaScript['text_indexOf'] = function(block) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['text_charAt'] = function(block) {
JavaScript.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';
@@ -181,7 +181,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(text) {
throw Error('Unhandled option (text_charAt).');
};
JavaScript['text_getSubstring'] = function(block) {
JavaScript.forBlock['text_getSubstring'] = function(block) {
// Get substring.
const where1 = block.getFieldValue('WHERE1');
const where2 = block.getFieldValue('WHERE2');
@@ -259,7 +259,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(sequence${at1Param}${at2Param}
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['text_changeCase'] = function(block) {
JavaScript.forBlock['text_changeCase'] = function(block) {
// Change capitalization.
const OPERATORS = {
'UPPERCASE': '.toUpperCase()',
@@ -286,7 +286,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(str) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['text_trim'] = function(block) {
JavaScript.forBlock['text_trim'] = function(block) {
// Trim spaces.
const OPERATORS = {
'LEFT': ".replace(/^[\\s\\xa0]+/, '')",
@@ -299,14 +299,14 @@ JavaScript['text_trim'] = function(block) {
return [text + operator, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['text_print'] = function(block) {
JavaScript.forBlock['text_print'] = function(block) {
// Print statement.
const msg = JavaScript.valueToCode(block, 'TEXT',
JavaScript.ORDER_NONE) || "''";
return 'window.alert(' + msg + ');\n';
};
JavaScript['text_prompt_ext'] = function(block) {
JavaScript.forBlock['text_prompt_ext'] = function(block) {
// Prompt function.
let msg;
if (block.getField('TEXT')) {
@@ -324,9 +324,9 @@ JavaScript['text_prompt_ext'] = function(block) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['text_prompt'] = JavaScript['text_prompt_ext'];
JavaScript.forBlock['text_prompt'] = JavaScript.forBlock['text_prompt_ext'];
JavaScript['text_count'] = function(block) {
JavaScript.forBlock['text_count'] = function(block) {
const text = JavaScript.valueToCode(block, 'TEXT',
JavaScript.ORDER_NONE) || "''";
const sub = JavaScript.valueToCode(block, 'SUB',
@@ -344,7 +344,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(haystack, needle) {
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['text_replace'] = function(block) {
JavaScript.forBlock['text_replace'] = function(block) {
const text = JavaScript.valueToCode(block, 'TEXT',
JavaScript.ORDER_NONE) || "''";
const from = JavaScript.valueToCode(block, 'FROM',
@@ -363,7 +363,7 @@ function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(haystack, needle, replacement)
return [code, JavaScript.ORDER_FUNCTION_CALL];
};
JavaScript['text_reverse'] = function(block) {
JavaScript.forBlock['text_reverse'] = function(block) {
const text = JavaScript.valueToCode(block, 'TEXT',
JavaScript.ORDER_MEMBER) || "''";
const code = text + ".split('').reverse().join('')";

4
generators/javascript/variables.js
View File

@@ -15,14 +15,14 @@ import {NameType} from '../../core/names.js';
import {javascriptGenerator as JavaScript} from '../javascript.js';
JavaScript['variables_get'] = function(block) {
JavaScript.forBlock['variables_get'] = function(block) {
// Variable getter.
const code = JavaScript.nameDB_.getName(block.getFieldValue('VAR'),
NameType.VARIABLE);
return [code, JavaScript.ORDER_ATOMIC];
};
JavaScript['variables_set'] = function(block) {
JavaScript.forBlock['variables_set'] = function(block) {
// Variable setter.
const argument0 = JavaScript.valueToCode(
block, 'VALUE', JavaScript.ORDER_ASSIGNMENT) || '0';

4
generators/javascript/variables_dynamic.js
View File

@@ -16,5 +16,5 @@ import './variables.js';
// JavaScript is dynamically typed.
JavaScript['variables_get_dynamic'] = JavaScript['variables_get'];
JavaScript['variables_set_dynamic'] = JavaScript['variables_set'];
JavaScript.forBlock['variables_get_dynamic'] = JavaScript.forBlock['variables_get'];
JavaScript.forBlock['variables_set_dynamic'] = JavaScript.forBlock['variables_set'];