blockly 9.0.0-beta.0 → 9.0.0-beta.2

package/generators/javascript/loops.js

@@ -1,180 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating JavaScript for loop blocks.
- */
-'use strict';
-
-goog.module('Blockly.JavaScript.loops');
-
-const stringUtils = goog.require('Blockly.utils.string');
-const {NameType} = goog.require('Blockly.Names');
-const {javascriptGenerator: JavaScript} = goog.require('Blockly.JavaScript');
-
-
-JavaScript['controls_repeat_ext'] = function(block) {
-  // Repeat n times.
-  let repeats;
-  if (block.getField('TIMES')) {
-    // Internal number.
-    repeats = String(Number(block.getFieldValue('TIMES')));
-  } else {
-    // External number.
-    repeats =
-        JavaScript.valueToCode(block, 'TIMES', JavaScript.ORDER_ASSIGNMENT) ||
-        '0';
-  }
-  let branch = JavaScript.statementToCode(block, 'DO');
-  branch = JavaScript.addLoopTrap(branch, block);
-  let code = '';
-  const loopVar =
-      JavaScript.nameDB_.getDistinctName('count', NameType.VARIABLE);
-  let endVar = repeats;
-  if (!repeats.match(/^\w+$/) && !stringUtils.isNumber(repeats)) {
-    endVar =
-        JavaScript.nameDB_.getDistinctName('repeat_end', NameType.VARIABLE);
-    code += 'var ' + endVar + ' = ' + repeats + ';\n';
-  }
-  code += 'for (var ' + loopVar + ' = 0; ' + loopVar + ' < ' + endVar + '; ' +
-      loopVar + '++) {\n' + branch + '}\n';
-  return code;
-};
-
-JavaScript['controls_repeat'] = JavaScript['controls_repeat_ext'];
-
-JavaScript['controls_whileUntil'] = function(block) {
-  // Do while/until loop.
-  const until = block.getFieldValue('MODE') === 'UNTIL';
-  let argument0 =
-      JavaScript.valueToCode(
-          block, 'BOOL',
-          until ? JavaScript.ORDER_LOGICAL_NOT : JavaScript.ORDER_NONE) ||
-      'false';
-  let branch = JavaScript.statementToCode(block, 'DO');
-  branch = JavaScript.addLoopTrap(branch, block);
-  if (until) {
-    argument0 = '!' + argument0;
-  }
-  return 'while (' + argument0 + ') {\n' + branch + '}\n';
-};
-
-JavaScript['controls_for'] = function(block) {
-  // For loop.
-  const variable0 =
-      JavaScript.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  const argument0 =
-      JavaScript.valueToCode(block, 'FROM', JavaScript.ORDER_ASSIGNMENT) || '0';
-  const argument1 =
-      JavaScript.valueToCode(block, 'TO', JavaScript.ORDER_ASSIGNMENT) || '0';
-  const increment =
-      JavaScript.valueToCode(block, 'BY', JavaScript.ORDER_ASSIGNMENT) || '1';
-  let branch = JavaScript.statementToCode(block, 'DO');
-  branch = JavaScript.addLoopTrap(branch, block);
-  let code;
-  if (stringUtils.isNumber(argument0) && stringUtils.isNumber(argument1) &&
-      stringUtils.isNumber(increment)) {
-    // All arguments are simple numbers.
-    const up = Number(argument0) <= Number(argument1);
-    code = 'for (' + variable0 + ' = ' + argument0 + '; ' + variable0 +
-        (up ? ' <= ' : ' >= ') + argument1 + '; ' + variable0;
-    const step = Math.abs(Number(increment));
-    if (step === 1) {
-      code += up ? '++' : '--';
-    } else {
-      code += (up ? ' += ' : ' -= ') + step;
-    }
-    code += ') {\n' + branch + '}\n';
-  } else {
-    code = '';
-    // Cache non-trivial values to variables to prevent repeated look-ups.
-    let startVar = argument0;
-    if (!argument0.match(/^\w+$/) && !stringUtils.isNumber(argument0)) {
-      startVar = JavaScript.nameDB_.getDistinctName(
-          variable0 + '_start', NameType.VARIABLE);
-      code += 'var ' + startVar + ' = ' + argument0 + ';\n';
-    }
-    let endVar = argument1;
-    if (!argument1.match(/^\w+$/) && !stringUtils.isNumber(argument1)) {
-      endVar = JavaScript.nameDB_.getDistinctName(
-          variable0 + '_end', NameType.VARIABLE);
-      code += 'var ' + endVar + ' = ' + argument1 + ';\n';
-    }
-    // Determine loop direction at start, in case one of the bounds
-    // changes during loop execution.
-    const incVar = JavaScript.nameDB_.getDistinctName(
-        variable0 + '_inc', NameType.VARIABLE);
-    code += 'var ' + incVar + ' = ';
-    if (stringUtils.isNumber(increment)) {
-      code += Math.abs(increment) + ';\n';
-    } else {
-      code += 'Math.abs(' + increment + ');\n';
-    }
-    code += 'if (' + startVar + ' > ' + endVar + ') {\n';
-    code += JavaScript.INDENT + incVar + ' = -' + incVar + ';\n';
-    code += '}\n';
-    code += 'for (' + variable0 + ' = ' + startVar + '; ' + incVar +
-        ' >= 0 ? ' + variable0 + ' <= ' + endVar + ' : ' + variable0 +
-        ' >= ' + endVar + '; ' + variable0 + ' += ' + incVar + ') {\n' +
-        branch + '}\n';
-  }
-  return code;
-};
-
-JavaScript['controls_forEach'] = function(block) {
-  // For each loop.
-  const variable0 =
-      JavaScript.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  const argument0 =
-      JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_ASSIGNMENT) ||
-      '[]';
-  let branch = JavaScript.statementToCode(block, 'DO');
-  branch = JavaScript.addLoopTrap(branch, block);
-  let code = '';
-  // Cache non-trivial values to variables to prevent repeated look-ups.
-  let listVar = argument0;
-  if (!argument0.match(/^\w+$/)) {
-    listVar = JavaScript.nameDB_.getDistinctName(
-        variable0 + '_list', NameType.VARIABLE);
-    code += 'var ' + listVar + ' = ' + argument0 + ';\n';
-  }
-  const indexVar = JavaScript.nameDB_.getDistinctName(
-      variable0 + '_index', NameType.VARIABLE);
-  branch = JavaScript.INDENT + variable0 + ' = ' + listVar + '[' + indexVar +
-      '];\n' + branch;
-  code += 'for (var ' + indexVar + ' in ' + listVar + ') {\n' + branch + '}\n';
-  return code;
-};
-
-JavaScript['controls_flow_statements'] = function(block) {
-  // Flow statements: continue, break.
-  let xfix = '';
-  if (JavaScript.STATEMENT_PREFIX) {
-    // Automatic prefix insertion is switched off for this block.  Add manually.
-    xfix += JavaScript.injectId(JavaScript.STATEMENT_PREFIX, block);
-  }
-  if (JavaScript.STATEMENT_SUFFIX) {
-    // Inject any statement suffix here since the regular one at the end
-    // will not get executed if the break/continue is triggered.
-    xfix += JavaScript.injectId(JavaScript.STATEMENT_SUFFIX, block);
-  }
-  if (JavaScript.STATEMENT_PREFIX) {
-    const loop = block.getSurroundLoop();
-    if (loop && !loop.suppressPrefixSuffix) {
-      // Inject loop's statement prefix here since the regular one at the end
-      // of the loop will not get executed if 'continue' is triggered.
-      // In the case of 'break', a prefix is needed due to the loop's suffix.
-      xfix += JavaScript.injectId(JavaScript.STATEMENT_PREFIX, loop);
-    }
-  }
-  switch (block.getFieldValue('FLOW')) {
-    case 'BREAK':
-      return xfix + 'break;\n';
-    case 'CONTINUE':
-      return xfix + 'continue;\n';
-  }
-  throw Error('Unknown flow statement.');
-};

