refactor(generators)!: Pass this CodeGenerator to individual generator functions (#7168)

* feat(generators): Pass this CodeGenerator to generator functions This implements option 1A of proposal 1 of #7086. This commit is not by itself a breaking change, except in the unlikely event that developers' custom generator functions take an (optional) second argument of a dfferent type. * feat(generators): Accept generator argument in block functions Accept a CodeGenerator instance as parameter two of every per-block-type generator function. * fix(generators): Pass generator when calling other generator functions Make sure to pass generator to any other block functions that are called recursively. * refactor(generators)!: Use generator argument in generator functions Refactor per-block-type generator functions to use the provided generator argument to make recursive calls, rather than depending on the closed-over <lang>Generator instance. This allows generator functions to be moved between CodeGenerator instances (of the same language, at least). This commit was created by search-and-replace and addresses most but not all recursive references; remaining uses will require manual attention and will be dealt with in a following commit. BREAKING CHANGE: This commit makes the generator functions we provide dependent on the new generator parameter. Although CodeGenerator.prototype.blockToCode has been modified to supply this, so this change will not affect most developers, this change will be a breaking change where developers make direct calls to these generator functions without supplying the generator parameter. See previous commit for an example of the update required. * refactor(generators): Manual fix for remaining uses of langGenerator Manually replace remaining uses of <lang>Generator in block generator functions. * fix(generators): Delete duplicate procedures_callnoreturn generator For some reason the generator function for procedures_callnoreturn appears twice in generators/javascript/procedures.js. Delete the first copy (since the second one overwrote it anyway). * chore(generators): Format
2026-01-05 08:00:09 +01:00 · 2023-06-14 23:25:36 +01:00
parent 12b91ae49c
commit a3458871db
44 changed files with 1474 additions and 1477 deletions
--- a/generators/dart/colour.js
+++ b/generators/dart/colour.js
@@ -16,18 +16,18 @@ import {dartGenerator, Order} from '../dart.js';

 dartGenerator.addReservedWords('Math');

-dartGenerator.forBlock['colour_picker'] = function(block) {
+dartGenerator.forBlock['colour_picker'] = function(block, generator) {
  // Colour picker.
-  const code = dartGenerator.quote_(block.getFieldValue('COLOUR'));
+  const code = generator.quote_(block.getFieldValue('COLOUR'));
  return [code, Order.ATOMIC];
 };

-dartGenerator.forBlock['colour_random'] = function(block) {
+dartGenerator.forBlock['colour_random'] = function(block, generator) {
  // Generate a random colour.
-  dartGenerator.definitions_['import_dart_math'] =
+  generator.definitions_['import_dart_math'] =
      "import 'dart:math' as Math;";
-  const functionName = dartGenerator.provideFunction_('colour_random', `
-String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}() {
+  const functionName = generator.provideFunction_('colour_random', `
+String ${generator.FUNCTION_NAME_PLACEHOLDER_}() {
  String hex = '0123456789abcdef';
  var rnd = new Math.Random();
  return '#\${hex[rnd.nextInt(16)]}\${hex[rnd.nextInt(16)]}'
@@ -39,16 +39,16 @@ String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}() {
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['colour_rgb'] = function(block) {
+dartGenerator.forBlock['colour_rgb'] = function(block, generator) {
  // Compose a colour from RGB components expressed as percentages.
-  const red = dartGenerator.valueToCode(block, 'RED', Order.NONE) || 0;
-  const green = dartGenerator.valueToCode(block, 'GREEN', Order.NONE) || 0;
-  const blue = dartGenerator.valueToCode(block, 'BLUE', Order.NONE) || 0;
+  const red = generator.valueToCode(block, 'RED', Order.NONE) || 0;
+  const green = generator.valueToCode(block, 'GREEN', Order.NONE) || 0;
+  const blue = generator.valueToCode(block, 'BLUE', Order.NONE) || 0;

-  dartGenerator.definitions_['import_dart_math'] =
+  generator.definitions_['import_dart_math'] =
      "import 'dart:math' as Math;";
-  const functionName = dartGenerator.provideFunction_('colour_rgb', `
-String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(num r, num g, num b) {
+  const functionName = generator.provideFunction_('colour_rgb', `
+String ${generator.FUNCTION_NAME_PLACEHOLDER_}(num r, num g, num b) {
  num rn = (Math.max(Math.min(r, 100), 0) * 2.55).round();
  String rs = rn.toInt().toRadixString(16);
  rs = '0$rs';
@@ -68,19 +68,19 @@ String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(num r, num g, num b) {
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['colour_blend'] = function(block) {
+dartGenerator.forBlock['colour_blend'] = function(block, generator) {
  // Blend two colours together.
  const c1 =
-      dartGenerator.valueToCode(block, 'COLOUR1', Order.NONE) || "'#000000'";
+      generator.valueToCode(block, 'COLOUR1', Order.NONE) || "'#000000'";
  const c2 =
-      dartGenerator.valueToCode(block, 'COLOUR2', Order.NONE) || "'#000000'";
+      generator.valueToCode(block, 'COLOUR2', Order.NONE) || "'#000000'";
  const ratio =
-      dartGenerator.valueToCode(block, 'RATIO', Order.NONE) || 0.5;
+      generator.valueToCode(block, 'RATIO', Order.NONE) || 0.5;

-  dartGenerator.definitions_['import_dart_math'] =
+  generator.definitions_['import_dart_math'] =
      "import 'dart:math' as Math;";
-  const functionName = dartGenerator.provideFunction_('colour_blend', `
-String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String c1, String c2, num ratio) {
+  const functionName = generator.provideFunction_('colour_blend', `
+String ${generator.FUNCTION_NAME_PLACEHOLDER_}(String c1, String c2, num ratio) {
  ratio = Math.max(Math.min(ratio, 1), 0);
  int r1 = int.parse('0x\${c1.substring(1, 3)}');
  int g1 = int.parse('0x\${c1.substring(3, 5)}');
--- a/generators/dart/lists.js
+++ b/generators/dart/lists.js
@@ -17,53 +17,53 @@ import {dartGenerator, Order} from '../dart.js';

 dartGenerator.addReservedWords('Math');

-dartGenerator.forBlock['lists_create_empty'] = function(block) {
+dartGenerator.forBlock['lists_create_empty'] = function(block, generator) {
  // Create an empty list.
  return ['[]', Order.ATOMIC];
 };

-dartGenerator.forBlock['lists_create_with'] = function(block) {
+dartGenerator.forBlock['lists_create_with'] = function(block, generator) {
  // Create a list with any number of elements of any type.
  const elements = new Array(block.itemCount_);
  for (let i = 0; i < block.itemCount_; i++) {
    elements[i] =
-        dartGenerator.valueToCode(block, 'ADD' + i, Order.NONE) || 'null';
+        generator.valueToCode(block, 'ADD' + i, Order.NONE) || 'null';
  }
  const code = '[' + elements.join(', ') + ']';
  return [code, Order.ATOMIC];
 };

-dartGenerator.forBlock['lists_repeat'] = function(block) {
+dartGenerator.forBlock['lists_repeat'] = function(block, generator) {
  // Create a list with one element repeated.
  const element =
-      dartGenerator.valueToCode(block, 'ITEM', Order.NONE) || 'null';
+      generator.valueToCode(block, 'ITEM', Order.NONE) || 'null';
  const repeatCount =
-      dartGenerator.valueToCode(block, 'NUM', Order.NONE) || '0';
+      generator.valueToCode(block, 'NUM', Order.NONE) || '0';
  const code = 'new List.filled(' + repeatCount + ', ' + element + ')';
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['lists_length'] = function(block) {
+dartGenerator.forBlock['lists_length'] = function(block, generator) {
  // String or array length.
  const list =
-      dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || '[]';
+      generator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || '[]';
  return [list + '.length', Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['lists_isEmpty'] = function(block) {
+dartGenerator.forBlock['lists_isEmpty'] = function(block, generator) {
  // Is the string null or array empty?
  const list =
-      dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || '[]';
+      generator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || '[]';
  return [list + '.isEmpty', Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['lists_indexOf'] = function(block) {
+dartGenerator.forBlock['lists_indexOf'] = function(block, generator) {
  // Find an item in the list.
  const operator =
      block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
-  const item = dartGenerator.valueToCode(block, 'FIND', Order.NONE) || "''";
+  const item = generator.valueToCode(block, 'FIND', Order.NONE) || "''";
  const list =
-      dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || '[]';
+      generator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || '[]';
  const code = list + '.' + operator + '(' + item + ')';
  if (block.workspace.options.oneBasedIndex) {
    return [code + ' + 1', Order.ADDITIVE];
@@ -71,7 +71,7 @@ dartGenerator.forBlock['lists_indexOf'] = function(block) {
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['lists_getIndex'] = function(block) {
+dartGenerator.forBlock['lists_getIndex'] = function(block, generator) {
  // Get element at index.
  // Note: Until January 2013 this block did not have MODE or WHERE inputs.
  const mode = block.getFieldValue('MODE') || 'GET';
@@ -79,12 +79,12 @@ dartGenerator.forBlock['lists_getIndex'] = function(block) {
  const listOrder = (where === 'RANDOM' || where === 'FROM_END') ?
      Order.NONE :
      Order.UNARY_POSTFIX;
-  let list = dartGenerator.valueToCode(block, 'VALUE', listOrder) || '[]';
+  let list = generator.valueToCode(block, 'VALUE', listOrder) || '[]';
  // Cache non-trivial values to variables to prevent repeated look-ups.
  // Closure, which accesses and modifies 'list'.
  function cacheList() {
    const listVar =
-        dartGenerator.nameDB_.getDistinctName('tmp_list', NameType.VARIABLE);
+        generator.nameDB_.getDistinctName('tmp_list', NameType.VARIABLE);
    const code = 'List ' + listVar + ' = ' + list + ';\n';
    list = listVar;
    return code;
@@ -96,12 +96,12 @@ dartGenerator.forBlock['lists_getIndex'] = function(block) {
      !list.match(/^\w+$/)) {
    // `list` is an expression, so we may not evaluate it more than once.
    if (where === 'RANDOM') {
-      dartGenerator.definitions_['import_dart_math'] =
+      generator.definitions_['import_dart_math'] =
          'import \'dart:math\' as Math;';
      // We can use multiple statements.
      let code = cacheList();
      const xVar =
-          dartGenerator.nameDB_.getDistinctName('tmp_x', NameType.VARIABLE);
+          generator.nameDB_.getDistinctName('tmp_x', NameType.VARIABLE);
      code += 'int ' + xVar + ' = new Math.Random().nextInt(' + list +
          '.length);\n';
      code += list + '.removeAt(' + xVar + ');\n';
@@ -110,17 +110,17 @@ dartGenerator.forBlock['lists_getIndex'] = function(block) {
      if (mode === 'REMOVE') {
        // We can use multiple statements.
        const at =
-            dartGenerator.getAdjusted(block, 'AT', 1, false, Order.ADDITIVE);
+            generator.getAdjusted(block, 'AT', 1, false, Order.ADDITIVE);
        let code = cacheList();
        code += list + '.removeAt(' + list + '.length' +
            ' - ' + at + ');\n';
        return code;

      } else if (mode === 'GET') {
-        const at = dartGenerator.getAdjusted(block, 'AT', 1);
+        const at = generator.getAdjusted(block, 'AT', 1);
        // We need to create a procedure to avoid reevaluating values.
-        const functionName = dartGenerator.provideFunction_('lists_get_from_end', `
-dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
+        const functionName = generator.provideFunction_('lists_get_from_end', `
+dynamic ${generator.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
  x = my_list.length - x;
  return my_list[x];
 }
@@ -128,11 +128,11 @@ dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
        const code = functionName + '(' + list + ', ' + at + ')';
        return [code, Order.UNARY_POSTFIX];
      } else if (mode === 'GET_REMOVE') {
-        const at = dartGenerator.getAdjusted(block, 'AT', 1);
+        const at = generator.getAdjusted(block, 'AT', 1);
        // We need to create a procedure to avoid reevaluating values.
        const functionName =
-            dartGenerator.provideFunction_('lists_remove_from_end', `
-dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
+            generator.provideFunction_('lists_remove_from_end', `
+dynamic ${generator.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
  x = my_list.length - x;
  return my_list.removeAt(x);
 }
@@ -168,7 +168,7 @@ dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
        }
        break;
      case 'FROM_START': {
-        const at = dartGenerator.getAdjusted(block, 'AT');
+        const at = generator.getAdjusted(block, 'AT');
        if (mode === 'GET') {
          const code = list + '[' + at + ']';
          return [code, Order.UNARY_POSTFIX];
@@ -182,7 +182,7 @@ dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
      }
      case 'FROM_END': {
        const at =
-            dartGenerator.getAdjusted(block, 'AT', 1, false, Order.ADDITIVE);
+            generator.getAdjusted(block, 'AT', 1, false, Order.ADDITIVE);
        if (mode === 'GET') {
          const code = list + '[' + list + '.length - ' + at + ']';
          return [code, Order.UNARY_POSTFIX];
@@ -197,20 +197,20 @@ dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
        break;
      }
      case 'RANDOM':
-        dartGenerator.definitions_['import_dart_math'] =
+        generator.definitions_['import_dart_math'] =
            'import \'dart:math\' as Math;';
        if (mode === 'REMOVE') {
          // We can use multiple statements.
          const xVar =
-              dartGenerator.nameDB_.getDistinctName('tmp_x', NameType.VARIABLE);
+              generator.nameDB_.getDistinctName('tmp_x', NameType.VARIABLE);
          let code = 'int ' + xVar + ' = new Math.Random().nextInt(' + list +
              '.length);\n';
          code += list + '.removeAt(' + xVar + ');\n';
          return code;
        } else if (mode === 'GET') {
          const functionName =
-              dartGenerator.provideFunction_('lists_get_random_item', `
-dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
+              generator.provideFunction_('lists_get_random_item', `
+dynamic ${generator.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
  int x = new Math.Random().nextInt(my_list.length);
  return my_list[x];
 }
@@ -219,8 +219,8 @@ dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
          return [code, Order.UNARY_POSTFIX];
        } else if (mode === 'GET_REMOVE') {
          const functionName =
-              dartGenerator.provideFunction_('lists_remove_random_item', `
-dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
+              generator.provideFunction_('lists_remove_random_item', `
+dynamic ${generator.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
  int x = new Math.Random().nextInt(my_list.length);
  return my_list.removeAt(x);
 }
@@ -234,15 +234,15 @@ dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
  throw Error('Unhandled combination (lists_getIndex).');
 };

-dartGenerator.forBlock['lists_setIndex'] = function(block) {
+dartGenerator.forBlock['lists_setIndex'] = function(block, generator) {
  // Set element at index.
  // Note: Until February 2013 this block did not have MODE or WHERE inputs.
  const mode = block.getFieldValue('MODE') || 'GET';
  const where = block.getFieldValue('WHERE') || 'FROM_START';
  let list =
-      dartGenerator.valueToCode(block, 'LIST', Order.UNARY_POSTFIX) || '[]';
+      generator.valueToCode(block, 'LIST', Order.UNARY_POSTFIX) || '[]';
  const value =
-      dartGenerator.valueToCode(block, 'TO', Order.ASSIGNMENT) || 'null';
+      generator.valueToCode(block, 'TO', Order.ASSIGNMENT) || 'null';
  // Cache non-trivial values to variables to prevent repeated look-ups.
  // Closure, which accesses and modifies 'list'.
  function cacheList() {
@@ -250,7 +250,7 @@ dartGenerator.forBlock['lists_setIndex'] = function(block) {
      return '';
    }
    const listVar =
-        dartGenerator.nameDB_.getDistinctName('tmp_list', NameType.VARIABLE);
+        generator.nameDB_.getDistinctName('tmp_list', NameType.VARIABLE);
    const code = 'List ' + listVar + ' = ' + list + ';\n';
    list = listVar;
    return code;
@@ -273,7 +273,7 @@ dartGenerator.forBlock['lists_setIndex'] = function(block) {
      }
      break;
    case 'FROM_START': {
-      const at = dartGenerator.getAdjusted(block, 'AT');
+      const at = generator.getAdjusted(block, 'AT');
      if (mode === 'SET') {
        return list + '[' + at + '] = ' + value + ';\n';
      } else if (mode === 'INSERT') {
@@ -283,7 +283,7 @@ dartGenerator.forBlock['lists_setIndex'] = function(block) {
    }
    case 'FROM_END': {
      const at =
-          dartGenerator.getAdjusted(block, 'AT', 1, false, Order.ADDITIVE);
+          generator.getAdjusted(block, 'AT', 1, false, Order.ADDITIVE);
      let code = cacheList();
      if (mode === 'SET') {
        code += list + '[' + list + '.length - ' + at + '] = ' + value + ';\n';
@@ -296,11 +296,11 @@ dartGenerator.forBlock['lists_setIndex'] = function(block) {
      break;
    }
    case 'RANDOM': {
-      dartGenerator.definitions_['import_dart_math'] =
+      generator.definitions_['import_dart_math'] =
          'import \'dart:math\' as Math;';
      let code = cacheList();
      const xVar =
-          dartGenerator.nameDB_.getDistinctName('tmp_x', NameType.VARIABLE);
+          generator.nameDB_.getDistinctName('tmp_x', NameType.VARIABLE);
      code += 'int ' + xVar + ' = new Math.Random().nextInt(' + list +
          '.length);\n';
      if (mode === 'SET') {
@@ -316,10 +316,10 @@ dartGenerator.forBlock['lists_setIndex'] = function(block) {
  throw Error('Unhandled combination (lists_setIndex).');
 };

-dartGenerator.forBlock['lists_getSublist'] = function(block) {
+dartGenerator.forBlock['lists_getSublist'] = function(block, generator) {
  // Get sublist.
  const list =
-      dartGenerator.valueToCode(block, 'LIST', Order.UNARY_POSTFIX) || '[]';
+      generator.valueToCode(block, 'LIST', Order.UNARY_POSTFIX) || '[]';
  const where1 = block.getFieldValue('WHERE1');
  const where2 = block.getFieldValue('WHERE2');
  let code;
@@ -330,10 +330,10 @@ dartGenerator.forBlock['lists_getSublist'] = function(block) {
    let at1;
    switch (where1) {
      case 'FROM_START':
-        at1 = dartGenerator.getAdjusted(block, 'AT1');
+        at1 = generator.getAdjusted(block, 'AT1');
        break;
      case 'FROM_END':
-        at1 = dartGenerator.getAdjusted(block, 'AT1', 1, false, Order.ADDITIVE);
+        at1 = generator.getAdjusted(block, 'AT1', 1, false, Order.ADDITIVE);
        at1 = list + '.length - ' + at1;
        break;
      case 'FIRST':
@@ -345,10 +345,10 @@ dartGenerator.forBlock['lists_getSublist'] = function(block) {
    let at2;
    switch (where2) {
      case 'FROM_START':
-        at2 = dartGenerator.getAdjusted(block, 'AT2', 1);
+        at2 = generator.getAdjusted(block, 'AT2', 1);
        break;
      case 'FROM_END':
-        at2 = dartGenerator.getAdjusted(block, 'AT2', 0, false, Order.ADDITIVE);
+        at2 = generator.getAdjusted(block, 'AT2', 0, false, Order.ADDITIVE);
        at2 = list + '.length - ' + at2;
        break;
      case 'LAST':
@@ -363,10 +363,10 @@ dartGenerator.forBlock['lists_getSublist'] = function(block) {
      code = list + '.sublist(' + at1 + ', ' + at2 + ')';
    }
  } else {
-    const at1 = dartGenerator.getAdjusted(block, 'AT1');
-    const at2 = dartGenerator.getAdjusted(block, 'AT2');
-    const functionName = dartGenerator.provideFunction_('lists_get_sublist', `
-List ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List list, String where1, num at1, String where2, num at2) {
+    const at1 = generator.getAdjusted(block, 'AT1');
+    const at2 = generator.getAdjusted(block, 'AT2');
+    const functionName = generator.provideFunction_('lists_get_sublist', `
+List ${generator.FUNCTION_NAME_PLACEHOLDER_}(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;
@@ -390,13 +390,13 @@ List ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List list, String where1, num a
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['lists_sort'] = function(block) {
+dartGenerator.forBlock['lists_sort'] = function(block, generator) {
  // Block for sorting a list.
-  const list = dartGenerator.valueToCode(block, 'LIST', Order.NONE) || '[]';
+  const list = generator.valueToCode(block, 'LIST', Order.NONE) || '[]';
  const direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
  const type = block.getFieldValue('TYPE');
-  const sortFunctionName = dartGenerator.provideFunction_('lists_sort', `
-List ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List list, String type, int direction) {
+  const sortFunctionName = generator.provideFunction_('lists_sort', `
+List ${generator.FUNCTION_NAME_PLACEHOLDER_}(List list, String type, int direction) {
  var compareFuncs = {
    'NUMERIC': (a, b) => (direction * a.compareTo(b)).toInt(),
    'TEXT': (a, b) => direction * a.toString().compareTo(b.toString()),
@@ -417,11 +417,11 @@ List ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List list, String type, int dir
  ];
 };

-dartGenerator.forBlock['lists_split'] = function(block) {
+dartGenerator.forBlock['lists_split'] = function(block, generator) {
  // Block for splitting text into a list, or joining a list into text.
-  let input = dartGenerator.valueToCode(block, 'INPUT', Order.UNARY_POSTFIX);
+  let input = generator.valueToCode(block, 'INPUT', Order.UNARY_POSTFIX);
  const delimiter =
-      dartGenerator.valueToCode(block, 'DELIM', Order.NONE) || "''";
+      generator.valueToCode(block, 'DELIM', Order.NONE) || "''";
  const mode = block.getFieldValue('MODE');
  let functionName;
  if (mode === 'SPLIT') {
@@ -441,9 +441,9 @@ dartGenerator.forBlock['lists_split'] = function(block) {
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['lists_reverse'] = function(block) {
+dartGenerator.forBlock['lists_reverse'] = function(block, generator) {
  // Block for reversing a list.
-  const list = dartGenerator.valueToCode(block, 'LIST', Order.NONE) || '[]';
+  const list = generator.valueToCode(block, 'LIST', Order.NONE) || '[]';
  // XXX What should the operator precedence be for a `new`?
  const code = 'new List.from(' + list + '.reversed)';
  return [code, Order.UNARY_POSTFIX];
--- a/generators/dart/logic.js
+++ b/generators/dart/logic.js
@@ -14,23 +14,23 @@ goog.declareModuleId('Blockly.Dart.logic');
 import {dartGenerator, Order} from '../dart.js';


-dartGenerator.forBlock['controls_if'] = function(block) {
+dartGenerator.forBlock['controls_if'] = function(block, generator) {
  // If/elseif/else condition.
  let n = 0;
  let code = '', branchCode, conditionCode;
-  if (dartGenerator.STATEMENT_PREFIX) {
+  if (generator.STATEMENT_PREFIX) {
    // Automatic prefix insertion is switched off for this block.  Add manually.
-    code += dartGenerator.injectId(dartGenerator.STATEMENT_PREFIX, block);
+    code += generator.injectId(generator.STATEMENT_PREFIX, block);
  }
  do {
    conditionCode =
-        dartGenerator.valueToCode(block, 'IF' + n, Order.NONE) || 'false';
-    branchCode = dartGenerator.statementToCode(block, 'DO' + n);
-    if (dartGenerator.STATEMENT_SUFFIX) {
+        generator.valueToCode(block, 'IF' + n, Order.NONE) || 'false';
+    branchCode = generator.statementToCode(block, 'DO' + n);
+    if (generator.STATEMENT_SUFFIX) {
      branchCode =
-          dartGenerator.prefixLines(
-            dartGenerator.injectId(
-              dartGenerator.STATEMENT_SUFFIX, block), dartGenerator.INDENT) +
+          generator.prefixLines(
+            generator.injectId(
+              generator.STATEMENT_SUFFIX, block), generator.INDENT) +
          branchCode;
    }
    code += (n > 0 ? 'else ' : '') + 'if (' + conditionCode + ') {\n' +
@@ -38,13 +38,13 @@ dartGenerator.forBlock['controls_if'] = function(block) {
    n++;
  } while (block.getInput('IF' + n));

-  if (block.getInput('ELSE') || dartGenerator.STATEMENT_SUFFIX) {
-    branchCode = dartGenerator.statementToCode(block, 'ELSE');
-    if (dartGenerator.STATEMENT_SUFFIX) {
+  if (block.getInput('ELSE') || generator.STATEMENT_SUFFIX) {
+    branchCode = generator.statementToCode(block, 'ELSE');
+    if (generator.STATEMENT_SUFFIX) {
      branchCode =
-          dartGenerator.prefixLines(
-            dartGenerator.injectId(
-              dartGenerator.STATEMENT_SUFFIX, block), dartGenerator.INDENT) +
+          generator.prefixLines(
+            generator.injectId(
+              generator.STATEMENT_SUFFIX, block), generator.INDENT) +
          branchCode;
    }
    code += ' else {\n' + branchCode + '}';
@@ -55,7 +55,7 @@ dartGenerator.forBlock['controls_if'] = function(block) {
 dartGenerator.forBlock['controls_ifelse'] =
    dartGenerator.forBlock['controls_if'];

-dartGenerator.forBlock['logic_compare'] = function(block) {
+dartGenerator.forBlock['logic_compare'] = function(block, generator) {
  // Comparison operator.
  const OPERATORS =
      {'EQ': '==', 'NEQ': '!=', 'LT': '<', 'LTE': '<=', 'GT': '>', 'GTE': '>='};
@@ -63,19 +63,19 @@ dartGenerator.forBlock['logic_compare'] = function(block) {
  const order = (operator === '==' || operator === '!=') ?
      Order.EQUALITY :
      Order.RELATIONAL;
-  const argument0 = dartGenerator.valueToCode(block, 'A', order) || '0';
-  const argument1 = dartGenerator.valueToCode(block, 'B', order) || '0';
+  const argument0 = generator.valueToCode(block, 'A', order) || '0';
+  const argument1 = generator.valueToCode(block, 'B', order) || '0';
  const code = argument0 + ' ' + operator + ' ' + argument1;
  return [code, order];
 };

-dartGenerator.forBlock['logic_operation'] = function(block) {
+dartGenerator.forBlock['logic_operation'] = function(block, generator) {
  // Operations 'and', 'or'.
  const operator = (block.getFieldValue('OP') === 'AND') ? '&&' : '||';
  const order =
      (operator === '&&') ? Order.LOGICAL_AND : Order.LOGICAL_OR;
-  let argument0 = dartGenerator.valueToCode(block, 'A', order);
-  let argument1 = dartGenerator.valueToCode(block, 'B', order);
+  let argument0 = generator.valueToCode(block, 'A', order);
+  let argument1 = generator.valueToCode(block, 'B', order);
  if (!argument0 && !argument1) {
    // If there are no arguments, then the return value is false.
    argument0 = 'false';
@@ -94,33 +94,33 @@ dartGenerator.forBlock['logic_operation'] = function(block) {
  return [code, order];
 };

-dartGenerator.forBlock['logic_negate'] = function(block) {
+dartGenerator.forBlock['logic_negate'] = function(block, generator) {
  // Negation.
  const order = Order.UNARY_PREFIX;
-  const argument0 = dartGenerator.valueToCode(block, 'BOOL', order) || 'true';
+  const argument0 = generator.valueToCode(block, 'BOOL', order) || 'true';
  const code = '!' + argument0;
  return [code, order];
 };

-dartGenerator.forBlock['logic_boolean'] = function(block) {
+dartGenerator.forBlock['logic_boolean'] = function(block, generator) {
  // Boolean values true and false.
  const code = (block.getFieldValue('BOOL') === 'TRUE') ? 'true' : 'false';
  return [code, Order.ATOMIC];
 };

-dartGenerator.forBlock['logic_null'] = function(block) {
+dartGenerator.forBlock['logic_null'] = function(block, generator) {
  // Null data type.
  return ['null', Order.ATOMIC];
 };

-dartGenerator.forBlock['logic_ternary'] = function(block) {
+dartGenerator.forBlock['logic_ternary'] = function(block, generator) {
  // Ternary operator.
  const value_if =
-      dartGenerator.valueToCode(block, 'IF', Order.CONDITIONAL) || 'false';
+      generator.valueToCode(block, 'IF', Order.CONDITIONAL) || 'false';
  const value_then =
-      dartGenerator.valueToCode(block, 'THEN', Order.CONDITIONAL) || 'null';
+      generator.valueToCode(block, 'THEN', Order.CONDITIONAL) || 'null';
  const value_else =
-      dartGenerator.valueToCode(block, 'ELSE', Order.CONDITIONAL) || 'null';
+      generator.valueToCode(block, 'ELSE', Order.CONDITIONAL) || 'null';
  const code = value_if + ' ? ' + value_then + ' : ' + value_else;
  return [code, Order.CONDITIONAL];
 };
--- a/generators/dart/loops.js
+++ b/generators/dart/loops.js
@@ -16,7 +16,7 @@ import * as stringUtils from '../../core/utils/string.js';
 import {NameType} from '../../core/names.js';


-dartGenerator.forBlock['controls_repeat_ext'] = function(block) {
+dartGenerator.forBlock['controls_repeat_ext'] = function(block, generator) {
  let repeats;
  // Repeat n times.
  if (block.getField('TIMES')) {
@@ -25,17 +25,17 @@ dartGenerator.forBlock['controls_repeat_ext'] = function(block) {
  } else {
    // External number.
    repeats =
-        dartGenerator.valueToCode(block, 'TIMES', Order.ASSIGNMENT) || '0';
+        generator.valueToCode(block, 'TIMES', Order.ASSIGNMENT) || '0';
  }
-  let branch = dartGenerator.statementToCode(block, 'DO');
-  branch = dartGenerator.addLoopTrap(branch, block);
+  let branch = generator.statementToCode(block, 'DO');
+  branch = generator.addLoopTrap(branch, block);
  let code = '';
  const loopVar =
-      dartGenerator.nameDB_.getDistinctName('count', NameType.VARIABLE);
+      generator.nameDB_.getDistinctName('count', NameType.VARIABLE);
  let endVar = repeats;
  if (!repeats.match(/^\w+$/) && !stringUtils.isNumber(repeats)) {
    endVar =
-        dartGenerator.nameDB_.getDistinctName('repeat_end', NameType.VARIABLE);
+        generator.nameDB_.getDistinctName('repeat_end', NameType.VARIABLE);
    code += 'var ' + endVar + ' = ' + repeats + ';\n';
  }
  code += 'for (int ' + loopVar + ' = 0; ' + loopVar + ' < ' + endVar + '; ' +
@@ -46,34 +46,34 @@ dartGenerator.forBlock['controls_repeat_ext'] = function(block) {
 dartGenerator.forBlock['controls_repeat'] =
    dartGenerator.forBlock['controls_repeat_ext'];

-dartGenerator.forBlock['controls_whileUntil'] = function(block) {
+dartGenerator.forBlock['controls_whileUntil'] = function(block, generator) {
  // Do while/until loop.
  const until = block.getFieldValue('MODE') === 'UNTIL';
  let argument0 =
-      dartGenerator.valueToCode(
+      generator.valueToCode(
          block, 'BOOL', until ? Order.UNARY_PREFIX : Order.NONE) ||
      'false';
-  let branch = dartGenerator.statementToCode(block, 'DO');
-  branch = dartGenerator.addLoopTrap(branch, block);
+  let branch = generator.statementToCode(block, 'DO');
+  branch = generator.addLoopTrap(branch, block);
  if (until) {
    argument0 = '!' + argument0;
  }
  return 'while (' + argument0 + ') {\n' + branch + '}\n';
 };

-dartGenerator.forBlock['controls_for'] = function(block) {
+dartGenerator.forBlock['controls_for'] = function(block, generator) {
  // For loop.
  const variable0 =
-        dartGenerator.nameDB_.getName(
+        generator.nameDB_.getName(
          block.getFieldValue('VAR'), NameType.VARIABLE);
  const argument0 =
-      dartGenerator.valueToCode(block, 'FROM', Order.ASSIGNMENT) || '0';
+      generator.valueToCode(block, 'FROM', Order.ASSIGNMENT) || '0';
  const argument1 =
-        dartGenerator.valueToCode(block, 'TO', Order.ASSIGNMENT) || '0';
+        generator.valueToCode(block, 'TO', Order.ASSIGNMENT) || '0';
  const increment =
-        dartGenerator.valueToCode(block, 'BY', Order.ASSIGNMENT) || '1';
-  let branch = dartGenerator.statementToCode(block, 'DO');
-  branch = dartGenerator.addLoopTrap(branch, block);
+        generator.valueToCode(block, 'BY', Order.ASSIGNMENT) || '1';
+  let branch = generator.statementToCode(block, 'DO');
+  branch = generator.addLoopTrap(branch, block);
  let code;
  if (stringUtils.isNumber(argument0) && stringUtils.isNumber(argument1) &&
      stringUtils.isNumber(increment)) {
@@ -94,21 +94,21 @@ dartGenerator.forBlock['controls_for'] = function(block) {
    let startVar = argument0;
    if (!argument0.match(/^\w+$/) && !stringUtils.isNumber(argument0)) {
      startVar =
-          dartGenerator.nameDB_.getDistinctName(
+          generator.nameDB_.getDistinctName(
            variable0 + '_start', NameType.VARIABLE);
      code += 'var ' + startVar + ' = ' + argument0 + ';\n';
    }
    let endVar = argument1;
    if (!argument1.match(/^\w+$/) && !stringUtils.isNumber(argument1)) {
      endVar =
-          dartGenerator.nameDB_.getDistinctName(
+          generator.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 =
-        dartGenerator.nameDB_.getDistinctName(
+        generator.nameDB_.getDistinctName(
          variable0 + '_inc', NameType.VARIABLE);
    code += 'num ' + incVar + ' = ';
    if (stringUtils.isNumber(increment)) {
@@ -117,7 +117,7 @@ dartGenerator.forBlock['controls_for'] = function(block) {
      code += '(' + increment + ').abs();\n';
    }
    code += 'if (' + startVar + ' > ' + endVar + ') {\n';
-    code += dartGenerator.INDENT + incVar + ' = -' + incVar + ';\n';
+    code += generator.INDENT + incVar + ' = -' + incVar + ';\n';
    code += '}\n';
    code += 'for (' + variable0 + ' = ' + startVar + '; ' + incVar +
        ' >= 0 ? ' + variable0 + ' <= ' + endVar + ' : ' + variable0 +
@@ -127,39 +127,39 @@ dartGenerator.forBlock['controls_for'] = function(block) {
  return code;
 };

-dartGenerator.forBlock['controls_forEach'] = function(block) {
+dartGenerator.forBlock['controls_forEach'] = function(block, generator) {
  // For each loop.
  const variable0 =
-      dartGenerator.nameDB_.getName(
+      generator.nameDB_.getName(
        block.getFieldValue('VAR'), NameType.VARIABLE);
  const argument0 =
-      dartGenerator.valueToCode(block, 'LIST', Order.ASSIGNMENT) || '[]';
-  let branch = dartGenerator.statementToCode(block, 'DO');
-  branch = dartGenerator.addLoopTrap(branch, block);
+      generator.valueToCode(block, 'LIST', Order.ASSIGNMENT) || '[]';
+  let branch = generator.statementToCode(block, 'DO');
+  branch = generator.addLoopTrap(branch, block);
  const code =
      'for (var ' + variable0 + ' in ' + argument0 + ') {\n' + branch + '}\n';
  return code;
 };

-dartGenerator.forBlock['controls_flow_statements'] = function(block) {
+dartGenerator.forBlock['controls_flow_statements'] = function(block, generator) {
  // Flow statements: continue, break.
  let xfix = '';
-  if (dartGenerator.STATEMENT_PREFIX) {
+  if (generator.STATEMENT_PREFIX) {
    // Automatic prefix insertion is switched off for this block.  Add manually.
-    xfix += dartGenerator.injectId(dartGenerator.STATEMENT_PREFIX, block);
+    xfix += generator.injectId(generator.STATEMENT_PREFIX, block);
  }
-  if (dartGenerator.STATEMENT_SUFFIX) {
+  if (generator.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 += dartGenerator.injectId(dartGenerator.STATEMENT_SUFFIX, block);
+    xfix += generator.injectId(generator.STATEMENT_SUFFIX, block);
  }
-  if (dartGenerator.STATEMENT_PREFIX) {
+  if (generator.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 += dartGenerator.injectId(dartGenerator.STATEMENT_PREFIX, loop);
+      xfix += generator.injectId(generator.STATEMENT_PREFIX, loop);
    }
  }
  switch (block.getFieldValue('FLOW')) {
--- a/generators/dart/math.js
+++ b/generators/dart/math.js
@@ -17,7 +17,7 @@ import {dartGenerator, Order} from '../dart.js';

 dartGenerator.addReservedWords('Math');

-dartGenerator.forBlock['math_number'] = function(block) {
+dartGenerator.forBlock['math_number'] = function(block, generator) {
  // Numeric value.
  let code = Number(block.getFieldValue('NUM'));
  let order;
@@ -28,14 +28,14 @@ dartGenerator.forBlock['math_number'] = function(block) {
    code = '-double.infinity';
    order = Order.UNARY_PREFIX;
  } else {
-    // -4.abs() returns -4 in dartGenerator due to strange order of operation choices.
+    // -4.abs() returns -4 in generator due to strange order of operation choices.
    // -4 is actually an operator and a number.  Reflect this in the order.
    order = code < 0 ? Order.UNARY_PREFIX : Order.ATOMIC;
  }
  return [code, order];
 };

-dartGenerator.forBlock['math_arithmetic'] = function(block) {
+dartGenerator.forBlock['math_arithmetic'] = function(block, generator) {
  // Basic arithmetic operators, and power.
  const OPERATORS = {
    'ADD': [' + ', Order.ADDITIVE],
@@ -47,12 +47,12 @@ dartGenerator.forBlock['math_arithmetic'] = function(block) {
  const tuple = OPERATORS[block.getFieldValue('OP')];
  const operator = tuple[0];
  const order = tuple[1];
-  const argument0 = dartGenerator.valueToCode(block, 'A', order) || '0';
-  const argument1 = dartGenerator.valueToCode(block, 'B', order) || '0';
+  const argument0 = generator.valueToCode(block, 'A', order) || '0';
+  const argument1 = generator.valueToCode(block, 'B', order) || '0';
  let code;
-  // Power in dartGenerator requires a special case since it has no operator.
+  // Power in generator requires a special case since it has no operator.
  if (!operator) {
-    dartGenerator.definitions_['import_dart_math'] =
+    generator.definitions_['import_dart_math'] =
        'import \'dart:math\' as Math;';
    code = 'Math.pow(' + argument0 + ', ' + argument1 + ')';
    return [code, Order.UNARY_POSTFIX];
@@ -61,29 +61,29 @@ dartGenerator.forBlock['math_arithmetic'] = function(block) {
  return [code, order];
 };

-dartGenerator.forBlock['math_single'] = function(block) {
+dartGenerator.forBlock['math_single'] = function(block, generator) {
  // 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 = dartGenerator.valueToCode(block, 'NUM', Order.UNARY_PREFIX) || '0';
+    arg = generator.valueToCode(block, 'NUM', Order.UNARY_PREFIX) || '0';
    if (arg[0] === '-') {
-      // --3 is not legal in dartGenerator.
+      // --3 is not legal in generator.
      arg = ' ' + arg;
    }
    code = '-' + arg;
    return [code, Order.UNARY_PREFIX];
  }
-  dartGenerator.definitions_['import_dart_math'] =
+  generator.definitions_['import_dart_math'] =
      'import \'dart:math\' as Math;';
  if (operator === 'ABS' || operator.substring(0, 5) === 'ROUND') {
-    arg = dartGenerator.valueToCode(block, 'NUM', Order.UNARY_POSTFIX) || '0';
+    arg = generator.valueToCode(block, 'NUM', Order.UNARY_POSTFIX) || '0';
  } else if (operator === 'SIN' || operator === 'COS' || operator === 'TAN') {
-    arg = dartGenerator.valueToCode(block, 'NUM', Order.MULTIPLICATIVE) || '0';
+    arg = generator.valueToCode(block, 'NUM', Order.MULTIPLICATIVE) || '0';
  } else {
-    arg = dartGenerator.valueToCode(block, 'NUM', Order.NONE) || '0';
+    arg = generator.valueToCode(block, 'NUM', Order.NONE) || '0';
  }
  // First, handle cases which generate values that don't need parentheses
  // wrapping the code.
@@ -146,7 +146,7 @@ dartGenerator.forBlock['math_single'] = function(block) {
  return [code, Order.MULTIPLICATIVE];
 };

-dartGenerator.forBlock['math_constant'] = function(block) {
+dartGenerator.forBlock['math_constant'] = function(block, generator) {
  // Constants: PI, E, the Golden Ratio, sqrt(2), 1/sqrt(2), INFINITY.
  const CONSTANTS = {
    'PI': ['Math.pi', Order.UNARY_POSTFIX],
@@ -158,13 +158,13 @@ dartGenerator.forBlock['math_constant'] = function(block) {
  };
  const constant = block.getFieldValue('CONSTANT');
  if (constant !== 'INFINITY') {
-    dartGenerator.definitions_['import_dart_math'] =
+    generator.definitions_['import_dart_math'] =
        'import \'dart:math\' as Math;';
  }
  return CONSTANTS[constant];
 };

-dartGenerator.forBlock['math_number_property'] = function(block) {
+dartGenerator.forBlock['math_number_property'] = function(block, generator) {
  // 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 = {
@@ -178,15 +178,15 @@ dartGenerator.forBlock['math_number_property'] = function(block) {
  };
  const dropdownProperty = block.getFieldValue('PROPERTY');
  const [suffix, inputOrder, outputOrder] = PROPERTIES[dropdownProperty];
-  const numberToCheck = dartGenerator.valueToCode(block, 'NUMBER_TO_CHECK',
+  const numberToCheck = generator.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.
-    dartGenerator.definitions_['import_dart_math'] =
+    generator.definitions_['import_dart_math'] =
        'import \'dart:math\' as Math;';
-    const functionName = dartGenerator.provideFunction_('math_isPrime', `
-bool ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(n) {
+    const functionName = generator.provideFunction_('math_isPrime', `
+bool ${generator.FUNCTION_NAME_PLACEHOLDER_}(n) {
  // https://en.wikipedia.org/wiki/Primality_test#Naive_methods
  if (n == 2 || n == 3) {
    return true;
@@ -207,7 +207,7 @@ bool ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(n) {
 `);
    code = functionName + '(' + numberToCheck + ')';
  } else if (dropdownProperty === 'DIVISIBLE_BY') {
-    const divisor = dartGenerator.valueToCode(block, 'DIVISOR',
+    const divisor = generator.valueToCode(block, 'DIVISOR',
        Order.MULTIPLICATIVE) || '0';
    if (divisor === '0') {
      return ['false', Order.ATOMIC];
@@ -219,12 +219,12 @@ bool ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(n) {
  return [code, outputOrder];
 };

-dartGenerator.forBlock['math_change'] = function(block) {
+dartGenerator.forBlock['math_change'] = function(block, generator) {
  // Add to a variable in place.
  const argument0 =
-      dartGenerator.valueToCode(block, 'DELTA', Order.ADDITIVE) || '0';
+      generator.valueToCode(block, 'DELTA', Order.ADDITIVE) || '0';
  const varName =
-      dartGenerator.nameDB_.getName(
+      generator.nameDB_.getName(
        block.getFieldValue('VAR'), NameType.VARIABLE);
  return varName + ' = (' + varName + ' is num ? ' + varName + ' : 0) + ' +
      argument0 + ';\n';
@@ -235,15 +235,15 @@ dartGenerator.forBlock['math_round'] = dartGenerator.forBlock['math_single'];
 // Trigonometry functions have a single operand.
 dartGenerator.forBlock['math_trig'] = dartGenerator.forBlock['math_single'];

-dartGenerator.forBlock['math_on_list'] = function(block) {
+dartGenerator.forBlock['math_on_list'] = function(block, generator) {
  // Math functions for lists.
  const func = block.getFieldValue('OP');
-  const list = dartGenerator.valueToCode(block, 'LIST', Order.NONE) || '[]';
+  const list = generator.valueToCode(block, 'LIST', Order.NONE) || '[]';
  let code;
  switch (func) {
    case 'SUM': {
-      const functionName = dartGenerator.provideFunction_('math_sum', `
-num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
+      const functionName = generator.provideFunction_('math_sum', `
+num ${generator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
  num sumVal = 0;
  myList.forEach((num entry) {sumVal += entry;});
  return sumVal;
@@ -253,10 +253,10 @@ num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
      break;
    }
    case 'MIN': {
-      dartGenerator.definitions_['import_dart_math'] =
+      generator.definitions_['import_dart_math'] =
          'import \'dart:math\' as Math;';
-      const functionName = dartGenerator.provideFunction_('math_min', `
-num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
+      const functionName = generator.provideFunction_('math_min', `
+num ${generator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
  if (myList.isEmpty) return null;
  num minVal = myList[0];
  myList.forEach((num entry) {minVal = Math.min(minVal, entry);});
@@ -267,10 +267,10 @@ num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
      break;
    }
    case 'MAX': {
-      dartGenerator.definitions_['import_dart_math'] =
+      generator.definitions_['import_dart_math'] =
          'import \'dart:math\' as Math;';
-      const functionName = dartGenerator.provideFunction_('math_max', `
-num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
+      const functionName = generator.provideFunction_('math_max', `
+num ${generator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
  if (myList.isEmpty) return null;
  num maxVal = myList[0];
  myList.forEach((num entry) {maxVal = Math.max(maxVal, entry);});
@@ -283,8 +283,8 @@ num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List<num> myList) {
    case 'AVERAGE': {
      // This operation exclude null and values that are not int or float:
      //   math_mean([null,null,"aString",1,9]) -> 5.0
-      const functionName = dartGenerator.provideFunction_('math_mean', `
-num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
+      const functionName = generator.provideFunction_('math_mean', `
+num ${generator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
  // First filter list for numbers only.
  List localList = new List.from(myList);
  localList.removeWhere((a) => a is! num);
@@ -298,8 +298,8 @@ num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
      break;
    }
    case 'MEDIAN': {
-      const functionName = dartGenerator.provideFunction_('math_median', `
-num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
+      const functionName = generator.provideFunction_('math_median', `
+num ${generator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
  // First filter list for numbers only, then sort, then return middle value
  // or the average of two middle values if list has an even number of elements.
  List localList = new List.from(myList);
@@ -318,13 +318,13 @@ num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
      break;
    }
    case 'MODE': {
-      dartGenerator.definitions_['import_dart_math'] =
+      generator.definitions_['import_dart_math'] =
          'import \'dart:math\' as Math;';
      // 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 = dartGenerator.provideFunction_('math_modes', `
-List ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List values) {
+      const functionName = generator.provideFunction_('math_modes', `
+List ${generator.FUNCTION_NAME_PLACEHOLDER_}(List values) {
  List modes = [];
  List counts = [];
  int maxCount = 0;
@@ -357,11 +357,11 @@ List ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List values) {
      break;
    }
    case 'STD_DEV': {
-      dartGenerator.definitions_['import_dart_math'] =
+      generator.definitions_['import_dart_math'] =
          'import \'dart:math\' as Math;';
      const functionName =
-          dartGenerator.provideFunction_('math_standard_deviation', `
-num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
+          generator.provideFunction_('math_standard_deviation', `
+num ${generator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
  // First filter list for numbers only.
  List numbers = new List.from(myList);
  numbers.removeWhere((a) => a is! num);
@@ -379,10 +379,10 @@ num ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
      break;
    }
    case 'RANDOM': {
-      dartGenerator.definitions_['import_dart_math'] =
+      generator.definitions_['import_dart_math'] =
          'import \'dart:math\' as Math;';
-      const functionName = dartGenerator.provideFunction_('math_random_item', `
-dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
+      const functionName = generator.provideFunction_('math_random_item', `
+dynamic ${generator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
  int x = new Math.Random().nextInt(myList.length);
  return myList[x];
 }
@@ -396,38 +396,38 @@ dynamic ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(List myList) {
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['math_modulo'] = function(block) {
+dartGenerator.forBlock['math_modulo'] = function(block, generator) {
  // Remainder computation.
  const argument0 =
-      dartGenerator.valueToCode(block, 'DIVIDEND', Order.MULTIPLICATIVE) || '0';
+      generator.valueToCode(block, 'DIVIDEND', Order.MULTIPLICATIVE) || '0';
  const argument1 =
-      dartGenerator.valueToCode(block, 'DIVISOR', Order.MULTIPLICATIVE) || '0';
+      generator.valueToCode(block, 'DIVISOR', Order.MULTIPLICATIVE) || '0';
  const code = argument0 + ' % ' + argument1;
  return [code, Order.MULTIPLICATIVE];
 };

-dartGenerator.forBlock['math_constrain'] = function(block) {
+dartGenerator.forBlock['math_constrain'] = function(block, generator) {
  // Constrain a number between two limits.
-  dartGenerator.definitions_['import_dart_math'] =
+  generator.definitions_['import_dart_math'] =
      'import \'dart:math\' as Math;';
  const argument0 =
-      dartGenerator.valueToCode(block, 'VALUE', Order.NONE) || '0';
-  const argument1 = dartGenerator.valueToCode(block, 'LOW', Order.NONE) || '0';
+      generator.valueToCode(block, 'VALUE', Order.NONE) || '0';
+  const argument1 = generator.valueToCode(block, 'LOW', Order.NONE) || '0';
  const argument2 =
-      dartGenerator.valueToCode(block, 'HIGH', Order.NONE) || 'double.infinity';
+      generator.valueToCode(block, 'HIGH', Order.NONE) || 'double.infinity';
  const code = 'Math.min(Math.max(' + argument0 + ', ' + argument1 + '), ' +
      argument2 + ')';
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['math_random_int'] = function(block) {
+dartGenerator.forBlock['math_random_int'] = function(block, generator) {
  // Random integer between [X] and [Y].
-  dartGenerator.definitions_['import_dart_math'] =
+  generator.definitions_['import_dart_math'] =
      'import \'dart:math\' as Math;';
-  const argument0 = dartGenerator.valueToCode(block, 'FROM', Order.NONE) || '0';
-  const argument1 = dartGenerator.valueToCode(block, 'TO', Order.NONE) || '0';
-  const functionName = dartGenerator.provideFunction_('math_random_int', `
-int ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(num a, num b) {
+  const argument0 = generator.valueToCode(block, 'FROM', Order.NONE) || '0';
+  const argument1 = generator.valueToCode(block, 'TO', Order.NONE) || '0';
+  const functionName = generator.provideFunction_('math_random_int', `
+int ${generator.FUNCTION_NAME_PLACEHOLDER_}(num a, num b) {
  if (a > b) {
    // Swap a and b to ensure a is smaller.
    num c = a;
@@ -441,19 +441,19 @@ int ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(num a, num b) {
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['math_random_float'] = function(block) {
+dartGenerator.forBlock['math_random_float'] = function(block, generator) {
  // Random fraction between 0 and 1.
-  dartGenerator.definitions_['import_dart_math'] =
+  generator.definitions_['import_dart_math'] =
      'import \'dart:math\' as Math;';
  return ['new Math.Random().nextDouble()', Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['math_atan2'] = function(block) {
+dartGenerator.forBlock['math_atan2'] = function(block, generator) {
  // Arctangent of point (X, Y) in degrees from -180 to 180.
-  dartGenerator.definitions_['import_dart_math'] =
+  generator.definitions_['import_dart_math'] =
      'import \'dart:math\' as Math;';
-  const argument0 = dartGenerator.valueToCode(block, 'X', Order.NONE) || '0';
-  const argument1 = dartGenerator.valueToCode(block, 'Y', Order.NONE) || '0';
+  const argument0 = generator.valueToCode(block, 'X', Order.NONE) || '0';
+  const argument1 = generator.valueToCode(block, 'Y', Order.NONE) || '0';
  return [
    'Math.atan2(' + argument1 + ', ' + argument0 + ') / Math.pi * 180',
    Order.MULTIPLICATIVE
--- a/generators/dart/procedures.js
+++ b/generators/dart/procedures.js
@@ -15,49 +15,49 @@ import {NameType} from '../../core/names.js';
 import {dartGenerator, Order} from '../dart.js';


-dartGenerator.forBlock['procedures_defreturn'] = function(block) {
+dartGenerator.forBlock['procedures_defreturn'] = function(block, generator) {
  // Define a procedure with a return value.
  const funcName =
-      dartGenerator.nameDB_.getName(
+      generator.nameDB_.getName(
        block.getFieldValue('NAME'), NameType.PROCEDURE);
  let xfix1 = '';
-  if (dartGenerator.STATEMENT_PREFIX) {
-    xfix1 += dartGenerator.injectId(dartGenerator.STATEMENT_PREFIX, block);
+  if (generator.STATEMENT_PREFIX) {
+    xfix1 += generator.injectId(generator.STATEMENT_PREFIX, block);
  }
-  if (dartGenerator.STATEMENT_SUFFIX) {
-    xfix1 += dartGenerator.injectId(dartGenerator.STATEMENT_SUFFIX, block);
+  if (generator.STATEMENT_SUFFIX) {
+    xfix1 += generator.injectId(generator.STATEMENT_SUFFIX, block);
  }
  if (xfix1) {
-    xfix1 = dartGenerator.prefixLines(xfix1, dartGenerator.INDENT);
+    xfix1 = generator.prefixLines(xfix1, generator.INDENT);
  }
  let loopTrap = '';
-  if (dartGenerator.INFINITE_LOOP_TRAP) {
-    loopTrap = dartGenerator.prefixLines(
-        dartGenerator.injectId(dartGenerator.INFINITE_LOOP_TRAP, block),
-        dartGenerator.INDENT);
+  if (generator.INFINITE_LOOP_TRAP) {
+    loopTrap = generator.prefixLines(
+        generator.injectId(generator.INFINITE_LOOP_TRAP, block),
+        generator.INDENT);
  }
-  const branch = dartGenerator.statementToCode(block, 'STACK');
+  const branch = generator.statementToCode(block, 'STACK');
  let returnValue =
-      dartGenerator.valueToCode(block, 'RETURN', Order.NONE) || '';
+      generator.valueToCode(block, 'RETURN', Order.NONE) || '';
  let xfix2 = '';
  if (branch && returnValue) {
    // After executing the function body, revisit this block for the return.
    xfix2 = xfix1;
  }
  if (returnValue) {
-    returnValue = dartGenerator.INDENT + 'return ' + returnValue + ';\n';
+    returnValue = generator.INDENT + 'return ' + returnValue + ';\n';
  }
  const returnType = returnValue ? 'dynamic' : 'void';
  const args = [];
  const variables = block.getVars();
  for (let i = 0; i < variables.length; i++) {
-    args[i] = dartGenerator.nameDB_.getName(variables[i], NameType.VARIABLE);
+    args[i] = generator.nameDB_.getName(variables[i], NameType.VARIABLE);
  }
  let code = returnType + ' ' + funcName + '(' + args.join(', ') + ') {\n' +
      xfix1 + loopTrap + branch + xfix2 + returnValue + '}';
-  code = dartGenerator.scrub_(block, code);
+  code = generator.scrub_(block, code);
  // Add % so as not to collide with helper functions in definitions list.
-  dartGenerator.definitions_['%' + funcName] = code;
+  generator.definitions_['%' + funcName] = code;
  return null;
 };

@@ -65,46 +65,46 @@ dartGenerator.forBlock['procedures_defreturn'] = function(block) {
 // a procedure with a return value.
 dartGenerator.forBlock['procedures_defnoreturn'] = dartGenerator.forBlock['procedures_defreturn'];

-dartGenerator.forBlock['procedures_callreturn'] = function(block) {
+dartGenerator.forBlock['procedures_callreturn'] = function(block, generator) {
  // Call a procedure with a return value.
  const funcName =
-      dartGenerator.nameDB_.getName(
+      generator.nameDB_.getName(
        block.getFieldValue('NAME'),NameType.PROCEDURE);
  const args = [];
  const variables = block.getVars();
  for (let i = 0; i < variables.length; i++) {
-    args[i] = dartGenerator.valueToCode(block, 'ARG' + i, Order.NONE) || 'null';
+    args[i] = generator.valueToCode(block, 'ARG' + i, Order.NONE) || 'null';
  }
  let code = funcName + '(' + args.join(', ') + ')';
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['procedures_callnoreturn'] = function(block) {
+dartGenerator.forBlock['procedures_callnoreturn'] = function(block, generator) {
  // 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 = dartGenerator.forBlock['procedures_callreturn'](block);
+  const tuple = generator.forBlock['procedures_callreturn'](block, generator);
  return tuple[0] + ';\n';
 };

-dartGenerator.forBlock['procedures_ifreturn'] = function(block) {
+dartGenerator.forBlock['procedures_ifreturn'] = function(block, generator) {
  // Conditionally return value from a procedure.
  const condition =
-      dartGenerator.valueToCode(block, 'CONDITION', Order.NONE) || 'false';
+      generator.valueToCode(block, 'CONDITION', Order.NONE) || 'false';
  let code = 'if (' + condition + ') {\n';
-  if (dartGenerator.STATEMENT_SUFFIX) {
+  if (generator.STATEMENT_SUFFIX) {
    // Inject any statement suffix here since the regular one at the end
    // will not get executed if the return is triggered.
-    code += dartGenerator.prefixLines(
-        dartGenerator.injectId(
-          dartGenerator.STATEMENT_SUFFIX, block), dartGenerator.INDENT);
+    code += generator.prefixLines(
+        generator.injectId(
+          generator.STATEMENT_SUFFIX, block), generator.INDENT);
  }
  if (block.hasReturnValue_) {
    const value =
-        dartGenerator.valueToCode(block, 'VALUE', Order.NONE) || 'null';
-    code += dartGenerator.INDENT + 'return ' + value + ';\n';
+        generator.valueToCode(block, 'VALUE', Order.NONE) || 'null';
+    code += generator.INDENT + 'return ' + value + ';\n';
  } else {
-    code += dartGenerator.INDENT + 'return;\n';
+    code += generator.INDENT + 'return;\n';
  }
  code += '}\n';
  return code;
--- a/generators/dart/text.js
+++ b/generators/dart/text.js
@@ -17,28 +17,28 @@ import {dartGenerator, Order} from '../dart.js';

 dartGenerator.addReservedWords('Html,Math');

-dartGenerator.forBlock['text'] = function(block) {
+dartGenerator.forBlock['text'] = function(block, generator) {
  // Text value.
-  const code = dartGenerator.quote_(block.getFieldValue('TEXT'));
+  const code = generator.quote_(block.getFieldValue('TEXT'));
  return [code, Order.ATOMIC];
 };

-dartGenerator.forBlock['text_multiline'] = function(block) {
+dartGenerator.forBlock['text_multiline'] = function(block, generator) {
  // Text value.
-  const code = dartGenerator.multiline_quote_(block.getFieldValue('TEXT'));
+  const code = generator.multiline_quote_(block.getFieldValue('TEXT'));
  const order =
      code.indexOf('+') !== -1 ? Order.ADDITIVE : Order.ATOMIC;
  return [code, order];
 };

-dartGenerator.forBlock['text_join'] = function(block) {
+dartGenerator.forBlock['text_join'] = function(block, generator) {
  // Create a string made up of any number of elements of any type.
  switch (block.itemCount_) {
    case 0:
      return ["''", Order.ATOMIC];
    case 1: {
      const element =
-          dartGenerator.valueToCode(block, 'ADD0', Order.UNARY_POSTFIX) || "''";
+          generator.valueToCode(block, 'ADD0', Order.UNARY_POSTFIX) || "''";
      const code = element + '.toString()';
      return [code, Order.UNARY_POSTFIX];
    }
@@ -46,7 +46,7 @@ dartGenerator.forBlock['text_join'] = function(block) {
      const elements = new Array(block.itemCount_);
      for (let i = 0; i < block.itemCount_; i++) {
        elements[i] =
-            dartGenerator.valueToCode(block, 'ADD' + i, Order.NONE) || "''";
+            generator.valueToCode(block, 'ADD' + i, Order.NONE) || "''";
      }
      const code = '[' + elements.join(',') + '].join()';
      return [code, Order.UNARY_POSTFIX];
@@ -54,37 +54,37 @@ dartGenerator.forBlock['text_join'] = function(block) {
  }
 };

-dartGenerator.forBlock['text_append'] = function(block) {
+dartGenerator.forBlock['text_append'] = function(block, generator) {
  // Append to a variable in place.
  const varName =
-      dartGenerator.nameDB_.getName(
+      generator.nameDB_.getName(
        block.getFieldValue('VAR'), NameType.VARIABLE);
-  const value = dartGenerator.valueToCode(block, 'TEXT', Order.NONE) || "''";
+  const value = generator.valueToCode(block, 'TEXT', Order.NONE) || "''";
  return varName + ' = [' + varName + ', ' + value + '].join();\n';
 };

-dartGenerator.forBlock['text_length'] = function(block) {
+dartGenerator.forBlock['text_length'] = function(block, generator) {
  // String or array length.
  const text =
-      dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
+      generator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
  return [text + '.length', Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['text_isEmpty'] = function(block) {
+dartGenerator.forBlock['text_isEmpty'] = function(block, generator) {
  // Is the string null or array empty?
  const text =
-      dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
+      generator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
  return [text + '.isEmpty', Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['text_indexOf'] = function(block) {
+dartGenerator.forBlock['text_indexOf'] = function(block, generator) {
  // Search the text for a substring.
  const operator =
      block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
  const substring =
-      dartGenerator.valueToCode(block, 'FIND', Order.NONE) || "''";
+      generator.valueToCode(block, 'FIND', Order.NONE) || "''";
  const text =
-      dartGenerator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
+      generator.valueToCode(block, 'VALUE', Order.UNARY_POSTFIX) || "''";
  const code = text + '.' + operator + '(' + substring + ')';
  if (block.workspace.options.oneBasedIndex) {
    return [code + ' + 1', Order.ADDITIVE];
@@ -92,14 +92,14 @@ dartGenerator.forBlock['text_indexOf'] = function(block) {
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['text_charAt'] = function(block) {
+dartGenerator.forBlock['text_charAt'] = function(block, generator) {
  // 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 === 'FIRST' || where === 'FROM_START') ?
      Order.UNARY_POSTFIX :
      Order.NONE;
-  const text = dartGenerator.valueToCode(block, 'VALUE', textOrder) || "''";
+  const text = generator.valueToCode(block, 'VALUE', textOrder) || "''";
  let at;
  switch (where) {
    case 'FIRST': {
@@ -107,7 +107,7 @@ dartGenerator.forBlock['text_charAt'] = function(block) {
      return [code, Order.UNARY_POSTFIX];
    }
    case 'FROM_START': {
-      at = dartGenerator.getAdjusted(block, 'AT');
+      at = generator.getAdjusted(block, 'AT');
      const code = text + '[' + at + ']';
      return [code, Order.UNARY_POSTFIX];
    }
@@ -115,9 +115,9 @@ dartGenerator.forBlock['text_charAt'] = function(block) {
      at = 1;
      // Fall through.
    case 'FROM_END': {
-      at = dartGenerator.getAdjusted(block, 'AT', 1);
-      const functionName = dartGenerator.provideFunction_('text_get_from_end', `
-String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text, num x) {
+      at = generator.getAdjusted(block, 'AT', 1);
+      const functionName = generator.provideFunction_('text_get_from_end', `
+String ${generator.FUNCTION_NAME_PLACEHOLDER_}(String text, num x) {
  return text[text.length - x];
 }
 `);
@@ -125,11 +125,11 @@ String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text, num x) {
      return [code, Order.UNARY_POSTFIX];
    }
    case 'RANDOM': {
-      dartGenerator.definitions_['import_dart_math'] =
+      generator.definitions_['import_dart_math'] =
          'import \'dart:math\' as Math;';
      const functionName =
-          dartGenerator.provideFunction_('text_random_letter', `
-String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text) {
+          generator.provideFunction_('text_random_letter', `
+String ${generator.FUNCTION_NAME_PLACEHOLDER_}(String text) {
  int x = new Math.Random().nextInt(text.length);
  return text[x];
 }
@@ -141,14 +141,14 @@ String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text) {
  throw Error('Unhandled option (text_charAt).');
 };

-dartGenerator.forBlock['text_getSubstring'] = function(block) {
+dartGenerator.forBlock['text_getSubstring'] = function(block, generator) {
  // Get substring.
  const where1 = block.getFieldValue('WHERE1');
  const where2 = block.getFieldValue('WHERE2');
  const requiresLengthCall = (where1 !== 'FROM_END' && where2 === 'FROM_START');
  const textOrder =
      requiresLengthCall ? Order.UNARY_POSTFIX : Order.NONE;
-  const text = dartGenerator.valueToCode(block, 'STRING', textOrder) || "''";
+  const text = generator.valueToCode(block, 'STRING', textOrder) || "''";
  let code;
  if (where1 === 'FIRST' && where2 === 'LAST') {
    code = text;
@@ -159,10 +159,10 @@ dartGenerator.forBlock['text_getSubstring'] = function(block) {
    let at1;
    switch (where1) {
      case 'FROM_START':
-        at1 = dartGenerator.getAdjusted(block, 'AT1');
+        at1 = generator.getAdjusted(block, 'AT1');
        break;
      case 'FROM_END':
-        at1 = dartGenerator.getAdjusted(block, 'AT1', 1, false, Order.ADDITIVE);
+        at1 = generator.getAdjusted(block, 'AT1', 1, false, Order.ADDITIVE);
        at1 = text + '.length - ' + at1;
        break;
      case 'FIRST':
@@ -174,10 +174,10 @@ dartGenerator.forBlock['text_getSubstring'] = function(block) {
    let at2;
    switch (where2) {
      case 'FROM_START':
-        at2 = dartGenerator.getAdjusted(block, 'AT2', 1);
+        at2 = generator.getAdjusted(block, 'AT2', 1);
        break;
      case 'FROM_END':
-        at2 = dartGenerator.getAdjusted(block, 'AT2', 0, false, Order.ADDITIVE);
+        at2 = generator.getAdjusted(block, 'AT2', 0, false, Order.ADDITIVE);
        at2 = text + '.length - ' + at2;
        break;
      case 'LAST':
@@ -192,11 +192,11 @@ dartGenerator.forBlock['text_getSubstring'] = function(block) {
      code = text + '.substring(' + at1 + ', ' + at2 + ')';
    }
  } else {
-    const at1 = dartGenerator.getAdjusted(block, 'AT1');
-    const at2 = dartGenerator.getAdjusted(block, 'AT2');
+    const at1 = generator.getAdjusted(block, 'AT1');
+    const at2 = generator.getAdjusted(block, 'AT2');
    const functionName =
-        dartGenerator.provideFunction_('text_get_substring', `
-String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text, String where1, num at1, String where2, num at2) {
+        generator.provideFunction_('text_get_substring', `
+String ${generator.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;
@@ -220,7 +220,7 @@ String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String text, String where1, n
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['text_changeCase'] = function(block) {
+dartGenerator.forBlock['text_changeCase'] = function(block, generator) {
  // Change capitalization.
  const OPERATORS = {
    'UPPERCASE': '.toUpperCase()',
@@ -229,15 +229,15 @@ dartGenerator.forBlock['text_changeCase'] = function(block) {
  };
  const operator = OPERATORS[block.getFieldValue('CASE')];
  const textOrder = operator ? Order.UNARY_POSTFIX : Order.NONE;
-  const text = dartGenerator.valueToCode(block, 'TEXT', textOrder) || "''";
+  const text = generator.valueToCode(block, 'TEXT', textOrder) || "''";
  let code;
  if (operator) {
-    // Upper and lower case are functions built into dartGenerator.
+    // Upper and lower case are functions built into generator.
    code = text + operator;
  } else {
-    // Title case is not a native dartGenerator function.  Define one.
-    const functionName = dartGenerator.provideFunction_('text_toTitleCase', `
-String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String str) {
+    // Title case is not a native generator function.  Define one.
+    const functionName = generator.provideFunction_('text_toTitleCase', `
+String ${generator.FUNCTION_NAME_PLACEHOLDER_}(String str) {
  RegExp exp = new RegExp(r'\\b');
  List<String> list = str.split(exp);
  final title = new StringBuffer();
@@ -257,7 +257,7 @@ String ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String str) {
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['text_trim'] = function(block) {
+dartGenerator.forBlock['text_trim'] = function(block, generator) {
  // Trim spaces.
  const OPERATORS = {
    'LEFT': '.replaceFirst(new RegExp(r\'^\\s+\'), \'\')',
@@ -266,32 +266,32 @@ dartGenerator.forBlock['text_trim'] = function(block) {
  };
  const operator = OPERATORS[block.getFieldValue('MODE')];
  const text =
-      dartGenerator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
+      generator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
  return [text + operator, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['text_print'] = function(block) {
+dartGenerator.forBlock['text_print'] = function(block, generator) {
  // Print statement.
-  const msg = dartGenerator.valueToCode(block, 'TEXT', Order.NONE) || "''";
+  const msg = generator.valueToCode(block, 'TEXT', Order.NONE) || "''";
  return 'print(' + msg + ');\n';
 };

-dartGenerator.forBlock['text_prompt_ext'] = function(block) {
+dartGenerator.forBlock['text_prompt_ext'] = function(block, generator) {
  // Prompt function.
-  dartGenerator.definitions_['import_dart_html'] =
+  generator.definitions_['import_dart_html'] =
      'import \'dart:html\' as Html;';
  let msg;
  if (block.getField('TEXT')) {
    // Internal message.
-    msg = dartGenerator.quote_(block.getFieldValue('TEXT'));
+    msg = generator.quote_(block.getFieldValue('TEXT'));
  } else {
    // External message.
-    msg = dartGenerator.valueToCode(block, 'TEXT', Order.NONE) || "''";
+    msg = generator.valueToCode(block, 'TEXT', Order.NONE) || "''";
  }
  let code = 'Html.window.prompt(' + msg + ', \'\')';
  const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
  if (toNumber) {
-    dartGenerator.definitions_['import_dart_math'] =
+    generator.definitions_['import_dart_math'] =
        'import \'dart:math\' as Math;';
    code = 'Math.parseDouble(' + code + ')';
  }
@@ -301,12 +301,12 @@ dartGenerator.forBlock['text_prompt_ext'] = function(block) {
 dartGenerator.forBlock['text_prompt'] =
    dartGenerator.forBlock['text_prompt_ext'];

-dartGenerator.forBlock['text_count'] = function(block) {
-  const text = dartGenerator.valueToCode(block, 'TEXT', Order.NONE) || "''";
-  const sub = dartGenerator.valueToCode(block, 'SUB', Order.NONE) || "''";
-  // Substring count is not a native dartGenerator function.  Define one.
-  const functionName = dartGenerator.provideFunction_('text_count', `
-int ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String haystack, String needle) {
+dartGenerator.forBlock['text_count'] = function(block, generator) {
+  const text = generator.valueToCode(block, 'TEXT', Order.NONE) || "''";
+  const sub = generator.valueToCode(block, 'SUB', Order.NONE) || "''";
+  // Substring count is not a native generator function.  Define one.
+  const functionName = generator.provideFunction_('text_count', `
+int ${generator.FUNCTION_NAME_PLACEHOLDER_}(String haystack, String needle) {
  if (needle.length == 0) {
    return haystack.length + 1;
  }
@@ -326,21 +326,21 @@ int ${dartGenerator.FUNCTION_NAME_PLACEHOLDER_}(String haystack, String needle)
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['text_replace'] = function(block) {
+dartGenerator.forBlock['text_replace'] = function(block, generator) {
  const text =
-      dartGenerator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
-  const from = dartGenerator.valueToCode(block, 'FROM', Order.NONE) || "''";
-  const to = dartGenerator.valueToCode(block, 'TO', Order.NONE) || "''";
+      generator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
+  const from = generator.valueToCode(block, 'FROM', Order.NONE) || "''";
+  const to = generator.valueToCode(block, 'TO', Order.NONE) || "''";
  const code = text + '.replaceAll(' + from + ', ' + to + ')';
  return [code, Order.UNARY_POSTFIX];
 };

-dartGenerator.forBlock['text_reverse'] = function(block) {
-  // There isn't a sensible way to do this in dartGenerator. See:
+dartGenerator.forBlock['text_reverse'] = function(block, generator) {
+  // There isn't a sensible way to do this in generator. See:
  // http://stackoverflow.com/a/21613700/3529104
  // Implementing something is possibly better than not implementing anything?
  const text =
-      dartGenerator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
+      generator.valueToCode(block, 'TEXT', Order.UNARY_POSTFIX) || "''";
  const code = 'new String.fromCharCodes(' + text + '.runes.toList().reversed)';
  return [code, Order.UNARY_PREFIX];
 };
--- a/generators/dart/variables.js
+++ b/generators/dart/variables.js
@@ -15,20 +15,20 @@ import {NameType} from '../../core/names.js';
 import {dartGenerator, Order} from '../dart.js';


-dartGenerator.forBlock['variables_get'] = function(block) {
+dartGenerator.forBlock['variables_get'] = function(block, generator) {
  // Variable getter.
  const code =
-      dartGenerator.nameDB_.getName(
+      generator.nameDB_.getName(
        block.getFieldValue('VAR'), NameType.VARIABLE);
  return [code, Order.ATOMIC];
 };

-dartGenerator.forBlock['variables_set'] = function(block) {
+dartGenerator.forBlock['variables_set'] = function(block, generator) {
  // Variable setter.
  const argument0 =
-      dartGenerator.valueToCode(block, 'VALUE', Order.ASSIGNMENT) || '0';
+      generator.valueToCode(block, 'VALUE', Order.ASSIGNMENT) || '0';
  const varName =
-      dartGenerator.nameDB_.getName(
+      generator.nameDB_.getName(
        block.getFieldValue('VAR'), NameType.VARIABLE);
  return varName + ' = ' + argument0 + ';\n';
 };
--- a/generators/dart/variables_dynamic.js
+++ b/generators/dart/variables_dynamic.js
@@ -15,7 +15,7 @@ import {dartGenerator} from '../dart.js';
 import './variables.js';


-// dartGenerator is dynamically typed.
+// generator is dynamically typed.
 dartGenerator.forBlock['variables_get_dynamic'] =
    dartGenerator.forBlock['variables_get'];
 dartGenerator.forBlock['variables_set_dynamic'] =