schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename variableDB to nameDB

Browse Source 
rename variableDB_ to nameDB_ as it is deprecated
This commit is contained in:
Mario Pesch
2021-09-17 12:26:18 +02:00
parent abfa5d0bed
commit a8cf038821
5 changed files with 178 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Blockly/generator/text.js
+60 -47
View File
@@ -1,5 +1,4 @@
import * as Blockly from 'blockly/core';
import * as Blockly from "blockly/core";
/**
* Code generator for a literal String (X).
@@ -7,12 +6,11 @@ import * as Blockly from 'blockly/core';
* @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code with order of operation.
*/
Blockly.Arduino['text'] = function (block) {
var code = Blockly.Arduino.quote_(block.getFieldValue('TEXT'));
return [code, Blockly.Arduino.ORDER_ATOMIC];
Blockly.Arduino["text"] = function (block) {
var code = Blockly.Arduino.quote_(block.getFieldValue("TEXT"));
return [code, Blockly.Arduino.ORDER_ATOMIC];
};
/**
* Code generator for a String concatenation (X...Y). This string can be made
* up of any number of elements of any type.
@@ -22,30 +20,37 @@ Blockly.Arduino['text'] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code with order of operation.
*/
Blockly.Arduino['text_join'] = function (block) {
var code;
if (block.itemCount_ === 0) {
return ['""', Blockly.Arduino.ORDER_ATOMIC];
} else if (block.itemCount_ === 1) {
var argument0 = Blockly.Arduino.valueToCode(block, 'ADD0',
Blockly.Arduino.ORDER_UNARY_POSTFIX) || '""';
code = 'String(' + argument0 + ')';
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
} else {
var argument;
code = [];
for (var n = 0; n < block.itemCount_; n++) {
argument = Blockly.Arduino.valueToCode(
block, 'ADD' + n, Blockly.Arduino.ORDER_NONE);
if (argument === '') {
code[n] = '""';
} else {
code[n] = 'String(' + argument + ')';
}
}
code = code.join(' + ');
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
Blockly.Arduino["text_join"] = function (block) {
var code;
if (block.itemCount_ === 0) {
return ['""', Blockly.Arduino.ORDER_ATOMIC];
} else if (block.itemCount_ === 1) {
var argument0 =
Blockly.Arduino.valueToCode(
block,
"ADD0",
Blockly.Arduino.ORDER_UNARY_POSTFIX
) || '""';
code = "String(" + argument0 + ")";
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
} else {
var argument;
code = [];
for (var n = 0; n < block.itemCount_; n++) {
argument = Blockly.Arduino.valueToCode(
block,
"ADD" + n,
Blockly.Arduino.ORDER_NONE
);
if (argument === "") {
code[n] = '""';
} else {
code[n] = "String(" + argument + ")";
}
}
code = code.join(" + ");
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
}
};
/**
@@ -55,18 +60,23 @@ Blockly.Arduino['text_join'] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from.
* @return {string} Completed code.
*/
Blockly.Arduino['text_append'] = function (block) {
// Append to a variable in place.
var varName = Blockly.Arduino.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
var argument0 = Blockly.Arduino.valueToCode(block, 'TEXT',
Blockly.Arduino.ORDER_UNARY_POSTFIX);
if (argument0 === '') {
argument0 = '""';
} else {
argument0 = 'String(' + argument0 + ')';
}
return varName + ' += ' + argument0 + ';\n';
Blockly.Arduino["text_append"] = function (block) {
// Append to a variable in place.
var varName = Blockly.Arduino.nameDB_.getName(
block.getFieldValue("VAR"),
Blockly.Variables.NAME_TYPE
);
var argument0 = Blockly.Arduino.valueToCode(
block,
"TEXT",
Blockly.Arduino.ORDER_UNARY_POSTFIX
);
if (argument0 === "") {
argument0 = '""';
} else {
argument0 = "String(" + argument0 + ")";
}
return varName + " += " + argument0 + ";\n";
};
/**
@@ -76,10 +86,13 @@ Blockly.Arduino['text_append'] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code with order of operation.
*/
Blockly.Arduino['text_length'] = function (block) {
var argument0 = Blockly.Arduino.valueToCode(block, 'VALUE',
Blockly.Arduino.ORDER_UNARY_POSTFIX) || '""';
var code = 'String(' + argument0 + ').length()';
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
Blockly.Arduino["text_length"] = function (block) {
var argument0 =
Blockly.Arduino.valueToCode(
block,
"VALUE",
Blockly.Arduino.ORDER_UNARY_POSTFIX
) || '""';
var code = "String(" + argument0 + ").length()";
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
};