package/generators/javascript/math.js

@@ -1,401 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating JavaScript for math blocks.
- * @suppress {missingRequire}
- */
-'use strict';
-
-goog.module('Blockly.JavaScript.math');
-
-const {NameType} = goog.require('Blockly.Names');
-const {javascriptGenerator: JavaScript} = goog.require('Blockly.JavaScript');
-
-
-JavaScript['math_number'] = function(block) {
-  // Numeric value.
-  const code = Number(block.getFieldValue('NUM'));
-  const order = code >= 0 ? JavaScript.ORDER_ATOMIC :
-              JavaScript.ORDER_UNARY_NEGATION;
-  return [code, order];
-};
-
-JavaScript['math_arithmetic'] = function(block) {
-  // Basic arithmetic operators, and power.
-  const OPERATORS = {
-    'ADD': [' + ', JavaScript.ORDER_ADDITION],
-    'MINUS': [' - ', JavaScript.ORDER_SUBTRACTION],
-    'MULTIPLY': [' * ', JavaScript.ORDER_MULTIPLICATION],
-    'DIVIDE': [' / ', JavaScript.ORDER_DIVISION],
-    'POWER': [null, JavaScript.ORDER_NONE],  // Handle power separately.
-  };
-  const tuple = OPERATORS[block.getFieldValue('OP')];
-  const operator = tuple[0];
-  const order = tuple[1];
-  const argument0 = JavaScript.valueToCode(block, 'A', order) || '0';
-  const argument1 = JavaScript.valueToCode(block, 'B', order) || '0';
-  let code;
-  // Power in JavaScript requires a special case since it has no operator.
-  if (!operator) {
-    code = 'Math.pow(' + argument0 + ', ' + argument1 + ')';
-    return [code, JavaScript.ORDER_FUNCTION_CALL];
-  }
-  code = argument0 + operator + argument1;
-  return [code, order];
-};
-
-JavaScript['math_single'] = function(block) {
-  // Math operators with single operand.
-  const operator = block.getFieldValue('OP');
-  let code;
-  let arg;
-  if (operator === 'NEG') {
-    // Negation is a special case given its different operator precedence.
-    arg = JavaScript.valueToCode(block, 'NUM',
-        JavaScript.ORDER_UNARY_NEGATION) || '0';
-    if (arg[0] === '-') {
-      // --3 is not legal in JS.
-      arg = ' ' + arg;
-    }
-    code = '-' + arg;
-    return [code, JavaScript.ORDER_UNARY_NEGATION];
-  }
-  if (operator === 'SIN' || operator === 'COS' || operator === 'TAN') {
-    arg = JavaScript.valueToCode(block, 'NUM',
-        JavaScript.ORDER_DIVISION) || '0';
-  } else {
-    arg = JavaScript.valueToCode(block, 'NUM',
-        JavaScript.ORDER_NONE) || '0';
-  }
-  // First, handle cases which generate values that don't need parentheses
-  // wrapping the code.
-  switch (operator) {
-    case 'ABS':
-      code = 'Math.abs(' + arg + ')';
-      break;
-    case 'ROOT':
-      code = 'Math.sqrt(' + arg + ')';
-      break;
-    case 'LN':
-      code = 'Math.log(' + arg + ')';
-      break;
-    case 'EXP':
-      code = 'Math.exp(' + arg + ')';
-      break;
-    case 'POW10':
-      code = 'Math.pow(10,' + arg + ')';
-      break;
-    case 'ROUND':
-      code = 'Math.round(' + arg + ')';
-      break;
-    case 'ROUNDUP':
-      code = 'Math.ceil(' + arg + ')';
-      break;
-    case 'ROUNDDOWN':
-      code = 'Math.floor(' + arg + ')';
-      break;
-    case 'SIN':
-      code = 'Math.sin(' + arg + ' / 180 * Math.PI)';
-      break;
-    case 'COS':
-      code = 'Math.cos(' + arg + ' / 180 * Math.PI)';
-      break;
-    case 'TAN':
-      code = 'Math.tan(' + arg + ' / 180 * Math.PI)';
-      break;
-  }
-  if (code) {
-    return [code, JavaScript.ORDER_FUNCTION_CALL];
-  }
-  // Second, handle cases which generate values that may need parentheses
-  // wrapping the code.
-  switch (operator) {
-    case 'LOG10':
-      code = 'Math.log(' + arg + ') / Math.log(10)';
-      break;
-    case 'ASIN':
-      code = 'Math.asin(' + arg + ') / Math.PI * 180';
-      break;
-    case 'ACOS':
-      code = 'Math.acos(' + arg + ') / Math.PI * 180';
-      break;
-    case 'ATAN':
-      code = 'Math.atan(' + arg + ') / Math.PI * 180';
-      break;
-    default:
-      throw Error('Unknown math operator: ' + operator);
-  }
-  return [code, JavaScript.ORDER_DIVISION];
-};
-
-JavaScript['math_constant'] = function(block) {
-  // Constants: PI, E, the Golden Ratio, sqrt(2), 1/sqrt(2), INFINITY.
-  const CONSTANTS = {
-    'PI': ['Math.PI', JavaScript.ORDER_MEMBER],
-    'E': ['Math.E', JavaScript.ORDER_MEMBER],
-    'GOLDEN_RATIO': ['(1 + Math.sqrt(5)) / 2', JavaScript.ORDER_DIVISION],
-    'SQRT2': ['Math.SQRT2', JavaScript.ORDER_MEMBER],
-    'SQRT1_2': ['Math.SQRT1_2', JavaScript.ORDER_MEMBER],
-    'INFINITY': ['Infinity', JavaScript.ORDER_ATOMIC],
-  };
-  return CONSTANTS[block.getFieldValue('CONSTANT')];
-};
-
-JavaScript['math_number_property'] = function(block) {
-  // Check if a number is even, odd, prime, whole, positive, or negative
-  // or if it is divisible by certain number. Returns true or false.
-  const PROPERTIES = {
-    'EVEN': [' % 2 === 0', JavaScript.ORDER_MODULUS, JavaScript.ORDER_EQUALITY],
-    'ODD': [' % 2 === 1', JavaScript.ORDER_MODULUS, JavaScript.ORDER_EQUALITY],
-    'WHOLE': [' % 1 === 0', JavaScript.ORDER_MODULUS,
-        JavaScript.ORDER_EQUALITY],
-    'POSITIVE': [' > 0', JavaScript.ORDER_RELATIONAL,
-        JavaScript.ORDER_RELATIONAL],
-    'NEGATIVE': [' < 0', JavaScript.ORDER_RELATIONAL,
-        JavaScript.ORDER_RELATIONAL],
-    'DIVISIBLE_BY': [null, JavaScript.ORDER_MODULUS, JavaScript.ORDER_EQUALITY],
-    'PRIME': [null, JavaScript.ORDER_NONE, JavaScript.ORDER_FUNCTION_CALL],
-  };
-  const dropdownProperty = block.getFieldValue('PROPERTY');
-  const [suffix, inputOrder, outputOrder] = PROPERTIES[dropdownProperty];
-  const numberToCheck = JavaScript.valueToCode(block, 'NUMBER_TO_CHECK',
-      inputOrder) || '0';
-  let code;
-  if (dropdownProperty === 'PRIME') {
-    // Prime is a special case as it is not a one-liner test.
-    const functionName = JavaScript.provideFunction_('mathIsPrime', `
-function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(n) {
-  // https://en.wikipedia.org/wiki/Primality_test#Naive_methods
-  if (n == 2 || n == 3) {
-    return true;
-  }
-  // False if n is NaN, negative, is 1, or not whole.
-  // And false if n is divisible by 2 or 3.
-  if (isNaN(n) || n <= 1 || n % 1 !== 0 || n % 2 === 0 || n % 3 === 0) {
-    return false;
-  }
-  // Check all the numbers of form 6k +/- 1, up to sqrt(n).
-  for (var x = 6; x <= Math.sqrt(n) + 1; x += 6) {
-    if (n % (x - 1) === 0 || n % (x + 1) === 0) {
-      return false;
-    }
-  }
-  return true;
-}
-`);
-    code = functionName + '(' + numberToCheck + ')';
-  } else if (dropdownProperty === 'DIVISIBLE_BY') {
-    const divisor = JavaScript.valueToCode(block, 'DIVISOR',
-        JavaScript.ORDER_MODULUS) || '0';
-    code = numberToCheck + ' % ' + divisor + ' === 0';
-  } else {
-    code = numberToCheck + suffix;
-  }
-  return [code, outputOrder];
-};
-
-JavaScript['math_change'] = function(block) {
-  // Add to a variable in place.
-  const argument0 = JavaScript.valueToCode(block, 'DELTA',
-      JavaScript.ORDER_ADDITION) || '0';
-  const varName = JavaScript.nameDB_.getName(
-      block.getFieldValue('VAR'), NameType.VARIABLE);
-  return varName + ' = (typeof ' + varName + ' === \'number\' ? ' + varName +
-      ' : 0) + ' + argument0 + ';\n';
-};
-
-// Rounding functions have a single operand.
-JavaScript['math_round'] = JavaScript['math_single'];
-// Trigonometry functions have a single operand.
-JavaScript['math_trig'] = JavaScript['math_single'];
-
-JavaScript['math_on_list'] = function(block) {
-  // Math functions for lists.
-  const func = block.getFieldValue('OP');
-  let list;
-  let code;
-  switch (func) {
-    case 'SUM':
-      list = JavaScript.valueToCode(block, 'LIST',
-          JavaScript.ORDER_MEMBER) || '[]';
-      code = list + '.reduce(function(x, y) {return x + y;}, 0)';
-      break;
-    case 'MIN':
-      list = JavaScript.valueToCode(block, 'LIST',
-          JavaScript.ORDER_NONE) || '[]';
-      code = 'Math.min.apply(null, ' + list + ')';
-      break;
-    case 'MAX':
-      list = JavaScript.valueToCode(block, 'LIST',
-          JavaScript.ORDER_NONE) || '[]';
-      code = 'Math.max.apply(null, ' + list + ')';
-      break;
-    case 'AVERAGE': {
-      // mathMean([null,null,1,3]) === 2.0.
-      const functionName = JavaScript.provideFunction_('mathMean', `
-function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(myList) {
-  return myList.reduce(function(x, y) {return x + y;}, 0) / myList.length;
-}
-`);
-      list = JavaScript.valueToCode(block, 'LIST',
-          JavaScript.ORDER_NONE) || '[]';
-      code = functionName + '(' + list + ')';
-      break;
-    }
-    case 'MEDIAN': {
-      // mathMedian([null,null,1,3]) === 2.0.
-      const functionName = JavaScript.provideFunction_('mathMedian', `
-function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(myList) {
-  var localList = myList.filter(function (x) {return typeof x === 'number';});
-  if (!localList.length) return null;
-  localList.sort(function(a, b) {return b - a;});
-  if (localList.length % 2 === 0) {
-    return (localList[localList.length / 2 - 1] + localList[localList.length / 2]) / 2;
-  } else {
-    return localList[(localList.length - 1) / 2];
-  }
-}
-`);
-      list = JavaScript.valueToCode(block, 'LIST',
-          JavaScript.ORDER_NONE) || '[]';
-      code = functionName + '(' + list + ')';
-      break;
-    }
-    case 'MODE': {
-      // As a list of numbers can contain more than one mode,
-      // the returned result is provided as an array.
-      // Mode of [3, 'x', 'x', 1, 1, 2, '3'] -> ['x', 1].
-      const functionName = JavaScript.provideFunction_('mathModes', `
-function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(values) {
-  var modes = [];
-  var counts = [];
-  var maxCount = 0;
-  for (var i = 0; i < values.length; i++) {
-    var value = values[i];
-    var found = false;
-    var thisCount;
-    for (var j = 0; j < counts.length; j++) {
-      if (counts[j][0] === value) {
-        thisCount = ++counts[j][1];
-        found = true;
-        break;
-      }
-    }
-    if (!found) {
-      counts.push([value, 1]);
-      thisCount = 1;
-    }
-    maxCount = Math.max(thisCount, maxCount);
-  }
-  for (var j = 0; j < counts.length; j++) {
-    if (counts[j][1] === maxCount) {
-        modes.push(counts[j][0]);
-    }
-  }
-  return modes;
-}
-`);
-      list = JavaScript.valueToCode(block, 'LIST',
-          JavaScript.ORDER_NONE) || '[]';
-      code = functionName + '(' + list + ')';
-      break;
-    }
-    case 'STD_DEV': {
-      const functionName = JavaScript.provideFunction_('mathStandardDeviation', `
-function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(numbers) {
-  var n = numbers.length;
-  if (!n) return null;
-  var mean = numbers.reduce(function(x, y) {return x + y;}) / n;
-  var variance = 0;
-  for (var j = 0; j < n; j++) {
-    variance += Math.pow(numbers[j] - mean, 2);
-  }
-  variance = variance / n;
-  return Math.sqrt(variance);
-}
-`);
-      list = JavaScript.valueToCode(block, 'LIST',
-          JavaScript.ORDER_NONE) || '[]';
-      code = functionName + '(' + list + ')';
-      break;
-    }
-    case 'RANDOM': {
-      const functionName = JavaScript.provideFunction_('mathRandomList', `
-function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(list) {
-  var x = Math.floor(Math.random() * list.length);
-  return list[x];
-}
-`);
-      list = JavaScript.valueToCode(block, 'LIST',
-          JavaScript.ORDER_NONE) || '[]';
-      code = functionName + '(' + list + ')';
-      break;
-    }
-    default:
-      throw Error('Unknown operator: ' + func);
-  }
-  return [code, JavaScript.ORDER_FUNCTION_CALL];
-};
-
-JavaScript['math_modulo'] = function(block) {
-  // Remainder computation.
-  const argument0 = JavaScript.valueToCode(block, 'DIVIDEND',
-      JavaScript.ORDER_MODULUS) || '0';
-  const argument1 = JavaScript.valueToCode(block, 'DIVISOR',
-      JavaScript.ORDER_MODULUS) || '0';
-  const code = argument0 + ' % ' + argument1;
-  return [code, JavaScript.ORDER_MODULUS];
-};
-
-JavaScript['math_constrain'] = function(block) {
-  // Constrain a number between two limits.
-  const argument0 = JavaScript.valueToCode(block, 'VALUE',
-      JavaScript.ORDER_NONE) || '0';
-  const argument1 = JavaScript.valueToCode(block, 'LOW',
-      JavaScript.ORDER_NONE) || '0';
-  const argument2 = JavaScript.valueToCode(block, 'HIGH',
-      JavaScript.ORDER_NONE) || 'Infinity';
-  const code = 'Math.min(Math.max(' + argument0 + ', ' + argument1 + '), ' +
-      argument2 + ')';
-  return [code, JavaScript.ORDER_FUNCTION_CALL];
-};
-
-JavaScript['math_random_int'] = function(block) {
-  // Random integer between [X] and [Y].
-  const argument0 = JavaScript.valueToCode(block, 'FROM',
-      JavaScript.ORDER_NONE) || '0';
-  const argument1 = JavaScript.valueToCode(block, 'TO',
-      JavaScript.ORDER_NONE) || '0';
-  const functionName = JavaScript.provideFunction_('mathRandomInt', `
-function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(a, b) {
-  if (a > b) {
-    // Swap a and b to ensure a is smaller.
-    var c = a;
-    a = b;
-    b = c;
-  }
-  return Math.floor(Math.random() * (b - a + 1) + a);
-}
-`);
-  const code = functionName + '(' + argument0 + ', ' + argument1 + ')';
-  return [code, JavaScript.ORDER_FUNCTION_CALL];
-};
-
-JavaScript['math_random_float'] = function(block) {
-  // Random fraction between 0 and 1.
-  return ['Math.random()', JavaScript.ORDER_FUNCTION_CALL];
-};
-
-JavaScript['math_atan2'] = function(block) {
-  // Arctangent of point (X, Y) in degrees from -180 to 180.
-  const argument0 = JavaScript.valueToCode(block, 'X',
-      JavaScript.ORDER_NONE) || '0';
-  const argument1 = JavaScript.valueToCode(block, 'Y',
-      JavaScript.ORDER_NONE) || '0';
-  return ['Math.atan2(' + argument1 + ', ' + argument0 + ') / Math.PI * 180',
-      JavaScript.ORDER_DIVISION];
-};

