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

Move away from math.log10 and math.pow in Lua generators.

Browse Source 
Fixes #1695
This commit is contained in:
Neil Fraser
2018-03-09 16:16:23 -08:00
committed by Neil Fraser
parent 5b50642c58
commit 6203cadcae
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
generators/lua/math.js
View File

@@ -66,9 +66,14 @@ Blockly.Lua['math_single'] = function(block) {
Blockly.Lua.ORDER_UNARY) || '0';
return ['-' + arg, Blockly.Lua.ORDER_UNARY];
}
if (operator == 'SIN' || operator == 'COS' || operator == 'TAN') {
if (operator == 'POW10') {
arg = Blockly.Lua.valueToCode(block, 'NUM',
Blockly.Lua.ORDER_MULTIPLICATIVE) || '0';
Blockly.Lua.ORDER_EXPONENTIATION) || '0';
return ['10 ^ ' + arg, Blockly.Lua.ORDER_EXPONENTIATION];
}
if (operator == 'ROUND') {
arg = Blockly.Lua.valueToCode(block, 'NUM',
Blockly.Lua.ORDER_ADDITIVE) || '0';
} else {
arg = Blockly.Lua.valueToCode(block, 'NUM',
Blockly.Lua.ORDER_NONE) || '0';
@@ -84,14 +89,11 @@ Blockly.Lua['math_single'] = function(block) {
code = 'math.log(' + arg + ')';
break;
case 'LOG10':
code = 'math.log10(' + arg + ')';
code = 'math.log(' + arg + ', 10)';
break;
case 'EXP':
code = 'math.exp(' + arg + ')';
break;
case 'POW10':
code = 'math.pow(10,' + arg + ')';
break;
case 'ROUND':
// This rounds up. Blockly does not specify rounding direction.
code = 'math.floor(' + arg + ' + .5)';