mirror of
https://github.com/google/blockly.git
synced 2025-12-16 06:10:12 +01:00
fix: lua generators using None instead of nil (#7837)
This commit is contained in:
@@ -33,7 +33,7 @@ export function lists_create_with(
|
|||||||
const elements = new Array(createWithBlock.itemCount_);
|
const elements = new Array(createWithBlock.itemCount_);
|
||||||
for (let i = 0; i < createWithBlock.itemCount_; i++) {
|
for (let i = 0; i < createWithBlock.itemCount_; i++) {
|
||||||
elements[i] =
|
elements[i] =
|
||||||
generator.valueToCode(createWithBlock, 'ADD' + i, Order.NONE) || 'None';
|
generator.valueToCode(createWithBlock, 'ADD' + i, Order.NONE) || 'nil';
|
||||||
}
|
}
|
||||||
const code = '{' + elements.join(', ') + '}';
|
const code = '{' + elements.join(', ') + '}';
|
||||||
return [code, Order.HIGH];
|
return [code, Order.HIGH];
|
||||||
@@ -56,7 +56,7 @@ function ${generator.FUNCTION_NAME_PLACEHOLDER_}(item, count)
|
|||||||
end
|
end
|
||||||
`,
|
`,
|
||||||
);
|
);
|
||||||
const element = generator.valueToCode(block, 'ITEM', Order.NONE) || 'None';
|
const element = generator.valueToCode(block, 'ITEM', Order.NONE) || 'nil';
|
||||||
const repeatCount = generator.valueToCode(block, 'NUM', Order.NONE) || '0';
|
const repeatCount = generator.valueToCode(block, 'NUM', Order.NONE) || '0';
|
||||||
const code = functionName + '(' + element + ', ' + repeatCount + ')';
|
const code = functionName + '(' + element + ', ' + repeatCount + ')';
|
||||||
return [code, Order.HIGH];
|
return [code, Order.HIGH];
|
||||||
@@ -258,7 +258,7 @@ export function lists_setIndex(block: Block, generator: LuaGenerator): string {
|
|||||||
const mode = block.getFieldValue('MODE') || 'SET';
|
const mode = block.getFieldValue('MODE') || 'SET';
|
||||||
const where = block.getFieldValue('WHERE') || 'FROM_START';
|
const where = block.getFieldValue('WHERE') || 'FROM_START';
|
||||||
const at = generator.valueToCode(block, 'AT', Order.ADDITIVE) || '1';
|
const at = generator.valueToCode(block, 'AT', Order.ADDITIVE) || '1';
|
||||||
const value = generator.valueToCode(block, 'TO', Order.NONE) || 'None';
|
const value = generator.valueToCode(block, 'TO', Order.NONE) || 'Nil';
|
||||||
|
|
||||||
let code = '';
|
let code = '';
|
||||||
// If `list` would be evaluated more than once (which is the case for LAST,
|
// If `list` would be evaluated more than once (which is the case for LAST,
|
||||||
|
|||||||
Reference in New Issue
Block a user