blockly 7.20211209.4 → 8.0.1

package/generators/php/text.js

@@ -32,22 +32,22 @@ PHP['text_multiline'] = function(block) {
 PHP['text_join'] = function(block) {
   // Create a string made up of any number of elements of any type.
   if (block.itemCount_ === 0) {
-    return ['\'\'', PHP.ORDER_ATOMIC];
+    return ["''", PHP.ORDER_ATOMIC];
   } else if (block.itemCount_ === 1) {
-    const element = PHP.valueToCode(block, 'ADD0', PHP.ORDER_NONE) || '\'\'';
+    const element = PHP.valueToCode(block, 'ADD0', PHP.ORDER_NONE) || "''";
     const code = element;
     return [code, PHP.ORDER_NONE];
   } else if (block.itemCount_ === 2) {
     const element0 =
-        PHP.valueToCode(block, 'ADD0', PHP.ORDER_STRING_CONCAT) || '\'\'';
+        PHP.valueToCode(block, 'ADD0', PHP.ORDER_STRING_CONCAT) || "''";
     const element1 =
-        PHP.valueToCode(block, 'ADD1', PHP.ORDER_STRING_CONCAT) || '\'\'';
+        PHP.valueToCode(block, 'ADD1', PHP.ORDER_STRING_CONCAT) || "''";
     const code = element0 + ' . ' + element1;
     return [code, PHP.ORDER_STRING_CONCAT];
   } else {
     const elements = new Array(block.itemCount_);
     for (let i = 0; i < block.itemCount_; i++) {
-      elements[i] = PHP.valueToCode(block, 'ADD' + i, PHP.ORDER_NONE) || '\'\'';
+      elements[i] = PHP.valueToCode(block, 'ADD' + i, PHP.ORDER_NONE) || "''";
     }
     const code = 'implode(\'\', array(' + elements.join(',') + '))';
     return [code, PHP.ORDER_FUNCTION_CALL];
@@ -58,24 +58,27 @@ PHP['text_append'] = function(block) {
   // Append to a variable in place.
   const varName =
       PHP.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  const value = PHP.valueToCode(block, 'TEXT', PHP.ORDER_ASSIGNMENT) || '\'\'';
+  const value = PHP.valueToCode(block, 'TEXT', PHP.ORDER_ASSIGNMENT) || "''";
   return varName + ' .= ' + value + ';\n';
 };
 
 PHP['text_length'] = function(block) {
   // String or array length.
-  const functionName = PHP.provideFunction_('length', [
-    'function ' + PHP.FUNCTION_NAME_PLACEHOLDER_ + '($value) {',
-    '  if (is_string($value)) {', '    return strlen($value);', '  } else {',
-    '    return count($value);', '  }', '}'
-  ]);
-  const text = PHP.valueToCode(block, 'VALUE', PHP.ORDER_NONE) || '\'\'';
+  const functionName = PHP.provideFunction_('length', `
+function ${PHP.FUNCTION_NAME_PLACEHOLDER_}($value) {
+  if (is_string($value)) {
+    return strlen($value);
+  }
+  return count($value);
+}
+`);
+  const text = PHP.valueToCode(block, 'VALUE', PHP.ORDER_NONE) || "''";
   return [functionName + '(' + text + ')', PHP.ORDER_FUNCTION_CALL];
 };
 
 PHP['text_isEmpty'] = function(block) {
   // Is the string null or array empty?
-  const text = PHP.valueToCode(block, 'VALUE', PHP.ORDER_NONE) || '\'\'';
+  const text = PHP.valueToCode(block, 'VALUE', PHP.ORDER_NONE) || "''";
   return ['empty(' + text + ')', PHP.ORDER_FUNCTION_CALL];
 };
 
@@ -83,8 +86,8 @@ PHP['text_indexOf'] = function(block) {
   // Search the text for a substring.
   const operator =
       block.getFieldValue('END') === 'FIRST' ? 'strpos' : 'strrpos';
-  const substring = PHP.valueToCode(block, 'FIND', PHP.ORDER_NONE) || '\'\'';
-  const text = PHP.valueToCode(block, 'VALUE', PHP.ORDER_NONE) || '\'\'';
+  const substring = PHP.valueToCode(block, 'FIND', PHP.ORDER_NONE) || "''";
+  const text = PHP.valueToCode(block, 'VALUE', PHP.ORDER_NONE) || "''";
   let errorIndex = ' -1';
   let indexAdjustment = '';
   if (block.workspace.options.oneBasedIndex) {
@@ -94,13 +97,12 @@ PHP['text_indexOf'] = function(block) {
   const functionName = PHP.provideFunction_(
       block.getFieldValue('END') === 'FIRST' ? 'text_indexOf' :
                                                'text_lastIndexOf',
-      [
-        'function ' + PHP.FUNCTION_NAME_PLACEHOLDER_ + '($text, $search) {',
-        '  $pos = ' + operator + '($text, $search);',
-        '  return $pos === false ? ' + errorIndex + ' : $pos' +
-            indexAdjustment + ';',
-        '}'
-      ]);
+      `
+function ${PHP.FUNCTION_NAME_PLACEHOLDER_}($text, $search) {
+  $pos = ${operator}($text, $search);
+  return $pos === false ? ${errorIndex} : $pos${indexAdjustment};
+}
+`);
   const code = functionName + '(' + text + ', ' + substring + ')';
   return [code, PHP.ORDER_FUNCTION_CALL];
 };
@@ -109,7 +111,7 @@ PHP['text_charAt'] = function(block) {
   // Get letter at index.
   const where = block.getFieldValue('WHERE') || 'FROM_START';
   const textOrder = (where === 'RANDOM') ? PHP.ORDER_NONE : PHP.ORDER_NONE;
-  const text = PHP.valueToCode(block, 'VALUE', textOrder) || '\'\'';
+  const text = PHP.valueToCode(block, 'VALUE', textOrder) || "''";
   switch (where) {
     case 'FIRST': {
       const code = 'substr(' + text + ', 0, 1)';
@@ -130,10 +132,11 @@ PHP['text_charAt'] = function(block) {
       return [code, PHP.ORDER_FUNCTION_CALL];
     }
     case 'RANDOM': {
-      const functionName = PHP.provideFunction_('text_random_letter', [
-        'function ' + PHP.FUNCTION_NAME_PLACEHOLDER_ + '($text) {',
-        '  return $text[rand(0, strlen($text) - 1)];', '}'
-      ]);
+      const functionName = PHP.provideFunction_('text_random_letter', `
+function ${PHP.FUNCTION_NAME_PLACEHOLDER_}($text) {
+  return $text[rand(0, strlen($text) - 1)];
+}
+`);
       const code = functionName + '(' + text + ')';
       return [code, PHP.ORDER_FUNCTION_CALL];
     }
@@ -145,36 +148,35 @@ PHP['text_getSubstring'] = function(block) {
   // Get substring.
   const where1 = block.getFieldValue('WHERE1');
   const where2 = block.getFieldValue('WHERE2');
-  const text = PHP.valueToCode(block, 'STRING', PHP.ORDER_NONE) || '\'\'';
+  const text = PHP.valueToCode(block, 'STRING', PHP.ORDER_NONE) || "''";
   if (where1 === 'FIRST' && where2 === 'LAST') {
     const code = text;
     return [code, PHP.ORDER_NONE];
   } else {
     const at1 = PHP.getAdjusted(block, 'AT1');
     const at2 = PHP.getAdjusted(block, 'AT2');
-    const functionName = PHP.provideFunction_('text_get_substring', [
-      'function ' + PHP.FUNCTION_NAME_PLACEHOLDER_ +
-          '($text, $where1, $at1, $where2, $at2) {',
-      '  if ($where1 == \'FROM_END\') {',
-      '    $at1 = strlen($text) - 1 - $at1;',
-      '  } else if ($where1 == \'FIRST\') {',
-      '    $at1 = 0;',
-      '  } else if ($where1 != \'FROM_START\') {',
-      '    throw new Exception(\'Unhandled option (text_get_substring).\');',
-      '  }',
-      '  $length = 0;',
-      '  if ($where2 == \'FROM_START\') {',
-      '    $length = $at2 - $at1 + 1;',
-      '  } else if ($where2 == \'FROM_END\') {',
-      '    $length = strlen($text) - $at1 - $at2;',
-      '  } else if ($where2 == \'LAST\') {',
-      '    $length = strlen($text) - $at1;',
-      '  } else {',
-      '    throw new Exception(\'Unhandled option (text_get_substring).\');',
-      '  }',
-      '  return substr($text, $at1, $length);',
-      '}'
-    ]);
+    const functionName = PHP.provideFunction_('text_get_substring', `
+function ${PHP.FUNCTION_NAME_PLACEHOLDER_}($text, $where1, $at1, $where2, $at2) {
+  if ($where1 == 'FROM_END') {
+    $at1 = strlen($text) - 1 - $at1;
+  } else if ($where1 == 'FIRST') {
+    $at1 = 0;
+  } else if ($where1 != 'FROM_START') {
+    throw new Exception('Unhandled option (text_get_substring).');
+  }
+  $length = 0;
+  if ($where2 == 'FROM_START') {
+    $length = $at2 - $at1 + 1;
+  } else if ($where2 == 'FROM_END') {
+    $length = strlen($text) - $at1 - $at2;
+  } else if ($where2 == 'LAST') {
+    $length = strlen($text) - $at1;
+  } else {
+    throw new Exception('Unhandled option (text_get_substring).');
+  }
+  return substr($text, $at1, $length);
+}
+`);
     const code = functionName + '(' + text + ', \'' + where1 + '\', ' + at1 +
         ', \'' + where2 + '\', ' + at2 + ')';
     return [code, PHP.ORDER_FUNCTION_CALL];
@@ -183,7 +185,7 @@ PHP['text_getSubstring'] = function(block) {
 
 PHP['text_changeCase'] = function(block) {
   // Change capitalization.
-  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || '\'\'';
+  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || "''";
   let code;
   if (block.getFieldValue('CASE') === 'UPPERCASE') {
     code = 'strtoupper(' + text + ')';
@@ -199,13 +201,13 @@ PHP['text_trim'] = function(block) {
   // Trim spaces.
   const OPERATORS = {'LEFT': 'ltrim', 'RIGHT': 'rtrim', 'BOTH': 'trim'};
   const operator = OPERATORS[block.getFieldValue('MODE')];
-  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || '\'\'';
+  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || "''";
   return [operator + '(' + text + ')', PHP.ORDER_FUNCTION_CALL];
 };
 
 PHP['text_print'] = function(block) {
   // Print statement.
-  const msg = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || '\'\'';
+  const msg = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || "''";
   return 'print(' + msg + ');\n';
 };
 
@@ -217,7 +219,7 @@ PHP['text_prompt_ext'] = function(block) {
     msg = PHP.quote_(block.getFieldValue('TEXT'));
   } else {
     // External message.
-    msg = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || '\'\'';
+    msg = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || "''";
   }
   let code = 'readline(' + msg + ')';
   const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
@@ -230,8 +232,8 @@ PHP['text_prompt_ext'] = function(block) {
 PHP['text_prompt'] = PHP['text_prompt_ext'];
 
 PHP['text_count'] = function(block) {
-  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || '\'\'';
-  const sub = PHP.valueToCode(block, 'SUB', PHP.ORDER_NONE) || '\'\'';
+  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || "''";
+  const sub = PHP.valueToCode(block, 'SUB', PHP.ORDER_NONE) || "''";
   const code = 'strlen(' + sub + ') === 0' +
       ' ? strlen(' + text + ') + 1' +
       ' : substr_count(' + text + ', ' + sub + ')';
@@ -239,15 +241,15 @@ PHP['text_count'] = function(block) {
 };
 
 PHP['text_replace'] = function(block) {
-  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || '\'\'';
-  const from = PHP.valueToCode(block, 'FROM', PHP.ORDER_NONE) || '\'\'';
-  const to = PHP.valueToCode(block, 'TO', PHP.ORDER_NONE) || '\'\'';
+  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || "''";
+  const from = PHP.valueToCode(block, 'FROM', PHP.ORDER_NONE) || "''";
+  const to = PHP.valueToCode(block, 'TO', PHP.ORDER_NONE) || "''";
   const code = 'str_replace(' + from + ', ' + to + ', ' + text + ')';
   return [code, PHP.ORDER_FUNCTION_CALL];
 };
 
 PHP['text_reverse'] = function(block) {
-  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || '\'\'';
+  const text = PHP.valueToCode(block, 'TEXT', PHP.ORDER_NONE) || "''";
   const code = 'strrev(' + text + ')';
   return [code, PHP.ORDER_FUNCTION_CALL];
 };

package/generators/python/colour.js

@@ -29,13 +29,13 @@ Python['colour_random'] = function(block) {
 
 Python['colour_rgb'] = function(block) {
   // Compose a colour from RGB components expressed as percentages.
-  const functionName = Python.provideFunction_('colour_rgb', [
-    'def ' + Python.FUNCTION_NAME_PLACEHOLDER_ + '(r, g, b):',
-    '  r = round(min(100, max(0, r)) * 2.55)',
-    '  g = round(min(100, max(0, g)) * 2.55)',
-    '  b = round(min(100, max(0, b)) * 2.55)',
-    '  return \'#%02x%02x%02x\' % (r, g, b)'
-  ]);
+  const functionName = Python.provideFunction_('colour_rgb', `
+def ${Python.FUNCTION_NAME_PLACEHOLDER_}(r, g, b):
+  r = round(min(100, max(0, r)) * 2.55)
+  g = round(min(100, max(0, g)) * 2.55)
+  b = round(min(100, max(0, b)) * 2.55)
+  return \'#%02x%02x%02x\' % (r, g, b)
+`);
   const r = Python.valueToCode(block, 'RED', Python.ORDER_NONE) || 0;
   const g = Python.valueToCode(block, 'GREEN', Python.ORDER_NONE) || 0;
   const b = Python.valueToCode(block, 'BLUE', Python.ORDER_NONE) || 0;
@@ -45,17 +45,17 @@ Python['colour_rgb'] = function(block) {
 
 Python['colour_blend'] = function(block) {
   // Blend two colours together.
-  const functionName = Python.provideFunction_('colour_blend', [
-    'def ' + Python.FUNCTION_NAME_PLACEHOLDER_ + '(colour1, colour2, ratio):',
-    '  r1, r2 = int(colour1[1:3], 16), int(colour2[1:3], 16)',
-    '  g1, g2 = int(colour1[3:5], 16), int(colour2[3:5], 16)',
-    '  b1, b2 = int(colour1[5:7], 16), int(colour2[5:7], 16)',
-    '  ratio = min(1, max(0, ratio))',
-    '  r = round(r1 * (1 - ratio) + r2 * ratio)',
-    '  g = round(g1 * (1 - ratio) + g2 * ratio)',
-    '  b = round(b1 * (1 - ratio) + b2 * ratio)',
-    '  return \'#%02x%02x%02x\' % (r, g, b)'
-  ]);
+  const functionName = Python.provideFunction_('colour_blend', `
+def ${Python.FUNCTION_NAME_PLACEHOLDER_}(colour1, colour2, ratio):
+  r1, r2 = int(colour1[1:3], 16), int(colour2[1:3], 16)
+  g1, g2 = int(colour1[3:5], 16), int(colour2[3:5], 16)
+  b1, b2 = int(colour1[5:7], 16), int(colour2[5:7], 16)
+  ratio = min(1, max(0, ratio))
+  r = round(r1 * (1 - ratio) + r2 * ratio)
+  g = round(g1 * (1 - ratio) + g2 * ratio)
+  b = round(b1 * (1 - ratio) + b2 * ratio)
+  return \'#%02x%02x%02x\' % (r, g, b)
+`);
   const colour1 =
       Python.valueToCode(block, 'COLOUR1', Python.ORDER_NONE) || '\'#000000\'';
   const colour2 =

package/generators/python/lists.js

@@ -57,7 +57,7 @@ Python['lists_isEmpty'] = function(block) {
 Python['lists_indexOf'] = function(block) {
   // Find an item in the list.
   const item = Python.valueToCode(block, 'FIND', Python.ORDER_NONE) || '[]';
-  const list = Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || '\'\'';
+  const list = Python.valueToCode(block, 'VALUE', Python.ORDER_NONE) || "''";
   let errorIndex = ' -1';
   let firstIndexAdjustment = '';
   let lastIndexAdjustment = ' - 1';
@@ -68,21 +68,22 @@ Python['lists_indexOf'] = function(block) {
     lastIndexAdjustment = '';
   }
 
+  let functionName;
   if (block.getFieldValue('END') === 'FIRST') {
-    const functionName = Python.provideFunction_('first_index', [
-      'def ' + Python.FUNCTION_NAME_PLACEHOLDER_ + '(my_list, elem):',
-      '  try: index = my_list.index(elem)' + firstIndexAdjustment,
-      '  except: index =' + errorIndex, '  return index'
-    ]);
-    const code = functionName + '(' + list + ', ' + item + ')';
-    return [code, Python.ORDER_FUNCTION_CALL];
+    functionName = Python.provideFunction_('first_index', `
+def ${Python.FUNCTION_NAME_PLACEHOLDER_}(my_list, elem):
+  try: index = my_list.index(elem)${firstIndexAdjustment}
+  except: index =${errorIndex}
+  return index
+`);
+  } else {
+    functionName = Python.provideFunction_('last_index', `
+def ${Python.FUNCTION_NAME_PLACEHOLDER_}(my_list, elem):
+  try: index = len(my_list) - my_list[::-1].index(elem)${lastIndexAdjustment}
+  except: index =${errorIndex}
+  return index
+`);
   }
-  const functionName = Python.provideFunction_('last_index', [
-    'def ' + Python.FUNCTION_NAME_PLACEHOLDER_ + '(my_list, elem):',
-    '  try: index = len(my_list) - my_list[::-1].index(elem)' +
-        lastIndexAdjustment,
-    '  except: index =' + errorIndex, '  return index'
-  ]);
   const code = functionName + '(' + list + ', ' + item + ')';
   return [code, Python.ORDER_FUNCTION_CALL];
 };
@@ -152,11 +153,11 @@ Python['lists_getIndex'] = function(block) {
         return [code, Python.ORDER_FUNCTION_CALL];
       } else {
         const functionName =
-            Python.provideFunction_('lists_remove_random_item', [
-              'def ' + Python.FUNCTION_NAME_PLACEHOLDER_ + '(myList):',
-              '  x = int(random.random() * len(myList))',
-              '  return myList.pop(x)'
-            ]);
+            Python.provideFunction_('lists_remove_random_item', `
+def ${Python.FUNCTION_NAME_PLACEHOLDER_}(myList):
+  x = int(random.random() * len(myList))
+  return myList.pop(x)
+`);
         const code = functionName + '(' + list + ')';
         if (mode === 'GET_REMOVE') {
           return [code, Python.ORDER_FUNCTION_CALL];
@@ -294,15 +295,22 @@ Python['lists_sort'] = function(block) {
   const list = (Python.valueToCode(block, 'LIST', Python.ORDER_NONE) || '[]');
   const type = block.getFieldValue('TYPE');
   const reverse = block.getFieldValue('DIRECTION') === '1' ? 'False' : 'True';
-  const sortFunctionName = Python.provideFunction_('lists_sort', [
-    'def ' + Python.FUNCTION_NAME_PLACEHOLDER_ + '(my_list, type, reverse):',
-    '  def try_float(s):', '    try:', '      return float(s)', '    except:',
-    '      return 0', '  key_funcs = {', '    "NUMERIC": try_float,',
-    '    "TEXT": str,', '    "IGNORE_CASE": lambda s: str(s).lower()', '  }',
-    '  key_func = key_funcs[type]',
-    '  list_cpy = list(my_list)',  // Clone the list.
-    '  return sorted(list_cpy, key=key_func, reverse=reverse)'
-  ]);
+  const sortFunctionName = Python.provideFunction_('lists_sort', `
+def ${Python.FUNCTION_NAME_PLACEHOLDER_}(my_list, type, reverse):
+  def try_float(s):
+    try:
+      return float(s)
+    except:
+      return 0
+  key_funcs = {
+    "NUMERIC": try_float,
+    "TEXT": str,
+    "IGNORE_CASE": lambda s: str(s).lower()
+  }
+  key_func = key_funcs[type]
+  list_cpy = list(my_list)
+  return sorted(list_cpy, key=key_func, reverse=reverse)
+`);
 
   const code =
       sortFunctionName + '(' + list + ', "' + type + '", ' + reverse + ')';
@@ -315,14 +323,14 @@ Python['lists_split'] = function(block) {
   let code;
   if (mode === 'SPLIT') {
     const value_input =
-        Python.valueToCode(block, 'INPUT', Python.ORDER_MEMBER) || '\'\'';
+        Python.valueToCode(block, 'INPUT', Python.ORDER_MEMBER) || "''";
     const value_delim = Python.valueToCode(block, 'DELIM', Python.ORDER_NONE);
     code = value_input + '.split(' + value_delim + ')';
   } else if (mode === 'JOIN') {
     const value_input =
         Python.valueToCode(block, 'INPUT', Python.ORDER_NONE) || '[]';
     const value_delim =
-        Python.valueToCode(block, 'DELIM', Python.ORDER_MEMBER) || '\'\'';
+        Python.valueToCode(block, 'DELIM', Python.ORDER_MEMBER) || "''";
     code = value_delim + '.join(' + value_input + ')';
   } else {
     throw Error('Unknown mode: ' + mode);

package/generators/python/loops.js

@@ -70,16 +70,20 @@ Python['controls_for'] = function(block) {
 
   // Helper functions.
   const defineUpRange = function() {
-    return Python.provideFunction_('upRange', [
-      'def ' + Python.FUNCTION_NAME_PLACEHOLDER_ + '(start, stop, step):',
-      '  while start <= stop:', '    yield start', '    start += abs(step)'
-    ]);
+    return Python.provideFunction_('upRange', `
+def ${Python.FUNCTION_NAME_PLACEHOLDER_}(start, stop, step):
+  while start <= stop:
+    yield start
+    start += abs(step)
+`);
   };
   const defineDownRange = function() {
-    return Python.provideFunction_('downRange', [
-      'def ' + Python.FUNCTION_NAME_PLACEHOLDER_ + '(start, stop, step):',
-      '  while start >= stop:', '    yield start', '    start -= abs(step)'
-    ]);
+    return Python.provideFunction_('downRange', `
+def ${Python.FUNCTION_NAME_PLACEHOLDER_}(start, stop, step):
+  while start >= stop:
+    yield start
+    start -= abs(step)
+`);
   };
   // Arguments are legal Python code (numbers or strings returned by scrub()).
   const generateUpDownRange = function(start, end, inc) {