CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-04 23:50:12 +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

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';