package/generators/javascript/procedures.js

@@ -1,110 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating JavaScript for procedure blocks.
- */
-'use strict';
-
-goog.module('Blockly.JavaScript.procedures');
-
-const {NameType} = goog.require('Blockly.Names');
-const {javascriptGenerator: JavaScript} = goog.require('Blockly.JavaScript');
-
-
-JavaScript['procedures_defreturn'] = function(block) {
-  // Define a procedure with a return value.
-  const funcName = JavaScript.nameDB_.getName(
-      block.getFieldValue('NAME'), NameType.PROCEDURE);
-  let xfix1 = '';
-  if (JavaScript.STATEMENT_PREFIX) {
-    xfix1 += JavaScript.injectId(JavaScript.STATEMENT_PREFIX, block);
-  }
-  if (JavaScript.STATEMENT_SUFFIX) {
-    xfix1 += JavaScript.injectId(JavaScript.STATEMENT_SUFFIX, block);
-  }
-  if (xfix1) {
-    xfix1 = JavaScript.prefixLines(xfix1, JavaScript.INDENT);
-  }
-  let loopTrap = '';
-  if (JavaScript.INFINITE_LOOP_TRAP) {
-    loopTrap = JavaScript.prefixLines(
-        JavaScript.injectId(JavaScript.INFINITE_LOOP_TRAP, block),
-        JavaScript.INDENT);
-  }
-  const branch = JavaScript.statementToCode(block, 'STACK');
-  let returnValue =
-      JavaScript.valueToCode(block, 'RETURN', JavaScript.ORDER_NONE) || '';
-  let xfix2 = '';
-  if (branch && returnValue) {
-    // After executing the function body, revisit this block for the return.
-    xfix2 = xfix1;
-  }
-  if (returnValue) {
-    returnValue = JavaScript.INDENT + 'return ' + returnValue + ';\n';
-  }
-  const args = [];
-  const variables = block.getVars();
-  for (let i = 0; i < variables.length; i++) {
-    args[i] = JavaScript.nameDB_.getName(variables[i], NameType.VARIABLE);
-  }
-  let code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' + xfix1 +
-      loopTrap + branch + xfix2 + returnValue + '}';
-  code = JavaScript.scrub_(block, code);
-  // Add % so as not to collide with helper functions in definitions list.
-  JavaScript.definitions_['%' + funcName] = code;
-  return null;
-};
-
-// Defining a procedure without a return value uses the same generator as
-// a procedure with a return value.
-JavaScript['procedures_defnoreturn'] = JavaScript['procedures_defreturn'];
-
-JavaScript['procedures_callreturn'] = function(block) {
-  // Call a procedure with a return value.
-  const funcName = JavaScript.nameDB_.getName(
-      block.getFieldValue('NAME'), NameType.PROCEDURE);
-  const args = [];
-  const variables = block.getVars();
-  for (let i = 0; i < variables.length; i++) {
-    args[i] = JavaScript.valueToCode(block, 'ARG' + i, JavaScript.ORDER_NONE) ||
-        'null';
-  }
-  const code = funcName + '(' + args.join(', ') + ')';
-  return [code, JavaScript.ORDER_FUNCTION_CALL];
-};
-
-JavaScript['procedures_callnoreturn'] = function(block) {
-  // Call a procedure with no return value.
-  // Generated code is for a function call as a statement is the same as a
-  // function call as a value, with the addition of line ending.
-  const tuple = JavaScript['procedures_callreturn'](block);
-  return tuple[0] + ';\n';
-};
-
-JavaScript['procedures_ifreturn'] = function(block) {
-  // Conditionally return value from a procedure.
-  const condition =
-      JavaScript.valueToCode(block, 'CONDITION', JavaScript.ORDER_NONE) ||
-      'false';
-  let code = 'if (' + condition + ') {\n';
-  if (JavaScript.STATEMENT_SUFFIX) {
-    // Inject any statement suffix here since the regular one at the end
-    // will not get executed if the return is triggered.
-    code += JavaScript.prefixLines(
-        JavaScript.injectId(JavaScript.STATEMENT_SUFFIX, block),
-        JavaScript.INDENT);
-  }
-  if (block.hasReturnValue_) {
-    const value =
-        JavaScript.valueToCode(block, 'VALUE', JavaScript.ORDER_NONE) || 'null';
-    code += JavaScript.INDENT + 'return ' + value + ';\n';
-  } else {
-    code += JavaScript.INDENT + 'return;\n';
-  }
-  code += '}\n';
-  return code;
-};