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

chore: update javascript block generators to const and let (#5661)

Browse Source
This commit is contained in:
Rachel Fenichel
2021-11-03 10:27:13 -07:00
committed by GitHub
parent 6c0c81d2f8
commit de95ffd133
9 changed files with 337 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
generators/javascript/math.js
View File

@@ -16,27 +16,27 @@ goog.require('Blockly.JavaScript');
Blockly.JavaScript['math_number'] = function(block) {
// Numeric value.
var code = Number(block.getFieldValue('NUM'));
var order = code >= 0 ? Blockly.JavaScript.ORDER_ATOMIC :
const code = Number(block.getFieldValue('NUM'));
const order = code >= 0 ? Blockly.JavaScript.ORDER_ATOMIC :
Blockly.JavaScript.ORDER_UNARY_NEGATION;
return [code, order];
};
Blockly.JavaScript['math_arithmetic'] = function(block) {
// Basic arithmetic operators, and power.
var OPERATORS = {
const OPERATORS = {
'ADD': [' + ', Blockly.JavaScript.ORDER_ADDITION],
'MINUS': [' - ', Blockly.JavaScript.ORDER_SUBTRACTION],
'MULTIPLY': [' * ', Blockly.JavaScript.ORDER_MULTIPLICATION],
'DIVIDE': [' / ', Blockly.JavaScript.ORDER_DIVISION],
'POWER': [null, Blockly.JavaScript.ORDER_NONE] // Handle power separately.
};
var tuple = OPERATORS[block.getFieldValue('OP')];
var operator = tuple[0];
var order = tuple[1];
var argument0 = Blockly.JavaScript.valueToCode(block, 'A', order) || '0';
var argument1 = Blockly.JavaScript.valueToCode(block, 'B', order) || '0';
var code;
const tuple = OPERATORS[block.getFieldValue('OP')];
const operator = tuple[0];
const order = tuple[1];
const argument0 = Blockly.JavaScript.valueToCode(block, 'A', order) || '0';
const argument1 = Blockly.JavaScript.valueToCode(block, 'B', order) || '0';
let code;
// Power in JavaScript requires a special case since it has no operator.
if (!operator) {
code = 'Math.pow(' + argument0 + ', ' + argument1 + ')';
@@ -48,9 +48,9 @@ Blockly.JavaScript['math_arithmetic'] = function(block) {
Blockly.JavaScript['math_single'] = function(block) {
// Math operators with single operand.
var operator = block.getFieldValue('OP');
var code;
var arg;
const operator = block.getFieldValue('OP');
let code;
let arg;
if (operator === 'NEG') {
// Negation is a special case given its different operator precedence.
arg = Blockly.JavaScript.valueToCode(block, 'NUM',
@@ -132,7 +132,7 @@ Blockly.JavaScript['math_single'] = function(block) {
Blockly.JavaScript['math_constant'] = function(block) {
// Constants: PI, E, the Golden Ratio, sqrt(2), 1/sqrt(2), INFINITY.
var CONSTANTS = {
const CONSTANTS = {
'PI': ['Math.PI', Blockly.JavaScript.ORDER_MEMBER],
'E': ['Math.E', Blockly.JavaScript.ORDER_MEMBER],
'GOLDEN_RATIO':
@@ -147,13 +147,13 @@ Blockly.JavaScript['math_constant'] = function(block) {
Blockly.JavaScript['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.
var number_to_check = Blockly.JavaScript.valueToCode(block, 'NUMBER_TO_CHECK',
const number_to_check = Blockly.JavaScript.valueToCode(block, 'NUMBER_TO_CHECK',
Blockly.JavaScript.ORDER_MODULUS) || '0';
var dropdown_property = block.getFieldValue('PROPERTY');
var code;
const dropdown_property = block.getFieldValue('PROPERTY');
let code;
if (dropdown_property === 'PRIME') {
// Prime is a special case as it is not a one-liner test.
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'mathIsPrime',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(n) {',
' // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
@@ -193,20 +193,21 @@ Blockly.JavaScript['math_number_property'] = function(block) {
case 'NEGATIVE':
code = number_to_check + ' < 0';
break;
case 'DIVISIBLE_BY':
var divisor = Blockly.JavaScript.valueToCode(block, 'DIVISOR',
case 'DIVISIBLE_BY': {
const divisor = Blockly.JavaScript.valueToCode(block, 'DIVISOR',
Blockly.JavaScript.ORDER_MODULUS) || '0';
code = number_to_check + ' % ' + divisor + ' === 0';
break;
}
}
return [code, Blockly.JavaScript.ORDER_EQUALITY];
};
Blockly.JavaScript['math_change'] = function(block) {
// Add to a variable in place.
var argument0 = Blockly.JavaScript.valueToCode(block, 'DELTA',
const argument0 = Blockly.JavaScript.valueToCode(block, 'DELTA',
Blockly.JavaScript.ORDER_ADDITION) || '0';
var varName = Blockly.JavaScript.nameDB_.getName(
const varName = Blockly.JavaScript.nameDB_.getName(
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
return varName + ' = (typeof ' + varName + ' === \'number\' ? ' + varName +
' : 0) + ' + argument0 + ';\n';
@@ -219,8 +220,9 @@ Blockly.JavaScript['math_trig'] = Blockly.JavaScript['math_single'];
Blockly.JavaScript['math_on_list'] = function(block) {
// Math functions for lists.
var func = block.getFieldValue('OP');
var list, code;
const func = block.getFieldValue('OP');
let list;
let code;
switch (func) {
case 'SUM':
list = Blockly.JavaScript.valueToCode(block, 'LIST',
@@ -237,9 +239,9 @@ Blockly.JavaScript['math_on_list'] = function(block) {
Blockly.JavaScript.ORDER_NONE) || '[]';
code = 'Math.max.apply(null, ' + list + ')';
break;
case 'AVERAGE':
case 'AVERAGE': {
// mathMean([null,null,1,3]) === 2.0.
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'mathMean',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(myList) {',
@@ -250,9 +252,10 @@ Blockly.JavaScript['math_on_list'] = function(block) {
Blockly.JavaScript.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
break;
case 'MEDIAN':
}
case 'MEDIAN': {
// mathMedian([null,null,1,3]) === 2.0.
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'mathMedian',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(myList) {',
@@ -271,11 +274,12 @@ Blockly.JavaScript['math_on_list'] = function(block) {
Blockly.JavaScript.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
break;
case 'MODE':
}
case 'MODE': {
// As a list of numbers can contain more than one mode,
// the returned result is provided as an array.
// Mode of [3, 'x', 'x', 1, 1, 2, '3'] -> ['x', 1].
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'mathModes',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(values) {',
@@ -310,8 +314,9 @@ Blockly.JavaScript['math_on_list'] = function(block) {
Blockly.JavaScript.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
break;
case 'STD_DEV':
var functionName = Blockly.JavaScript.provideFunction_(
}
case 'STD_DEV': {
const functionName = Blockly.JavaScript.provideFunction_(
'mathStandardDeviation',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(numbers) {',
@@ -329,8 +334,9 @@ Blockly.JavaScript['math_on_list'] = function(block) {
Blockly.JavaScript.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
break;
case 'RANDOM':
var functionName = Blockly.JavaScript.provideFunction_(
}
case 'RANDOM': {
const functionName = Blockly.JavaScript.provideFunction_(
'mathRandomList',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(list) {',
@@ -341,6 +347,7 @@ Blockly.JavaScript['math_on_list'] = function(block) {
Blockly.JavaScript.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
break;
}
default:
throw Error('Unknown operator: ' + func);
}
@@ -349,34 +356,34 @@ Blockly.JavaScript['math_on_list'] = function(block) {
Blockly.JavaScript['math_modulo'] = function(block) {
// Remainder computation.
var argument0 = Blockly.JavaScript.valueToCode(block, 'DIVIDEND',
const argument0 = Blockly.JavaScript.valueToCode(block, 'DIVIDEND',
Blockly.JavaScript.ORDER_MODULUS) || '0';
var argument1 = Blockly.JavaScript.valueToCode(block, 'DIVISOR',
const argument1 = Blockly.JavaScript.valueToCode(block, 'DIVISOR',
Blockly.JavaScript.ORDER_MODULUS) || '0';
var code = argument0 + ' % ' + argument1;
const code = argument0 + ' % ' + argument1;
return [code, Blockly.JavaScript.ORDER_MODULUS];
};
Blockly.JavaScript['math_constrain'] = function(block) {
// Constrain a number between two limits.
var argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
const argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_NONE) || '0';
var argument1 = Blockly.JavaScript.valueToCode(block, 'LOW',
const argument1 = Blockly.JavaScript.valueToCode(block, 'LOW',
Blockly.JavaScript.ORDER_NONE) || '0';
var argument2 = Blockly.JavaScript.valueToCode(block, 'HIGH',
const argument2 = Blockly.JavaScript.valueToCode(block, 'HIGH',
Blockly.JavaScript.ORDER_NONE) || 'Infinity';
var code = 'Math.min(Math.max(' + argument0 + ', ' + argument1 + '), ' +
const code = 'Math.min(Math.max(' + argument0 + ', ' + argument1 + '), ' +
argument2 + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['math_random_int'] = function(block) {
// Random integer between [X] and [Y].
var argument0 = Blockly.JavaScript.valueToCode(block, 'FROM',
const argument0 = Blockly.JavaScript.valueToCode(block, 'FROM',
Blockly.JavaScript.ORDER_NONE) || '0';
var argument1 = Blockly.JavaScript.valueToCode(block, 'TO',
const argument1 = Blockly.JavaScript.valueToCode(block, 'TO',
Blockly.JavaScript.ORDER_NONE) || '0';
var functionName = Blockly.JavaScript.provideFunction_(
const functionName = Blockly.JavaScript.provideFunction_(
'mathRandomInt',
['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(a, b) {',
@@ -388,7 +395,7 @@ Blockly.JavaScript['math_random_int'] = function(block) {
' }',
' return Math.floor(Math.random() * (b - a + 1) + a);',
'}']);
var code = functionName + '(' + argument0 + ', ' + argument1 + ')';
const code = functionName + '(' + argument0 + ', ' + argument1 + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
@@ -399,9 +406,9 @@ Blockly.JavaScript['math_random_float'] = function(block) {
Blockly.JavaScript['math_atan2'] = function(block) {
// Arctangent of point (X, Y) in degrees from -180 to 180.
var argument0 = Blockly.JavaScript.valueToCode(block, 'X',
const argument0 = Blockly.JavaScript.valueToCode(block, 'X',
Blockly.JavaScript.ORDER_NONE) || '0';
var argument1 = Blockly.JavaScript.valueToCode(block, 'Y',
const argument1 = Blockly.JavaScript.valueToCode(block, 'Y',
Blockly.JavaScript.ORDER_NONE) || '0';
return ['Math.atan2(' + argument1 + ', ' + argument0 + ') / Math.PI * 180',
Blockly.JavaScript.ORDER_DIVISION];