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

chore: update php block generators to const and let (#5663)

Browse Source
This commit is contained in:
Rachel Fenichel
2021-11-03 10:34:27 -07:00
committed by GitHub
parent de95ffd133
commit 1b29a00267
9 changed files with 347 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
generators/php/logic.js
View File

@@ -16,8 +16,8 @@ goog.require('Blockly.PHP');
Blockly.PHP['controls_if'] = function(block) {
// If/elseif/else condition.
var n = 0;
var code = '', branchCode, conditionCode;
let n = 0;
let code = '', branchCode, conditionCode;
if (Blockly.PHP.STATEMENT_PREFIX) {
// Automatic prefix insertion is switched off for this block. Add manually.
code += Blockly.PHP.injectId(Blockly.PHP.STATEMENT_PREFIX, block);
@@ -52,7 +52,7 @@ Blockly.PHP['controls_ifelse'] = Blockly.PHP['controls_if'];
Blockly.PHP['logic_compare'] = function(block) {
// Comparison operator.
var OPERATORS = {
const OPERATORS = {
'EQ': '==',
'NEQ': '!=',
'LT': '<',
@@ -60,29 +60,29 @@ Blockly.PHP['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.PHP.ORDER_EQUALITY : Blockly.PHP.ORDER_RELATIONAL;
var argument0 = Blockly.PHP.valueToCode(block, 'A', order) || '0';
var argument1 = Blockly.PHP.valueToCode(block, 'B', order) || '0';
var code = argument0 + ' ' + operator + ' ' + argument1;
const argument0 = Blockly.PHP.valueToCode(block, 'A', order) || '0';
const argument1 = Blockly.PHP.valueToCode(block, 'B', order) || '0';
const code = argument0 + ' ' + operator + ' ' + argument1;
return [code, order];
};
Blockly.PHP['logic_operation'] = function(block) {
// Operations 'and', 'or'.
var operator = (block.getFieldValue('OP') === 'AND') ? '&&' : '||';
var order = (operator === '&&') ? Blockly.PHP.ORDER_LOGICAL_AND :
const operator = (block.getFieldValue('OP') === 'AND') ? '&&' : '||';
const order = (operator === '&&') ? Blockly.PHP.ORDER_LOGICAL_AND :
Blockly.PHP.ORDER_LOGICAL_OR;
var argument0 = Blockly.PHP.valueToCode(block, 'A', order);
var argument1 = Blockly.PHP.valueToCode(block, 'B', order);
let argument0 = Blockly.PHP.valueToCode(block, 'A', order);
let argument1 = Blockly.PHP.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;
}
@@ -90,22 +90,22 @@ Blockly.PHP['logic_operation'] = function(block) {
argument1 = defaultArgument;
}
}
var code = argument0 + ' ' + operator + ' ' + argument1;
const code = argument0 + ' ' + operator + ' ' + argument1;
return [code, order];
};
Blockly.PHP['logic_negate'] = function(block) {
// Negation.
var order = Blockly.PHP.ORDER_LOGICAL_NOT;
var argument0 = Blockly.PHP.valueToCode(block, 'BOOL', order) ||
const order = Blockly.PHP.ORDER_LOGICAL_NOT;
const argument0 = Blockly.PHP.valueToCode(block, 'BOOL', order) ||
'true';
var code = '!' + argument0;
const code = '!' + argument0;
return [code, order];
};
Blockly.PHP['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.PHP.ORDER_ATOMIC];
};
@@ -116,12 +116,12 @@ Blockly.PHP['logic_null'] = function(block) {
Blockly.PHP['logic_ternary'] = function(block) {
// Ternary operator.
var value_if = Blockly.PHP.valueToCode(block, 'IF',
const value_if = Blockly.PHP.valueToCode(block, 'IF',
Blockly.PHP.ORDER_CONDITIONAL) || 'false';
var value_then = Blockly.PHP.valueToCode(block, 'THEN',
const value_then = Blockly.PHP.valueToCode(block, 'THEN',
Blockly.PHP.ORDER_CONDITIONAL) || 'null';
var value_else = Blockly.PHP.valueToCode(block, 'ELSE',
const value_else = Blockly.PHP.valueToCode(block, 'ELSE',
Blockly.PHP.ORDER_CONDITIONAL) || 'null';
var code = value_if + ' ? ' + value_then + ' : ' + value_else;
const code = value_if + ' ? ' + value_then + ' : ' + value_else;
return [code, Blockly.PHP.ORDER_CONDITIONAL];
};