blockly 9.0.0-beta.0 → 9.0.0-beta.1

package/generators/python/procedures.js

@@ -1,129 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Python for procedure blocks.
- */
-'use strict';
-
-goog.module('Blockly.Python.procedures');
-
-const Variables = goog.require('Blockly.Variables');
-const {NameType} = goog.require('Blockly.Names');
-const {pythonGenerator: Python} = goog.require('Blockly.Python');
-
-
-Python['procedures_defreturn'] = function(block) {
-  // Define a procedure with a return value.
-  // First, add a 'global' statement for every variable that is not shadowed by
-  // a local parameter.
-  const globals = [];
-  const workspace = block.workspace;
-  const usedVariables = Variables.allUsedVarModels(workspace) || [];
-  for (let i = 0, variable; (variable = usedVariables[i]); i++) {
-    const varName = variable.name;
-    if (block.getVars().indexOf(varName) === -1) {
-      globals.push(Python.nameDB_.getName(varName, NameType.VARIABLE));
-    }
-  }
-  // Add developer variables.
-  const devVarList = Variables.allDeveloperVariables(workspace);
-  for (let i = 0; i < devVarList.length; i++) {
-    globals.push(
-        Python.nameDB_.getName(devVarList[i], NameType.DEVELOPER_VARIABLE));
-  }
-
-  const globalString = globals.length ?
-      Python.INDENT + 'global ' + globals.join(', ') + '\n' :
-      '';
-  const funcName =
-      Python.nameDB_.getName(block.getFieldValue('NAME'), NameType.PROCEDURE);
-  let xfix1 = '';
-  if (Python.STATEMENT_PREFIX) {
-    xfix1 += Python.injectId(Python.STATEMENT_PREFIX, block);
-  }
-  if (Python.STATEMENT_SUFFIX) {
-    xfix1 += Python.injectId(Python.STATEMENT_SUFFIX, block);
-  }
-  if (xfix1) {
-    xfix1 = Python.prefixLines(xfix1, Python.INDENT);
-  }
-  let loopTrap = '';
-  if (Python.INFINITE_LOOP_TRAP) {
-    loopTrap = Python.prefixLines(
-        Python.injectId(Python.INFINITE_LOOP_TRAP, block), Python.INDENT);
-  }
-  let branch = Python.statementToCode(block, 'STACK');
-  let returnValue =
-      Python.valueToCode(block, 'RETURN', Python.ORDER_NONE) || '';
-  let xfix2 = '';
-  if (branch && returnValue) {
-    // After executing the function body, revisit this block for the return.
-    xfix2 = xfix1;
-  }
-  if (returnValue) {
-    returnValue = Python.INDENT + 'return ' + returnValue + '\n';
-  } else if (!branch) {
-    branch = Python.PASS;
-  }
-  const args = [];
-  const variables = block.getVars();
-  for (let i = 0; i < variables.length; i++) {
-    args[i] = Python.nameDB_.getName(variables[i], NameType.VARIABLE);
-  }
-  let code = 'def ' + funcName + '(' + args.join(', ') + '):\n' + globalString +
-      xfix1 + loopTrap + branch + xfix2 + returnValue;
-  code = Python.scrub_(block, code);
-  // Add % so as not to collide with helper functions in definitions list.
-  Python.definitions_['%' + funcName] = code;
-  return null;
-};
-
-// Defining a procedure without a return value uses the same generator as
-// a procedure with a return value.
-Python['procedures_defnoreturn'] = Python['procedures_defreturn'];
-
-Python['procedures_callreturn'] = function(block) {
-  // Call a procedure with a return value.
-  const funcName =
-      Python.nameDB_.getName(block.getFieldValue('NAME'), NameType.PROCEDURE);
-  const args = [];
-  const variables = block.getVars();
-  for (let i = 0; i < variables.length; i++) {
-    args[i] = Python.valueToCode(block, 'ARG' + i, Python.ORDER_NONE) || 'None';
-  }
-  const code = funcName + '(' + args.join(', ') + ')';
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['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 = Python['procedures_callreturn'](block);
-  return tuple[0] + '\n';
-};
-
-Python['procedures_ifreturn'] = function(block) {
-  // Conditionally return value from a procedure.
-  const condition =
-      Python.valueToCode(block, 'CONDITION', Python.ORDER_NONE) || 'False';
-  let code = 'if ' + condition + ':\n';
-  if (Python.STATEMENT_SUFFIX) {
-    // Inject any statement suffix here since the regular one at the end
-    // will not get executed if the return is triggered.
-    code += Python.prefixLines(
-        Python.injectId(Python.STATEMENT_SUFFIX, block), Python.INDENT);
-  }
-  if (block.hasReturnValue_) {
-    const value =
-        Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || 'None';
-    code += Python.INDENT + 'return ' + value + '\n';
-  } else {
-    code += Python.INDENT + 'return\n';
-  }
-  return code;
-};

package/generators/python/text.js

@@ -1,291 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Python for text blocks.
- */
-'use strict';
-
-goog.module('Blockly.Python.texts');
-
-const stringUtils = goog.require('Blockly.utils.string');
-const {NameType} = goog.require('Blockly.Names');
-const {pythonGenerator: Python} = goog.require('Blockly.Python');
-
-
-Python['text'] = function(block) {
-  // Text value.
-  const code = Python.quote_(block.getFieldValue('TEXT'));
-  return [code, Python.ORDER_ATOMIC];
-};
-
-Python['text_multiline'] = function(block) {
-  // Text value.
-  const code = Python.multiline_quote_(block.getFieldValue('TEXT'));
-  const order =
-      code.indexOf('+') !== -1 ? Python.ORDER_ADDITIVE : Python.ORDER_ATOMIC;
-  return [code, order];
-};
-
-/**
- * Regular expression to detect a single-quoted string literal.
- */
-const strRegExp = /^\s*'([^']|\\')*'\s*$/;
-
-/**
- * Enclose the provided value in 'str(...)' function.
- * Leave string literals alone.
- * @param {string} value Code evaluating to a value.
- * @return {Array<string|number>} Array containing code evaluating to a string
- *     and
- *    the order of the returned code.[string, number]
- */
-const forceString = function(value) {
-  if (strRegExp.test(value)) {
-    return [value, Python.ORDER_ATOMIC];
-  }
-  return ['str(' + value + ')', Python.ORDER_FUNCTION_CALL];
-};
-
-Python['text_join'] = function(block) {
-  // Create a string made up of any number of elements of any type.
-  // Should we allow joining by '-' or ',' or any other characters?
-  switch (block.itemCount_) {
-    case 0:
-      return ["''", Python.ORDER_ATOMIC];
-    case 1: {
-      const element =
-          Python.valueToCode(block, 'ADD0', Python.ORDER_NONE) || "''";
-      const codeAndOrder = forceString(element);
-      return codeAndOrder;
-    }
-    case 2: {
-      const element0 =
-          Python.valueToCode(block, 'ADD0', Python.ORDER_NONE) || "''";
-      const element1 =
-          Python.valueToCode(block, 'ADD1', Python.ORDER_NONE) || "''";
-      const code = forceString(element0)[0] + ' + ' + forceString(element1)[0];
-      return [code, Python.ORDER_ADDITIVE];
-    }
-    default: {
-      const elements = [];
-      for (let i = 0; i < block.itemCount_; i++) {
-        elements[i] =
-            Python.valueToCode(block, 'ADD' + i, Python.ORDER_NONE) || "''";
-      }
-      const tempVar = Python.nameDB_.getDistinctName('x', NameType.VARIABLE);
-      const code = '\'\'.join([str(' + tempVar + ') for ' + tempVar + ' in [' +
-          elements.join(', ') + ']])';
-      return [code, Python.ORDER_FUNCTION_CALL];
-    }
-  }
-};
-
-Python['text_append'] = function(block) {
-  // Append to a variable in place.
-  const varName =
-      Python.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  const value = Python.valueToCode(block, 'TEXT', Python.ORDER_NONE) || "''";
-  return varName + ' = str(' + varName + ') + ' + forceString(value)[0] + '\n';
-};
-
-Python['text_length'] = function(block) {
-  // Is the string null or array empty?
-  const text = Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || "''";
-  return ['len(' + text + ')', Python.ORDER_FUNCTION_CALL];
-};
-
-Python['text_isEmpty'] = function(block) {
-  // Is the string null or array empty?
-  const text = Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || "''";
-  const code = 'not len(' + text + ')';
-  return [code, Python.ORDER_LOGICAL_NOT];
-};
-
-Python['text_indexOf'] = function(block) {
-  // Search the text for a substring.
-  // Should we allow for non-case sensitive???
-  const operator = block.getFieldValue('END') === 'FIRST' ? 'find' : 'rfind';
-  const substring =
-      Python.valueToCode(block, 'FIND', Python.ORDER_NONE) || "''";
-  const text =
-      Python.valueToCode(block, 'VALUE', Python.ORDER_MEMBER) || "''";
-  const code = text + '.' + operator + '(' + substring + ')';
-  if (block.workspace.options.oneBasedIndex) {
-    return [code + ' + 1', Python.ORDER_ADDITIVE];
-  }
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['text_charAt'] = function(block) {
-  // Get letter at index.
-  // Note: Until January 2013 this block did not have the WHERE input.
-  const where = block.getFieldValue('WHERE') || 'FROM_START';
-  const textOrder =
-      (where === 'RANDOM') ? Python.ORDER_NONE : Python.ORDER_MEMBER;
-  const text = Python.valueToCode(block, 'VALUE', textOrder) || "''";
-  switch (where) {
-    case 'FIRST': {
-      const code = text + '[0]';
-      return [code, Python.ORDER_MEMBER];
-    }
-    case 'LAST': {
-      const code = text + '[-1]';
-      return [code, Python.ORDER_MEMBER];
-    }
-    case 'FROM_START': {
-      const at = Python.getAdjustedInt(block, 'AT');
-      const code = text + '[' + at + ']';
-      return [code, Python.ORDER_MEMBER];
-    }
-    case 'FROM_END': {
-      const at = Python.getAdjustedInt(block, 'AT', 1, true);
-      const code = text + '[' + at + ']';
-      return [code, Python.ORDER_MEMBER];
-    }
-    case 'RANDOM': {
-      Python.definitions_['import_random'] = 'import random';
-      const functionName = Python.provideFunction_('text_random_letter', `
-def ${Python.FUNCTION_NAME_PLACEHOLDER_}(text):
-  x = int(random.random() * len(text))
-  return text[x]
-`);
-      const code = functionName + '(' + text + ')';
-      return [code, Python.ORDER_FUNCTION_CALL];
-    }
-  }
-  throw Error('Unhandled option (text_charAt).');
-};
-
-Python['text_getSubstring'] = function(block) {
-  // Get substring.
-  const where1 = block.getFieldValue('WHERE1');
-  const where2 = block.getFieldValue('WHERE2');
-  const text =
-      Python.valueToCode(block, 'STRING', Python.ORDER_MEMBER) || "''";
-  let at1;
-  switch (where1) {
-    case 'FROM_START':
-      at1 = Python.getAdjustedInt(block, 'AT1');
-      if (at1 === 0) {
-        at1 = '';
-      }
-      break;
-    case 'FROM_END':
-      at1 = Python.getAdjustedInt(block, 'AT1', 1, true);
-      break;
-    case 'FIRST':
-      at1 = '';
-      break;
-    default:
-      throw Error('Unhandled option (text_getSubstring)');
-  }
-
-  let at2;
-  switch (where2) {
-    case 'FROM_START':
-      at2 = Python.getAdjustedInt(block, 'AT2', 1);
-      break;
-    case 'FROM_END':
-      at2 = Python.getAdjustedInt(block, 'AT2', 0, true);
-      // Ensure that if the result calculated is 0 that sub-sequence will
-      // include all elements as expected.
-      if (!stringUtils.isNumber(String(at2))) {
-        Python.definitions_['import_sys'] = 'import sys';
-        at2 += ' or sys.maxsize';
-      } else if (at2 === 0) {
-        at2 = '';
-      }
-      break;
-    case 'LAST':
-      at2 = '';
-      break;
-    default:
-      throw Error('Unhandled option (text_getSubstring)');
-  }
-  const code = text + '[' + at1 + ' : ' + at2 + ']';
-  return [code, Python.ORDER_MEMBER];
-};
-
-Python['text_changeCase'] = function(block) {
-  // Change capitalization.
-  const OPERATORS = {
-    'UPPERCASE': '.upper()',
-    'LOWERCASE': '.lower()',
-    'TITLECASE': '.title()'
-  };
-  const operator = OPERATORS[block.getFieldValue('CASE')];
-  const text = Python.valueToCode(block, 'TEXT', Python.ORDER_MEMBER) || "''";
-  const code = text + operator;
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['text_trim'] = function(block) {
-  // Trim spaces.
-  const OPERATORS = {
-    'LEFT': '.lstrip()',
-    'RIGHT': '.rstrip()',
-    'BOTH': '.strip()'
-  };
-  const operator = OPERATORS[block.getFieldValue('MODE')];
-  const text = Python.valueToCode(block, 'TEXT', Python.ORDER_MEMBER) || "''";
-  const code = text + operator;
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['text_print'] = function(block) {
-  // Print statement.
-  const msg = Python.valueToCode(block, 'TEXT', Python.ORDER_NONE) || "''";
-  return 'print(' + msg + ')\n';
-};
-
-Python['text_prompt_ext'] = function(block) {
-  // Prompt function.
-  const functionName = Python.provideFunction_('text_prompt', `
-def ${Python.FUNCTION_NAME_PLACEHOLDER_}(msg):
-  try:
-    return raw_input(msg)
-  except NameError:
-    return input(msg)
-`);
-  let msg;
-  if (block.getField('TEXT')) {
-    // Internal message.
-    msg = Python.quote_(block.getFieldValue('TEXT'));
-  } else {
-    // External message.
-    msg = Python.valueToCode(block, 'TEXT', Python.ORDER_NONE) || "''";
-  }
-  let code = functionName + '(' + msg + ')';
-  const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
-  if (toNumber) {
-    code = 'float(' + code + ')';
-  }
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['text_prompt'] = Python['text_prompt_ext'];
-
-Python['text_count'] = function(block) {
-  const text = Python.valueToCode(block, 'TEXT', Python.ORDER_MEMBER) || "''";
-  const sub = Python.valueToCode(block, 'SUB', Python.ORDER_NONE) || "''";
-  const code = text + '.count(' + sub + ')';
-  return [code, Python.ORDER_FUNCTION_CALL];
-};
-
-Python['text_replace'] = function(block) {
-  const text = Python.valueToCode(block, 'TEXT', Python.ORDER_MEMBER) || "''";
-  const from = Python.valueToCode(block, 'FROM', Python.ORDER_NONE) || "''";
-  const to = Python.valueToCode(block, 'TO', Python.ORDER_NONE) || "''";
-  const code = text + '.replace(' + from + ', ' + to + ')';
-  return [code, Python.ORDER_MEMBER];
-};
-
-Python['text_reverse'] = function(block) {
-  const text = Python.valueToCode(block, 'TEXT', Python.ORDER_MEMBER) || "''";
-  const code = text + '[::-1]';
-  return [code, Python.ORDER_MEMBER];
-};

package/generators/python/variables.js

@@ -1,32 +0,0 @@
-/**
- * @license
- * Copyright 2012 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Python for variable blocks.
- */
-'use strict';
-
-goog.module('Blockly.Python.variables');
-
-const {NameType} = goog.require('Blockly.Names');
-const {pythonGenerator: Python} = goog.require('Blockly.Python');
-
-
-Python['variables_get'] = function(block) {
-  // Variable getter.
-  const code =
-      Python.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  return [code, Python.ORDER_ATOMIC];
-};
-
-Python['variables_set'] = function(block) {
-  // Variable setter.
-  const argument0 =
-      Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || '0';
-  const varName =
-      Python.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  return varName + ' = ' + argument0 + '\n';
-};

package/generators/python/variables_dynamic.js

@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Generating Python for dynamic variable blocks.
- */
-'use strict';
-
-goog.module('Blockly.Python.variablesDynamic');
-
-const {pythonGenerator: Python} = goog.require('Blockly.Python');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Python.variables');
-
-
-// Python is dynamically typed.
-Python['variables_get_dynamic'] = Python['variables_get'];
-Python['variables_set_dynamic'] = Python['variables_set'];