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

148
generators/php/text.js
View File

@@ -16,14 +16,14 @@ goog.require('Blockly.PHP');
Blockly.PHP['text'] = function(block) {
// Text value.
var code = Blockly.PHP.quote_(block.getFieldValue('TEXT'));
const code = Blockly.PHP.quote_(block.getFieldValue('TEXT'));
return [code, Blockly.PHP.ORDER_ATOMIC];
};
Blockly.PHP['text_multiline'] = function(block) {
// Text value.
var code = Blockly.PHP.multiline_quote_(block.getFieldValue('TEXT'));
var order = code.indexOf('.') !== -1 ? Blockly.PHP.ORDER_STRING_CONCAT :
const code = Blockly.PHP.multiline_quote_(block.getFieldValue('TEXT'));
const order = code.indexOf('.') !== -1 ? Blockly.PHP.ORDER_STRING_CONCAT :
Blockly.PHP.ORDER_ATOMIC;
return [code, order];
};
@@ -33,40 +33,40 @@ Blockly.PHP['text_join'] = function(block) {
if (block.itemCount_ === 0) {
return ['\'\'', Blockly.PHP.ORDER_ATOMIC];
} else if (block.itemCount_ === 1) {
var element = Blockly.PHP.valueToCode(block, 'ADD0',
const element = Blockly.PHP.valueToCode(block, 'ADD0',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = element;
const code = element;
return [code, Blockly.PHP.ORDER_NONE];
} else if (block.itemCount_ === 2) {
var element0 = Blockly.PHP.valueToCode(block, 'ADD0',
const element0 = Blockly.PHP.valueToCode(block, 'ADD0',
Blockly.PHP.ORDER_STRING_CONCAT) || '\'\'';
var element1 = Blockly.PHP.valueToCode(block, 'ADD1',
const element1 = Blockly.PHP.valueToCode(block, 'ADD1',
Blockly.PHP.ORDER_STRING_CONCAT) || '\'\'';
var code = element0 + ' . ' + element1;
const code = element0 + ' . ' + element1;
return [code, Blockly.PHP.ORDER_STRING_CONCAT];
} else {
var elements = new Array(block.itemCount_);
for (var i = 0; i < block.itemCount_; i++) {
const elements = new Array(block.itemCount_);
for (let i = 0; i < block.itemCount_; i++) {
elements[i] = Blockly.PHP.valueToCode(block, 'ADD' + i,
Blockly.PHP.ORDER_NONE) || '\'\'';
}
var code = 'implode(\'\', array(' + elements.join(',') + '))';
const code = 'implode(\'\', array(' + elements.join(',') + '))';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
}
};
Blockly.PHP['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.PHP.nameDB_.getName(
const varName = Blockly.PHP.nameDB_.getName(
block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
var value = Blockly.PHP.valueToCode(block, 'TEXT',
const value = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_ASSIGNMENT) || '\'\'';
return varName + ' .= ' + value + ';\n';
};
Blockly.PHP['text_length'] = function(block) {
// String or array length.
var functionName = Blockly.PHP.provideFunction_(
const functionName = Blockly.PHP.provideFunction_(
'length',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($value) {',
' if (is_string($value)) {',
@@ -75,34 +75,33 @@ Blockly.PHP['text_length'] = function(block) {
' return count($value);',
' }',
'}']);
var text = Blockly.PHP.valueToCode(block, 'VALUE',
const text = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || '\'\'';
return [functionName + '(' + text + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_isEmpty'] = function(block) {
// Is the string null or array empty?
var text = Blockly.PHP.valueToCode(block, 'VALUE',
const text = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || '\'\'';
return ['empty(' + text + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_indexOf'] = function(block) {
// Search the text for a substring.
var operator = block.getFieldValue('END') === 'FIRST' ?
const operator = block.getFieldValue('END') === 'FIRST' ?
'strpos' : 'strrpos';
var substring = Blockly.PHP.valueToCode(block, 'FIND',
const substring = Blockly.PHP.valueToCode(block, 'FIND',
Blockly.PHP.ORDER_NONE) || '\'\'';
var text = Blockly.PHP.valueToCode(block, 'VALUE',
const text = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || '\'\'';
let errorIndex = ' -1';
let indexAdjustment = '';
if (block.workspace.options.oneBasedIndex) {
var errorIndex = ' 0';
var indexAdjustment = ' + 1';
} else {
var errorIndex = ' -1';
var indexAdjustment = '';
errorIndex = ' 0';
indexAdjustment = ' + 1';
}
var functionName = Blockly.PHP.provideFunction_(
const functionName = Blockly.PHP.provideFunction_(
block.getFieldValue('END') === 'FIRST' ?
'text_indexOf' : 'text_lastIndexOf',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
@@ -111,56 +110,61 @@ Blockly.PHP['text_indexOf'] = function(block) {
' return $pos === false ? ' + errorIndex + ' : $pos' +
indexAdjustment + ';',
'}']);
var code = functionName + '(' + text + ', ' + substring + ')';
const code = functionName + '(' + text + ', ' + substring + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_charAt'] = function(block) {
// Get letter at index.
var where = block.getFieldValue('WHERE') || 'FROM_START';
var textOrder = (where === 'RANDOM') ? Blockly.PHP.ORDER_NONE :
const where = block.getFieldValue('WHERE') || 'FROM_START';
const textOrder = (where === 'RANDOM') ? Blockly.PHP.ORDER_NONE :
Blockly.PHP.ORDER_NONE;
var text = Blockly.PHP.valueToCode(block, 'VALUE', textOrder) || '\'\'';
const text = Blockly.PHP.valueToCode(block, 'VALUE', textOrder) || '\'\'';
switch (where) {
case 'FIRST':
var code = 'substr(' + text + ', 0, 1)';
case 'FIRST': {
const code = 'substr(' + text + ', 0, 1)';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
case 'LAST':
var code = 'substr(' + text + ', -1)';
}
case 'LAST': {
const code = 'substr(' + text + ', -1)';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
case 'FROM_START':
var at = Blockly.PHP.getAdjusted(block, 'AT');
var code = 'substr(' + text + ', ' + at + ', 1)';
}
case 'FROM_START': {
const at = Blockly.PHP.getAdjusted(block, 'AT');
const code = 'substr(' + text + ', ' + at + ', 1)';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
case 'FROM_END':
var at = Blockly.PHP.getAdjusted(block, 'AT', 1, true);
var code = 'substr(' + text + ', ' + at + ', 1)';
}
case 'FROM_END': {
const at = Blockly.PHP.getAdjusted(block, 'AT', 1, true);
const code = 'substr(' + text + ', ' + at + ', 1)';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
case 'RANDOM':
var functionName = Blockly.PHP.provideFunction_(
}
case 'RANDOM': {
const functionName = Blockly.PHP.provideFunction_(
'text_random_letter',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($text) {',
' return $text[rand(0, strlen($text) - 1)];',
'}']);
code = functionName + '(' + text + ')';
const code = functionName + '(' + text + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
}
}
throw Error('Unhandled option (text_charAt).');
};
Blockly.PHP['text_getSubstring'] = function(block) {
// Get substring.
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
var text = Blockly.PHP.valueToCode(block, 'STRING',
const where1 = block.getFieldValue('WHERE1');
const where2 = block.getFieldValue('WHERE2');
const text = Blockly.PHP.valueToCode(block, 'STRING',
Blockly.PHP.ORDER_NONE) || '\'\'';
if (where1 === 'FIRST' && where2 === 'LAST') {
var code = text;
const code = text;
return [code, Blockly.PHP.ORDER_NONE];
} else {
var at1 = Blockly.PHP.getAdjusted(block, 'AT1');
var at2 = Blockly.PHP.getAdjusted(block, 'AT2');
var functionName = Blockly.PHP.provideFunction_(
const at1 = Blockly.PHP.getAdjusted(block, 'AT1');
const at2 = Blockly.PHP.getAdjusted(block, 'AT2');
const functionName = Blockly.PHP.provideFunction_(
'text_get_substring',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($text, $where1, $at1, $where2, $at2) {',
@@ -183,7 +187,7 @@ Blockly.PHP['text_getSubstring'] = function(block) {
' }',
' return substr($text, $at1, $length);',
'}']);
var code = functionName + '(' + text + ', \'' +
const code = functionName + '(' + text + ', \'' +
where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
}
@@ -191,50 +195,52 @@ Blockly.PHP['text_getSubstring'] = function(block) {
Blockly.PHP['text_changeCase'] = function(block) {
// Change capitalization.
var text = Blockly.PHP.valueToCode(block, 'TEXT',
const text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
let code;
if (block.getFieldValue('CASE') === 'UPPERCASE') {
var code = 'strtoupper(' + text + ')';
code = 'strtoupper(' + text + ')';
} else if (block.getFieldValue('CASE') === 'LOWERCASE') {
var code = 'strtolower(' + text + ')';
code = 'strtolower(' + text + ')';
} else if (block.getFieldValue('CASE') === 'TITLECASE') {
var code = 'ucwords(strtolower(' + text + '))';
code = 'ucwords(strtolower(' + text + '))';
}
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_trim'] = function(block) {
// Trim spaces.
var OPERATORS = {
const OPERATORS = {
'LEFT': 'ltrim',
'RIGHT': 'rtrim',
'BOTH': 'trim'
};
var operator = OPERATORS[block.getFieldValue('MODE')];
var text = Blockly.PHP.valueToCode(block, 'TEXT',
const operator = OPERATORS[block.getFieldValue('MODE')];
const text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
return [operator + '(' + text + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_print'] = function(block) {
// Print statement.
var msg = Blockly.PHP.valueToCode(block, 'TEXT',
const msg = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
return 'print(' + msg + ');\n';
};
Blockly.PHP['text_prompt_ext'] = function(block) {
// Prompt function.
let msg;
if (block.getField('TEXT')) {
// Internal message.
var msg = Blockly.PHP.quote_(block.getFieldValue('TEXT'));
msg = Blockly.PHP.quote_(block.getFieldValue('TEXT'));
} else {
// External message.
var msg = Blockly.PHP.valueToCode(block, 'TEXT',
msg = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
}
var code = 'readline(' + msg + ')';
var toNumber = block.getFieldValue('TYPE') === 'NUMBER';
let code = 'readline(' + msg + ')';
const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
if (toNumber) {
code = 'floatval(' + code + ')';
}
@@ -244,30 +250,30 @@ Blockly.PHP['text_prompt_ext'] = function(block) {
Blockly.PHP['text_prompt'] = Blockly.PHP['text_prompt_ext'];
Blockly.PHP['text_count'] = function(block) {
var text = Blockly.PHP.valueToCode(block, 'TEXT',
const text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
var sub = Blockly.PHP.valueToCode(block, 'SUB',
const sub = Blockly.PHP.valueToCode(block, 'SUB',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = 'strlen(' + sub + ') === 0'
const code = 'strlen(' + sub + ') === 0'
+ ' ? strlen(' + text + ') + 1'
+ ' : substr_count(' + text + ', ' + sub + ')';
return [code, Blockly.PHP.ORDER_CONDITIONAL];
};
Blockly.PHP['text_replace'] = function(block) {
var text = Blockly.PHP.valueToCode(block, 'TEXT',
const text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
var from = Blockly.PHP.valueToCode(block, 'FROM',
const from = Blockly.PHP.valueToCode(block, 'FROM',
Blockly.PHP.ORDER_NONE) || '\'\'';
var to = Blockly.PHP.valueToCode(block, 'TO',
const to = Blockly.PHP.valueToCode(block, 'TO',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = 'str_replace(' + from + ', ' + to + ', ' + text + ')';
const code = 'str_replace(' + from + ', ' + to + ', ' + text + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_reverse'] = function(block) {
var text = Blockly.PHP.valueToCode(block, 'TEXT',
const text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = 'strrev(' + text + ')';
const code = 'strrev(' + text + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};