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

Fix order errors in text generators (#4329)

Browse Source 
* Fix dart text generator logic

* Fix Javascript text generator logic.

* Fix Lua text generator logic

* Fix php text generator logic

* Fix python text generator logic

* Fix error in substring logic

* Fix unit test block generators

* Update from ORDER_COMMA to ORDER_NONE

* Update golden files
This commit is contained in:
Monica Kozbial
2020-09-30 14:08:45 -07:00
committed by GitHub
parent 64fe425944
commit 81d355f5fa
17 changed files with 139 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
generators/php/text.js
View File

@@ -24,7 +24,9 @@ Blockly.PHP['text'] = function(block) {
Blockly.PHP['text_multiline'] = function(block) {
// Text value.
var code = Blockly.PHP.multiline_quote_(block.getFieldValue('TEXT'));
return [code, Blockly.PHP.ORDER_ATOMIC];
var order = code.indexOf('.') != -1 ? Blockly.PHP.ORDER_STRING_CONCAT :
Blockly.PHP.ORDER_ATOMIC;
return [code, order];
};
Blockly.PHP['text_join'] = function(block) {
@@ -35,19 +37,19 @@ Blockly.PHP['text_join'] = function(block) {
var element = Blockly.PHP.valueToCode(block, 'ADD0',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = element;
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
return [code, Blockly.PHP.ORDER_NONE];
} else if (block.itemCount_ == 2) {
var element0 = Blockly.PHP.valueToCode(block, 'ADD0',
Blockly.PHP.ORDER_ATOMIC) || '\'\'';
Blockly.PHP.ORDER_STRING_CONCAT) || '\'\'';
var element1 = Blockly.PHP.valueToCode(block, 'ADD1',
Blockly.PHP.ORDER_ATOMIC) || '\'\'';
Blockly.PHP.ORDER_STRING_CONCAT) || '\'\'';
var 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++) {
elements[i] = Blockly.PHP.valueToCode(block, 'ADD' + i,
Blockly.PHP.ORDER_COMMA) || '\'\'';
Blockly.PHP.ORDER_NONE) || '\'\'';
}
var code = 'implode(\'\', array(' + elements.join(',') + '))';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
@@ -118,7 +120,7 @@ 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 :
Blockly.PHP.ORDER_COMMA;
Blockly.PHP.ORDER_NONE;
var text = Blockly.PHP.valueToCode(block, 'VALUE', textOrder) || '\'\'';
switch (where) {
case 'FIRST':
@@ -149,13 +151,16 @@ Blockly.PHP['text_charAt'] = function(block) {
Blockly.PHP['text_getSubstring'] = function(block) {
// Get substring.
var text = Blockly.PHP.valueToCode(block, 'STRING',
Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
if (where1 == 'FIRST' && where2 == 'LAST') {
var text = Blockly.PHP.valueToCode(block, 'STRING',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = text;
return [code, Blockly.PHP.ORDER_NONE];
} else {
var text = Blockly.PHP.valueToCode(block, 'STRING',
Blockly.PHP.ORDER_NONE) || '\'\'';
var at1 = Blockly.PHP.getAdjusted(block, 'AT1');
var at2 = Blockly.PHP.getAdjusted(block, 'AT2');
var functionName = Blockly.PHP.provideFunction_(
@@ -183,8 +188,8 @@ Blockly.PHP['text_getSubstring'] = function(block) {
'}']);
var code = functionName + '(' + text + ', \'' +
where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
}
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_changeCase'] = function(block) {
@@ -243,7 +248,7 @@ Blockly.PHP['text_prompt'] = Blockly.PHP['text_prompt_ext'];
Blockly.PHP['text_count'] = function(block) {
var text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_MEMBER) || '\'\'';
Blockly.PHP.ORDER_NONE) || '\'\'';
var sub = Blockly.PHP.valueToCode(block, 'SUB',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = 'strlen(' + sub + ') === 0'
@@ -254,7 +259,7 @@ Blockly.PHP['text_count'] = function(block) {
Blockly.PHP['text_replace'] = function(block) {
var text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_MEMBER) || '\'\'';
Blockly.PHP.ORDER_NONE) || '\'\'';
var from = Blockly.PHP.valueToCode(block, 'FROM',
Blockly.PHP.ORDER_NONE) || '\'\'';
var to = Blockly.PHP.valueToCode(block, 'TO',
@@ -265,7 +270,7 @@ Blockly.PHP['text_replace'] = function(block) {
Blockly.PHP['text_reverse'] = function(block) {
var text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_MEMBER) || '\'\'';
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = 'strrev(' + text + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};