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

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

50
generators/javascript/logic.js
View File

@@ -16,17 +16,17 @@ goog.require('Blockly.JavaScript');
Blockly.JavaScript['controls_if'] = function(block) {
// If/elseif/else condition.
var n = 0;
var code = '', branchCode, conditionCode;
let n = 0;
let code = '';
if (Blockly.JavaScript.STATEMENT_PREFIX) {
// Automatic prefix insertion is switched off for this block. Add manually.
code += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_PREFIX,
block);
}
do {
conditionCode = Blockly.JavaScript.valueToCode(block, 'IF' + n,
const conditionCode = Blockly.JavaScript.valueToCode(block, 'IF' + n,
Blockly.JavaScript.ORDER_NONE) || 'false';
branchCode = Blockly.JavaScript.statementToCode(block, 'DO' + n);
let branchCode = Blockly.JavaScript.statementToCode(block, 'DO' + n);
if (Blockly.JavaScript.STATEMENT_SUFFIX) {
branchCode = Blockly.JavaScript.prefixLines(
Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_SUFFIX,
@@ -38,7 +38,7 @@ Blockly.JavaScript['controls_if'] = function(block) {
} while (block.getInput('IF' + n));
if (block.getInput('ELSE') || Blockly.JavaScript.STATEMENT_SUFFIX) {
branchCode = Blockly.JavaScript.statementToCode(block, 'ELSE');
let branchCode = Blockly.JavaScript.statementToCode(block, 'ELSE');
if (Blockly.JavaScript.STATEMENT_SUFFIX) {
branchCode = Blockly.JavaScript.prefixLines(
Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_SUFFIX,
@@ -53,7 +53,7 @@ Blockly.JavaScript['controls_ifelse'] = Blockly.JavaScript['controls_if'];
Blockly.JavaScript['logic_compare'] = function(block) {
// Comparison operator.
var OPERATORS = {
const OPERATORS = {
'EQ': '==',
'NEQ': '!=',
'LT': '<',
@@ -61,29 +61,29 @@ Blockly.JavaScript['logic_compare'] = function(block) {
'GT': '>',
'GTE': '>='
};
var operator = OPERATORS[block.getFieldValue('OP')];
var order = (operator === '==' || operator === '!=') ?
const operator = OPERATORS[block.getFieldValue('OP')];
const order = (operator === '==' || operator === '!=') ?
Blockly.JavaScript.ORDER_EQUALITY : Blockly.JavaScript.ORDER_RELATIONAL;
var argument0 = Blockly.JavaScript.valueToCode(block, 'A', order) || '0';
var argument1 = Blockly.JavaScript.valueToCode(block, 'B', order) || '0';
var code = argument0 + ' ' + operator + ' ' + argument1;
const argument0 = Blockly.JavaScript.valueToCode(block, 'A', order) || '0';
const argument1 = Blockly.JavaScript.valueToCode(block, 'B', order) || '0';
const code = argument0 + ' ' + operator + ' ' + argument1;
return [code, order];
};
Blockly.JavaScript['logic_operation'] = function(block) {
// Operations 'and', 'or'.
var operator = (block.getFieldValue('OP') === 'AND') ? '&&' : '||';
var order = (operator === '&&') ? Blockly.JavaScript.ORDER_LOGICAL_AND :
const operator = (block.getFieldValue('OP') === 'AND') ? '&&' : '||';
const order = (operator === '&&') ? Blockly.JavaScript.ORDER_LOGICAL_AND :
Blockly.JavaScript.ORDER_LOGICAL_OR;
var argument0 = Blockly.JavaScript.valueToCode(block, 'A', order);
var argument1 = Blockly.JavaScript.valueToCode(block, 'B', order);
let argument0 = Blockly.JavaScript.valueToCode(block, 'A', order);
let argument1 = Blockly.JavaScript.valueToCode(block, 'B', order);
if (!argument0 && !argument1) {
// If there are no arguments, then the return value is false.
argument0 = 'false';
argument1 = 'false';
} else {
// Single missing arguments have no effect on the return value.
var defaultArgument = (operator === '&&') ? 'true' : 'false';
const defaultArgument = (operator === '&&') ? 'true' : 'false';
if (!argument0) {
argument0 = defaultArgument;
}
@@ -91,22 +91,22 @@ Blockly.JavaScript['logic_operation'] = function(block) {
argument1 = defaultArgument;
}
}
var code = argument0 + ' ' + operator + ' ' + argument1;
const code = argument0 + ' ' + operator + ' ' + argument1;
return [code, order];
};
Blockly.JavaScript['logic_negate'] = function(block) {
// Negation.
var order = Blockly.JavaScript.ORDER_LOGICAL_NOT;
var argument0 = Blockly.JavaScript.valueToCode(block, 'BOOL', order) ||
const order = Blockly.JavaScript.ORDER_LOGICAL_NOT;
const argument0 = Blockly.JavaScript.valueToCode(block, 'BOOL', order) ||
'true';
var code = '!' + argument0;
const code = '!' + argument0;
return [code, order];
};
Blockly.JavaScript['logic_boolean'] = function(block) {
// Boolean values true and false.
var code = (block.getFieldValue('BOOL') === 'TRUE') ? 'true' : 'false';
const code = (block.getFieldValue('BOOL') === 'TRUE') ? 'true' : 'false';
return [code, Blockly.JavaScript.ORDER_ATOMIC];
};
@@ -117,12 +117,12 @@ Blockly.JavaScript['logic_null'] = function(block) {
Blockly.JavaScript['logic_ternary'] = function(block) {
// Ternary operator.
var value_if = Blockly.JavaScript.valueToCode(block, 'IF',
const value_if = Blockly.JavaScript.valueToCode(block, 'IF',
Blockly.JavaScript.ORDER_CONDITIONAL) || 'false';
var value_then = Blockly.JavaScript.valueToCode(block, 'THEN',
const value_then = Blockly.JavaScript.valueToCode(block, 'THEN',
Blockly.JavaScript.ORDER_CONDITIONAL) || 'null';
var value_else = Blockly.JavaScript.valueToCode(block, 'ELSE',
const value_else = Blockly.JavaScript.valueToCode(block, 'ELSE',
Blockly.JavaScript.ORDER_CONDITIONAL) || 'null';
var code = value_if + ' ? ' + value_then + ' : ' + value_else;
const code = value_if + ' ? ' + value_then + ' : ' + value_else;
return [code, Blockly.JavaScript.ORDER_CONDITIONAL];
};