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

chore: fix missing requires in generators (#5744)

Browse Source 
* chore: fix some missing requires in generators

* chore: fix missing requires in dart block generators

* chore: replace Blockly.isNumber with Blockly.utils.string.isNumber in generators

* chore: fix more missing requires in block generators
This commit is contained in:
Rachel Fenichel
2021-11-30 08:51:21 -08:00
committed by GitHub
parent 1a992386ae
commit 4db047ff32
18 changed files with 238 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
generators/php/lists.js
View File

@@ -24,6 +24,7 @@
goog.provide('Blockly.PHP.lists');
goog.require('Blockly.PHP');
goog.require('Blockly.utils.string');
Blockly.PHP['lists_create_empty'] = function(block) {
@@ -387,7 +388,7 @@ Blockly.PHP['lists_getSublist'] = function(block) {
at2 = Blockly.PHP.getAdjusted(block, 'AT2', 0, false,
Blockly.PHP.ORDER_SUBTRACTION);
length = at2 + ' - ';
if (Blockly.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
if (Blockly.utils.string.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
length += at1;
} else {
length += '(' + at1 + ')';
@@ -398,7 +399,7 @@ Blockly.PHP['lists_getSublist'] = function(block) {
at2 = Blockly.PHP.getAdjusted(block, 'AT2', 0, false,
Blockly.PHP.ORDER_SUBTRACTION);
length = 'count(' + list + ') - ' + at2 + ' - ';
if (Blockly.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
if (Blockly.utils.string.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
length += at1;
} else {
length += '(' + at1 + ')';
@@ -406,7 +407,7 @@ Blockly.PHP['lists_getSublist'] = function(block) {
break;
case 'LAST':
length = 'count(' + list + ') - ';
if (Blockly.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
if (Blockly.utils.string.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
length += at1;
} else {
length += '(' + at1 + ')';

13
generators/php/loops.js
View File

@@ -13,6 +13,7 @@
goog.provide('Blockly.PHP.loops');
goog.require('Blockly.PHP');
goog.require('Blockly.utils.string');
Blockly.PHP['controls_repeat_ext'] = function(block) {
@@ -32,7 +33,7 @@ Blockly.PHP['controls_repeat_ext'] = function(block) {
const loopVar = Blockly.PHP.nameDB_.getDistinctName(
'count', Blockly.VARIABLE_CATEGORY_NAME);
let endVar = repeats;
if (!repeats.match(/^\w+$/) && !Blockly.isNumber(repeats)) {
if (!repeats.match(/^\w+$/) && !Blockly.utils.string.isNumber(repeats)) {
endVar = Blockly.PHP.nameDB_.getDistinctName(
'repeat_end', Blockly.VARIABLE_CATEGORY_NAME);
code += endVar + ' = ' + repeats + ';\n';
@@ -73,8 +74,8 @@ Blockly.PHP['controls_for'] = function(block) {
let branch = Blockly.PHP.statementToCode(block, 'DO');
branch = Blockly.PHP.addLoopTrap(branch, block);
let code;
if (Blockly.isNumber(argument0) && Blockly.isNumber(argument1) &&
Blockly.isNumber(increment)) {
if (Blockly.utils.string.isNumber(argument0) && Blockly.utils.string.isNumber(argument1) &&
Blockly.utils.string.isNumber(increment)) {
// All arguments are simple numbers.
const up = Number(argument0) <= Number(argument1);
code = 'for (' + variable0 + ' = ' + argument0 + '; ' +
@@ -91,13 +92,13 @@ Blockly.PHP['controls_for'] = function(block) {
code = '';
// Cache non-trivial values to variables to prevent repeated look-ups.
let startVar = argument0;
if (!argument0.match(/^\w+$/) && !Blockly.isNumber(argument0)) {
if (!argument0.match(/^\w+$/) && !Blockly.utils.string.isNumber(argument0)) {
startVar = Blockly.PHP.nameDB_.getDistinctName(
variable0 + '_start', Blockly.VARIABLE_CATEGORY_NAME);
code += startVar + ' = ' + argument0 + ';\n';
}
let endVar = argument1;
if (!argument1.match(/^\w+$/) && !Blockly.isNumber(argument1)) {
if (!argument1.match(/^\w+$/) && !Blockly.utils.string.isNumber(argument1)) {
endVar = Blockly.PHP.nameDB_.getDistinctName(
variable0 + '_end', Blockly.VARIABLE_CATEGORY_NAME);
code += endVar + ' = ' + argument1 + ';\n';
@@ -107,7 +108,7 @@ Blockly.PHP['controls_for'] = function(block) {
const incVar = Blockly.PHP.nameDB_.getDistinctName(
variable0 + '_inc', Blockly.VARIABLE_CATEGORY_NAME);
code += incVar + ' = ';
if (Blockly.isNumber(increment)) {
if (Blockly.utils.string.isNumber(increment)) {
code += Math.abs(increment) + ';\n';
} else {
code += 'abs(' + increment + ');\n';

2
generators/php/procedures.js
View File

@@ -13,6 +13,8 @@
goog.provide('Blockly.PHP.procedures');
goog.require('Blockly.PHP');
goog.require('Blockly.Names');
goog.require('Blockly.Variables');
Blockly.PHP['procedures_defreturn'] = function(block) {