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

Upgrade to dart 2.0

Browse Source
This commit is contained in:
Neil Fraser
2018-10-15 16:02:04 -07:00
committed by Neil Fraser
parent 7531b323b2
commit 4f714716a5
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
generators/dart/lists.js
View File

@@ -376,8 +376,8 @@ Blockly.Dart['lists_getSublist'] = function(block) {
var functionName = Blockly.Dart.provideFunction_(
'lists_get_sublist',
['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(list, where1, at1, where2, at2) {',
' int getAt(where, at) {',
'(List list, String where1, num at1, String where2, num at2) {',
' int getAt(String where, num at) {',
' if (where == \'FROM_END\') {',
' at = list.length - 1 - at;',
' } else if (where == \'FIRST\') {',
@@ -408,9 +408,9 @@ Blockly.Dart['lists_sort'] = function(block) {
var sortFunctionName = Blockly.Dart.provideFunction_(
'lists_sort',
['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(list, type, direction) {',
'(List list, String type, int direction) {',
' var compareFuncs = {',
' "NUMERIC": (a, b) => direction * a.compareTo(b),',
' "NUMERIC": (a, b) => (direction * a.compareTo(b)).toInt(),',
' "TEXT": (a, b) => direction * ' +
'a.toString().compareTo(b.toString()),',
' "IGNORE_CASE": ',

36
generators/dart/math.js
View File

@@ -36,10 +36,10 @@ Blockly.Dart['math_number'] = function(block) {
var code = parseFloat(block.getFieldValue('NUM'));
var order;
if (code == Infinity) {
code = 'double.INFINITY';
code = 'double.infinity';
order = Blockly.Dart.ORDER_UNARY_POSTFIX;
} else if (code == -Infinity) {
code = '-double.INFINITY';
code = '-double.infinity';
order = Blockly.Dart.ORDER_UNARY_PREFIX;
} else {
// -4.abs() returns -4 in Dart due to strange order of operation choices.
@@ -132,13 +132,13 @@ Blockly.Dart['math_single'] = function(block) {
code = arg + '.floor()';
break;
case 'SIN':
code = 'Math.sin(' + arg + ' / 180 * Math.PI)';
code = 'Math.sin(' + arg + ' / 180 * Math.pi)';
break;
case 'COS':
code = 'Math.cos(' + arg + ' / 180 * Math.PI)';
code = 'Math.cos(' + arg + ' / 180 * Math.pi)';
break;
case 'TAN':
code = 'Math.tan(' + arg + ' / 180 * Math.PI)';
code = 'Math.tan(' + arg + ' / 180 * Math.pi)';
break;
}
if (code) {
@@ -151,13 +151,13 @@ Blockly.Dart['math_single'] = function(block) {
code = 'Math.log(' + arg + ') / Math.log(10)';
break;
case 'ASIN':
code = 'Math.asin(' + arg + ') / Math.PI * 180';
code = 'Math.asin(' + arg + ') / Math.pi * 180';
break;
case 'ACOS':
code = 'Math.acos(' + arg + ') / Math.PI * 180';
code = 'Math.acos(' + arg + ') / Math.pi * 180';
break;
case 'ATAN':
code = 'Math.atan(' + arg + ') / Math.PI * 180';
code = 'Math.atan(' + arg + ') / Math.pi * 180';
break;
default:
throw Error('Unknown math operator: ' + operator);
@@ -168,13 +168,13 @@ Blockly.Dart['math_single'] = function(block) {
Blockly.Dart['math_constant'] = function(block) {
// Constants: PI, E, the Golden Ratio, sqrt(2), 1/sqrt(2), INFINITY.
var CONSTANTS = {
'PI': ['Math.PI', Blockly.Dart.ORDER_UNARY_POSTFIX],
'E': ['Math.E', Blockly.Dart.ORDER_UNARY_POSTFIX],
'PI': ['Math.pi', Blockly.Dart.ORDER_UNARY_POSTFIX],
'E': ['Math.e', Blockly.Dart.ORDER_UNARY_POSTFIX],
'GOLDEN_RATIO':
['(1 + Math.sqrt(5)) / 2', Blockly.Dart.ORDER_MULTIPLICATIVE],
'SQRT2': ['Math.SQRT2', Blockly.Dart.ORDER_UNARY_POSTFIX],
'SQRT1_2': ['Math.SQRT1_2', Blockly.Dart.ORDER_UNARY_POSTFIX],
'INFINITY': ['double.INFINITY', Blockly.Dart.ORDER_ATOMIC]
'SQRT2': ['Math.sqrt2', Blockly.Dart.ORDER_UNARY_POSTFIX],
'SQRT1_2': ['Math.sqrt1_2', Blockly.Dart.ORDER_UNARY_POSTFIX],
'INFINITY': ['double.infinity', Blockly.Dart.ORDER_ATOMIC]
};
var constant = block.getFieldValue('CONSTANT');
if (constant != 'INFINITY') {
@@ -276,7 +276,7 @@ Blockly.Dart['math_on_list'] = function(block) {
var functionName = Blockly.Dart.provideFunction_(
'math_sum',
['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
'(List<num> myList) {',
' num sumVal = 0;',
' myList.forEach((num entry) {sumVal += entry;});',
' return sumVal;',
@@ -289,7 +289,7 @@ Blockly.Dart['math_on_list'] = function(block) {
var functionName = Blockly.Dart.provideFunction_(
'math_min',
['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
'(List<num> myList) {',
' if (myList.isEmpty) return null;',
' num minVal = myList[0];',
' myList.forEach((num entry) ' +
@@ -304,7 +304,7 @@ Blockly.Dart['math_on_list'] = function(block) {
var functionName = Blockly.Dart.provideFunction_(
'math_max',
['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
'(List<num> myList) {',
' if (myList.isEmpty) return null;',
' num maxVal = myList[0];',
' myList.forEach((num entry) ' +
@@ -325,7 +325,7 @@ Blockly.Dart['math_on_list'] = function(block) {
' localList.removeWhere((a) => a is! num);',
' if (localList.isEmpty) return null;',
' num sumVal = 0;',
' localList.forEach((num entry) {sumVal += entry;});',
' localList.forEach((var entry) {sumVal += entry;});',
' return sumVal / localList.length;',
'}']);
code = functionName + '(' + list + ')';
@@ -450,7 +450,7 @@ Blockly.Dart['math_constrain'] = function(block) {
var argument1 = Blockly.Dart.valueToCode(block, 'LOW',
Blockly.Dart.ORDER_NONE) || '0';
var argument2 = Blockly.Dart.valueToCode(block, 'HIGH',
Blockly.Dart.ORDER_NONE) || 'double.INFINITY';
Blockly.Dart.ORDER_NONE) || 'double.infinity';
var code = 'Math.min(Math.max(' + argument0 + ', ' + argument1 + '), ' +
argument2 + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];

6
generators/dart/text.js
View File

@@ -190,9 +190,9 @@ Blockly.Dart['text_getSubstring'] = function(block) {
var at2 = Blockly.Dart.getAdjusted(block, 'AT2');
var functionName = Blockly.Dart.provideFunction_(
'text_get_substring',
['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(text, where1, at1, where2, at2) {',
' int getAt(where, at) {',
['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(String text, String where1, num at1, String where2, num at2) {',
' int getAt(String where, num at) {',
' if (where == \'FROM_END\') {',
' at = text.length - 1 - at;',
' } else if (where == \'FIRST\') {',