mittens 0.3.1 → 0.3.2

data/vendor/snowball/compiler/generator_js.c

@@ -1,67 +1,67 @@
 #include <assert.h>
+#include <stdio.h> /* for fprintf etc */
 #include <stdlib.h> /* for exit */
 #include <string.h> /* for strlen */
-#include <stdio.h> /* for fprintf etc */
 #include "header.h"
 
-/* prototypes */
+/* prototype functions for recursive use: */
 
 static void generate(struct generator * g, struct node * p);
 static void w(struct generator * g, const char * s);
 static void writef(struct generator * g, const char * s, struct node * p);
 
-static int new_label(struct generator * g) {
-    return g->next_label++;
-}
+/* Write routines for items from the syntax tree */
 
-static struct str * vars_newname(struct generator * g) {
-    struct str * output;
-    g->var_number++;
-    output = str_new();
-    str_append_string(output, "v_");
-    str_append_int(output, g->var_number);
-    return output;
+static void write_relop(struct generator * g, int relop) {
+    // Relational operators are the same as C, save for (in-)equality.
+    switch (relop) {
+        case c_eq: write_string(g, " === "); break;
+        case c_ne: write_string(g, " !== "); break;
+        default: write_c_relop(g, relop);
+    }
 }
 
-/* Write routines for items from the syntax tree */
-
 static void write_varname(struct generator * g, struct name * p) {
-    int ch = "SBIrxg"[p->type];
-    if (p->type != t_external) {
-        write_char(g, ch);
+    if (p->type == t_external) {
+        if (g->options->externals_prefix) {
+            write_string(g, g->options->externals_prefix);
+        }
+    } else {
+        // We use the same naming scheme for both global and local variables.
+        write_char(g, "SBIrxg"[p->type]);
         write_char(g, '_');
     }
     write_s(g, p->s);
 }
 
+/* Reference to variable, e.g. when assigning to or using in an expression. */
 static void write_varref(struct generator * g, struct name * p) {
+    if (p->type != t_grouping && p->local_to == NULL) {
+        w(g, "this.#");
+    }
     write_varname(g, p);
 }
 
 static void write_literal_string(struct generator * g, symbol * p) {
-    write_string(g, "\"");
+    write_char(g, '"');
     for (int i = 0; i < SIZE(p); i++) {
         int ch = p[i];
         if (32 <= ch && ch < 127) {
-            if (ch == '\"' || ch == '\\') write_string(g, "\\");
+            if (ch == '\"' || ch == '\\') write_char(g, '\\');
             write_char(g, ch);
         } else {
             write_string(g, "\\u");
             write_hex4(g, ch);
         }
     }
-    write_string(g, "\"");
-}
-
-static void write_margin(struct generator * g) {
-    for (int i = 0; i < g->margin; i++) write_string(g, "    ");
+    write_char(g, '"');
 }
 
 static void write_comment(struct generator * g, struct node * p) {
     if (!g->options->comments) return;
     write_margin(g);
     write_string(g, "// ");
-    write_comment_content(g, p);
+    write_comment_content(g, p, NULL);
     write_newline(g);
 }
 
@@ -77,15 +77,15 @@ static void write_savecursor(struct generator * g, struct node * p,
                              struct str * savevar) {
     g->B[0] = str_data(savevar);
     g->S[1] = "";
-    if (p->mode != m_forward) g->S[1] = "base.limit - ";
-    writef(g, "~M~C /** number */ ~B0 = ~S1base.cursor;~N", p);
+    if (p->mode != m_forward) g->S[1] = "this.limit - ";
+    writef(g, "~Mconst /** number */ ~B0 = ~S1this.c;~N", p);
 }
 
 static void append_restore_string(struct node * p, struct str * out, struct str * savevar) {
-    str_append_string(out, "base.cursor = ");
-    if (p->mode != m_forward) str_append_string(out, "base.limit - ");
+    str_append_string(out, "this.c = ");
+    if (p->mode != m_forward) str_append_string(out, "this.limit - ");
     str_append(out, savevar);
-    str_append_string(out, ";");
+    str_append_ch(out, ';');
 }
 
 static void write_restorecursor(struct generator * g, struct node * p, struct str * savevar) {
@@ -96,12 +96,14 @@ static void write_restorecursor(struct generator * g, struct node * p, struct st
 
 static void write_inc_cursor(struct generator * g, struct node * p) {
     write_margin(g);
-    write_string(g, p->mode == m_forward ? "base.cursor++;" : "base.cursor--;");
+    write_string(g, p->mode == m_forward ? "this.c++;" : "this.c--;");
     write_newline(g);
 }
 
 static void wsetlab_begin(struct generator * g, int n) {
     g->I[0] = n;
+    // This label may end up unused, but we can't easily tell at this point.
+    w(g, "~M// deno-lint-ignore no-unused-labels~N");
     w(g, "~Mlab~I0: {~N~+");
 }
 
@@ -113,53 +115,62 @@ static void wgotol(struct generator * g, int n) {
     write_margin(g);
     write_string(g, "break lab");
     write_int(g, n);
-    write_string(g, ";");
+    write_char(g, ';');
     write_newline(g);
+    g->unreachable = true;
 }
 
-static void write_failure(struct generator * g) {
+static void write_failure_(struct generator * g, byte after_if) {
+    if (!after_if) write_margin(g);
     if (str_len(g->failure_str) != 0) {
-        write_margin(g);
+        if (after_if) w(g, "{~N~+~M");
         write_str(g, g->failure_str);
         write_newline(g);
+        write_margin(g);
     }
-    write_margin(g);
     switch (g->failure_label) {
         case x_return:
             write_string(g, "return false;");
-            g->unreachable = true;
             break;
         default:
             write_string(g, "break lab");
             write_int(g, g->failure_label);
-            write_string(g, ";");
-            g->unreachable = true;
+            write_char(g, ';');
     }
     write_newline(g);
+    g->unreachable = true;
+    if (after_if && str_len(g->failure_str) != 0) {
+        w(g, "~-~M}~N");
+    }
+}
+
+static void write_failure(struct generator * g) {
+    write_failure_(g, false);
+}
+
+static void write_failure_after_if(struct generator * g) {
+    write_failure_(g, true);
 }
 
 static void write_failure_if(struct generator * g, const char * s, struct node * p) {
     writef(g, "~Mif (", p);
     writef(g, s, p);
-    writef(g, ")~N", p);
-    write_block_start(g);
-    write_failure(g);
-    write_block_end(g);
+    writef(g, ") ", p);
+    write_failure_after_if(g);
     g->unreachable = false;
 }
 
 /* if at limit fail */
 static void write_check_limit(struct generator * g, struct node * p) {
     if (p->mode == m_forward) {
-        write_failure_if(g, "base.cursor >= base.limit", p);
+        write_failure_if(g, "this.c >= this.limit", p);
     } else {
-        write_failure_if(g, "base.cursor <= base.limit_backward", p);
+        write_failure_if(g, "this.c <= this.limit_backward", p);
     }
 }
 
 /* Formatted write. */
 static void writef(struct generator * g, const char * input, struct node * p) {
-    (void)p;
     int i = 0;
 
     while (input[i]) {
@@ -171,10 +182,8 @@ static void writef(struct generator * g, const char * input, struct node * p) {
         ch = input[i++];
         switch (ch) {
             case '~': write_char(g, '~'); continue;
-            case 'f': write_block_start(g);
-                      write_failure(g);
+            case 'f': write_failure(g);
                       g->unreachable = false;
-                      write_block_end(g);
                       continue;
             case 'M': write_margin(g); continue;
             case 'N': write_newline(g); continue;
@@ -197,6 +206,33 @@ static void writef(struct generator * g, const char * input, struct node * p) {
                 write_s(g, g->B[j]);
                 continue;
             }
+            case 'F': { // Among function dispatcher.
+                struct among * x = p->among;
+                if (x->function_count == 0) {
+                    continue;
+                }
+
+                w(g, ", ");
+
+                if (x->function_count == 1) {
+                    // Only one different function used in this among.
+                    struct amongvec * v = x->b;
+                    for (int j = 0; j < x->literalstring_count; j++) {
+                        if (v[j].function) {
+                            write_varref(g, v[j].function);
+                            goto continue_outer_loop;
+                        }
+                    }
+                    fprintf(stderr, "function_count == 1 but no among functions\n");
+                    exit(1);
+continue_outer_loop:
+                    continue;
+                }
+
+                w(g, "this.#af_");
+                write_int(g, x->number);
+                continue;
+            }
             case 'I': {
                 int j = input[i++] - '0';
                 if (j < 0 || j > (int)(sizeof(g->I) / sizeof(g->I[0])))
@@ -205,43 +241,17 @@ static void writef(struct generator * g, const char * input, struct node * p) {
                 continue;
             }
             case 'V':
-            case 'W': {
-                int j = input[i++] - '0';
-                if (j < 0 || j > (int)(sizeof(g->V) / sizeof(g->V[0])))
-                    goto invalid_escape2;
-                if (ch == 'V')
-                    write_varref(g, g->V[j]);
-                else
-                    write_varname(g, g->V[j]);
+                write_varref(g, p->name);
                 continue;
-            }
-            case 'L': {
-                int j = input[i++] - '0';
-                if (j < 0 || j > (int)(sizeof(g->L) / sizeof(g->L[0])))
-                    goto invalid_escape2;
-                write_literal_string(g, g->L[j]);
+            case 'W':
+                write_varname(g, p->name);
+                continue;
+            case 'L':
+                write_literal_string(g, p->literalstring);
                 continue;
-            }
             case '+': g->margin++; continue;
             case '-': g->margin--; continue;
-            case 'n': write_string(g, g->options->name); continue;
             case 'P': write_string(g, g->options->parent_class_name); continue;
-            case 'C': { // Constant.
-                if (g->options->js_esm) {
-                    w(g, "const");
-                } else {
-                    w(g, "/** @const */ var");
-                }
-                continue;
-            }
-            case 'D': { // Declare variable.
-                if (g->options->js_esm) {
-                    w(g, "let");
-                } else {
-                    w(g, "var");
-                }
-                continue;
-            }
             default:
                 printf("Invalid escape sequence ~%c in writef(g, \"%s\", p)\n",
                        ch, input);
@@ -262,46 +272,56 @@ static void generate_AE(struct generator * g, struct node * p) {
     const char * s;
     switch (p->type) {
         case c_name:
-            write_varref(g, p->name); break;
+            write_varref(g, p->name);
+            break;
         case c_number:
-            write_int(g, p->number); break;
+            write_int(g, p->number);
+            break;
         case c_maxint:
-            write_string(g, "(-1>>>1)"); break;
+            write_string(g, "(-1>>>1)");
+            break;
         case c_minint:
-            write_string(g, "(~(-1>>>1))"); break;
+            write_string(g, "(~(-1>>>1))");
+            break;
         case c_neg:
-            write_char(g, '-'); generate_AE(g, p->right); break;
+            write_char(g, '-');
+            generate_AE(g, p->right);
+            break;
         case c_multiply:
-            s = " * "; goto label0;
-        case c_plus:
-            s = " + "; goto label0;
-        case c_minus:
-            s = " - ";
-        label0:
-            write_char(g, '('); generate_AE(g, p->left);
-            write_string(g, s); generate_AE(g, p->right); write_char(g, ')'); break;
+            s = " * ";
+            goto label0;
         case c_divide:
             /* Snowball specifies integer division with semantics matching C,
              * so we need to use `Math.trunc(x/y)` here.
              */
-            write_string(g, "Math.trunc(");
+            write_string(g, "Math.trunc");
+            s = " / ";
+            goto label0;
+        case c_plus:
+            s = " + ";
+            goto label0;
+        case c_minus:
+            s = " - ";
+        label0:
+            write_char(g, '(');
             generate_AE(g, p->left);
-            write_string(g, " / ");
+            write_string(g, s);
             generate_AE(g, p->right);
             write_char(g, ')');
             break;
         case c_cursor:
-            w(g, "base.cursor"); break;
+            w(g, "this.c");
+            break;
         case c_limit:
-            w(g, p->mode == m_forward ? "base.limit" : "base.limit_backward"); break;
-        case c_lenof: /* Same as sizeof() for Javascript. */
-        case c_sizeof:
-            g->V[0] = p->name;
-            w(g, "~V0.length");
+            w(g, p->mode == m_forward ? "this.limit" : "this.limit_backward");
             break;
         case c_len: /* Same as size() for Javascript. */
         case c_size:
-            w(g, "base.current.length");
+            w(g, "this.current.length");
+            break;
+        case c_lenof: /* Same as sizeof() for Javascript. */
+        case c_sizeof:
+            writef(g, "~V.length", p);
             break;
     }
 }
@@ -317,13 +337,15 @@ static void generate_bra(struct generator * g, struct node * p) {
 
 static void generate_and(struct generator * g, struct node * p) {
     struct str * savevar = NULL;
-    if (K_needed(g, p->left)) {
+    if (K_needed_for_and(p->left)) {
         savevar = vars_newname(g);
     }
 
     write_comment(g, p);
 
-    if (savevar) write_savecursor(g, p, savevar);
+    if (savevar) {
+        write_savecursor(g, p, savevar);
+    }
 
     p = p->left;
     while (p) {
@@ -340,7 +362,7 @@ static void generate_and(struct generator * g, struct node * p) {
 
 static void generate_or(struct generator * g, struct node * p) {
     struct str * savevar = NULL;
-    if (K_needed(g, p->left)) {
+    if (K_needed_for_or(p->left)) {
         savevar = vars_newname(g);
     }
 
@@ -348,12 +370,14 @@ static void generate_or(struct generator * g, struct node * p) {
     struct str * a1 = str_copy(g->failure_str);
 
     int out_lab = new_label(g);
-    int end_unreachable = true;
+    bool end_unreachable = true;
 
     write_comment(g, p);
     wsetlab_begin(g, out_lab);
 
-    if (savevar) write_savecursor(g, p, savevar);
+    if (savevar && K_needed_node_on_f(p)) {
+        write_savecursor(g, p, savevar);
+    }
 
     p = p->left;
     str_clear(g->failure_str);
@@ -365,7 +389,8 @@ static void generate_or(struct generator * g, struct node * p) {
         exit(1);
     }
     while (p->right != NULL) {
-        g->failure_label = new_label(g);
+        int label = new_label(g);
+        g->failure_label = label;
         wsetlab_begin(g, g->failure_label);
         generate(g, p);
         if (!g->unreachable) {
@@ -374,7 +399,9 @@ static void generate_or(struct generator * g, struct node * p) {
         }
         wsetlab_end(g);
         g->unreachable = false;
-        if (savevar) write_restorecursor(g, p, savevar);
+        if (savevar) {
+            write_restorecursor(g, p, savevar);
+        }
         p = p->right;
     }
 
@@ -395,15 +422,14 @@ static void generate_or(struct generator * g, struct node * p) {
 
 static void generate_backwards(struct generator * g, struct node * p) {
     write_comment(g, p);
-    writef(g, "~Mbase.limit_backward = base.cursor; base.cursor = base.limit;~N", p);
+    writef(g, "~Mthis.limit_backward = this.c; this.c = this.limit;~N", p);
     generate(g, p->left);
-    w(g, "~Mbase.cursor = base.limit_backward;~N");
+    w(g, "~Mthis.c = this.limit_backward;~N");
 }
 
-
 static void generate_not(struct generator * g, struct node * p) {
     struct str * savevar = NULL;
-    if (K_needed(g, p->left)) {
+    if (K_needed_node_on_f(p->left)) {
         savevar = vars_newname(g);
     }
 
@@ -416,7 +442,8 @@ static void generate_not(struct generator * g, struct node * p) {
         write_savecursor(g, p, savevar);
     }
 
-    g->failure_label = new_label(g);
+    int label = new_label(g);
+    g->failure_label = label;
     str_clear(g->failure_str);
 
     wsetlab_begin(g, g->failure_label);
@@ -439,14 +466,14 @@ static void generate_not(struct generator * g, struct node * p) {
     }
 }
 
-
 static void generate_try(struct generator * g, struct node * p) {
     struct str * savevar = NULL;
-    if (K_needed(g, p->left)) {
+    if (K_needed(p->left)) {
         savevar = vars_newname(g);
     }
 
-    g->failure_label = new_label(g);
+    int label = new_label(g);
+    g->failure_label = label;
     str_clear(g->failure_str);
 
     write_comment(g, p);
@@ -467,14 +494,12 @@ static void generate_try(struct generator * g, struct node * p) {
 
 static void generate_set(struct generator * g, struct node * p) {
     write_comment(g, p);
-    g->V[0] = p->name;
-    writef(g, "~M~V0 = true;~N", p);
+    writef(g, "~M~V = true;~N", p);
 }
 
 static void generate_unset(struct generator * g, struct node * p) {
     write_comment(g, p);
-    g->V[0] = p->name;
-    writef(g, "~M~V0 = false;~N", p);
+    writef(g, "~M~V = false;~N", p);
 }
 
 static void generate_fail(struct generator * g, struct node * p) {
@@ -484,10 +509,9 @@ static void generate_fail(struct generator * g, struct node * p) {
 }
 
 /* generate_test() also implements 'reverse' */
-
 static void generate_test(struct generator * g, struct node * p) {
     struct str * savevar = NULL;
-    if (K_needed(g, p->left)) {
+    if (K_needed(p->left)) {
         savevar = vars_newname(g);
     }
 
@@ -509,20 +533,22 @@ static void generate_test(struct generator * g, struct node * p) {
 
 static void generate_do(struct generator * g, struct node * p) {
     struct str * savevar = NULL;
-    if (K_needed(g, p->left)) {
+    if (K_needed(p->left)) {
         savevar = vars_newname(g);
     }
 
     write_comment(g, p);
-    if (savevar) write_savecursor(g, p, savevar);
+    if (savevar) {
+        write_savecursor(g, p, savevar);
+    }
 
     if (p->left->type == c_call) {
         /* Optimise do <call> */
         write_comment(g, p->left);
-        g->V[0] = p->left->name;
-        w(g, "~M~V0();~N");
+        writef(g, "~M~V();~N", p->left);
     } else {
-        g->failure_label = new_label(g);
+        int label = new_label(g);
+        g->failure_label = label;
         str_clear(g->failure_str);
 
         wsetlab_begin(g, g->failure_label);
@@ -549,37 +575,40 @@ static void generate_GO_grouping(struct generator * g, struct node * p, int is_g
     struct grouping * q = p->name->grouping;
     g->S[0] = p->mode == m_forward ? "" : "_b";
     g->S[1] = complement ? "in" : "out";
-    g->V[0] = p->name;
     g->I[0] = q->smallest_ch;
     g->I[1] = q->largest_ch;
-    write_failure_if(g, "!base.go_~S1_grouping~S0(~V0, ~I0, ~I1)", p);
+    write_failure_if(g, "!this.go_~S1_grouping~S0(~V, ~I0, ~I1)", p);
     if (!is_goto) {
         if (p->mode == m_forward)
-            w(g, "~Mbase.cursor++;~N");
+            w(g, "~Mthis.c++;~N");
         else
-            w(g, "~Mbase.cursor--;~N");
+            w(g, "~Mthis.c--;~N");
     }
 }
 
-static void generate_GO(struct generator * g, struct node * p, int style) {
+static void generate_GO(struct generator * g, struct node * p, int is_goto) {
     write_comment(g, p);
 
     int a0 = g->failure_label;
     struct str * a1 = str_copy(g->failure_str);
 
-    int end_unreachable = false;
+    bool end_unreachable = false;
+
     int golab = new_label(g);
     g->I[0] = golab;
-    w(g, "~Mgolab~I0: while(true)~N");
+    // This label may end up unused, but we can't easily tell at this point.
+    w(g, "~M// deno-lint-ignore no-unused-labels~N");
+    w(g, "~Mgolab~I0: while (true)~N");
     w(g, "~{");
 
     struct str * savevar = NULL;
-    if (style == 1 || repeat_restore(g, p->left)) {
+    if (is_goto || repeat_restore(p->left)) {
         savevar = vars_newname(g);
         write_savecursor(g, p, savevar);
     }
 
-    g->failure_label = new_label(g);
+    int label = new_label(g);
+    g->failure_label = label;
     str_clear(g->failure_str);
     wsetlab_begin(g, g->failure_label);
     generate(g, p->left);
@@ -590,7 +619,7 @@ static void generate_GO(struct generator * g, struct node * p, int style) {
         end_unreachable = true;
     } else {
         /* include for goto; omit for gopast */
-        if (style == 1) write_restorecursor(g, p, savevar);
+        if (is_goto) write_restorecursor(g, p, savevar);
         g->I[0] = golab;
         w(g, "~Mbreak golab~I0;~N");
     }
@@ -612,10 +641,10 @@ static void generate_GO(struct generator * g, struct node * p, int style) {
 }
 
 static void generate_loop(struct generator * g, struct node * p) {
-    struct str * loopvar = vars_newname(g);
     write_comment(g, p);
+    struct str * loopvar = vars_newname(g);
     g->B[0] = str_data(loopvar);
-    w(g, "~Mfor (~D /** number */ ~B0 = ");
+    w(g, "~Mfor (let /** number */ ~B0 = ");
     generate_AE(g, p->AE);
     g->B[0] = str_data(loopvar);
     writef(g, "; ~B0 > 0; ~B0--)~N", p);
@@ -629,15 +658,16 @@ static void generate_loop(struct generator * g, struct node * p) {
 }
 
 static void generate_repeat_or_atleast(struct generator * g, struct node * p, struct str * loopvar) {
-    writef(g, "~Mwhile(true)~N~{", p);
+    writef(g, "~Mwhile (true) {~N~+", p);
 
     struct str * savevar = NULL;
-    if (repeat_restore(g, p->left)) {
+    if (repeat_restore(p->left)) {
         savevar = vars_newname(g);
         write_savecursor(g, p, savevar);
     }
 
-    g->failure_label = new_label(g);
+    int label = new_label(g);
+    g->failure_label = label;
     str_clear(g->failure_str);
     wsetlab_begin(g, g->failure_label);
     generate(g, p->left);
@@ -668,12 +698,12 @@ static void generate_repeat(struct generator * g, struct node * p) {
 }
 
 static void generate_atleast(struct generator * g, struct node * p) {
-    struct str * loopvar = vars_newname(g);
-
     write_comment(g, p);
+
     w(g, "~{");
+    struct str * loopvar = vars_newname(g);
     g->B[0] = str_data(loopvar);
-    w(g, "~M~D ~B0 = ");
+    w(g, "~Mlet ~B0 = ");
     generate_AE(g, p->AE);
     w(g, ";~N");
     {
@@ -692,117 +722,75 @@ static void generate_atleast(struct generator * g, struct node * p) {
     str_delete(loopvar);
 }
 
-static void generate_setmark(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    g->V[0] = p->name;
-    writef(g, "~M~V0 = base.cursor;~N", p);
-}
-
 static void generate_tomark(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? ">" : "<";
 
-    w(g, "~Mif (base.cursor ~S0 "); generate_AE(g, p->AE); w(g, ")~N");
-    write_block_start(g);
-    write_failure(g);
-    write_block_end(g);
-    g->unreachable = false;
-    w(g, "~Mbase.cursor = "); generate_AE(g, p->AE); writef(g, ";~N", p);
-}
-
-static void generate_atmark(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    w(g, "~Mif (base.cursor != "); generate_AE(g, p->AE); writef(g, ")~N", p);
-    write_block_start(g);
-    write_failure(g);
-    write_block_end(g);
+    w(g, "~Mif (this.c ~S0 "); generate_AE(g, p->AE); w(g, ") ");
+    write_failure_after_if(g);
     g->unreachable = false;
+    w(g, "~Mthis.c = "); generate_AE(g, p->AE); writef(g, ";~N", p);
 }
 
 static void generate_hop(struct generator * g, struct node * p) {
-    int c_count = ++g->keep_count;
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "+" : "-";
 
-    g->I[0] = c_count;
-    w(g, "~{~M~C /** number */ c~I0 = base.cursor ~S0 ");
-    generate_AE(g, p->AE);
-    w(g, ";~N");
-
-    g->I[0] = c_count;
-    g->S[1] = p->mode == m_forward ? "> base.limit" : "< base.limit_backward";
+    g->S[1] = p->mode == m_forward ? "> this.limit" : "< this.limit_backward";
     g->S[2] = p->mode == m_forward ? "<" : ">";
     if (p->AE->type == c_number) {
         // Constant distance hop.
         //
         // No need to check for negative hop as that's converted to false by
         // the analyser.
-        write_failure_if(g, "c~I0 ~S1", p);
+        g->I[0] = p->AE->number;
+        write_failure_if(g, "this.c ~S0 ~I0 ~S1", p);
+        writef(g, "~Mthis.c ~S0= ~I0;~N", p);
     } else {
-        write_failure_if(g, "c~I0 ~S1 || c~I0 ~S2 base.cursor", p);
+        w(g, "~{~Mconst /** number */ c = this.c ~S0 ");
+        generate_AE(g, p->AE);
+        w(g, ";~N");
+        write_failure_if(g, "c ~S1 || c ~S2 this.c", p);
+        writef(g, "~Mthis.c = c;~N", p);
+        writef(g, "~}", p);
     }
-    writef(g, "~Mbase.cursor = c~I0;~N", p);
-    writef(g, "~}", p);
-}
-
-static void generate_delete(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    writef(g, "~Mif (!base.slice_del())~N"
-              "~M{~N"
-              "~+~Mreturn false;~N~-"
-              "~M}~N", p);
 }
 
 static void generate_tolimit(struct generator * g, struct node * p) {
     write_comment(g, p);
     if (p->mode == m_forward) {
-        writef(g, "~Mbase.cursor = base.limit;~N", p);
+        writef(g, "~Mthis.c = this.limit;~N", p);
     } else {
-        writef(g, "~Mbase.cursor = base.limit_backward;~N", p);
-    }
-}
-
-static void generate_atlimit(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    if (p->mode == m_forward) {
-        write_failure_if(g, "base.cursor < base.limit", p);
-    } else {
-        write_failure_if(g, "base.cursor > base.limit_backward", p);
+        writef(g, "~Mthis.c = this.limit_backward;~N", p);
     }
 }
 
 static void generate_leftslice(struct generator * g, struct node * p) {
     write_comment(g, p);
     if (p->mode == m_forward) {
-        writef(g, "~Mbase.bra = base.cursor;~N", p);
+        writef(g, "~Mthis.bra = this.c;~N", p);
     } else {
-        writef(g, "~Mbase.ket = base.cursor;~N", p);
+        writef(g, "~Mthis.ket = this.c;~N", p);
     }
 }
 
 static void generate_rightslice(struct generator * g, struct node * p) {
     write_comment(g, p);
     if (p->mode == m_forward) {
-        writef(g, "~Mbase.ket = base.cursor;~N", p);
+        writef(g, "~Mthis.ket = this.c;~N", p);
     } else {
-        writef(g, "~Mbase.bra = base.cursor;~N", p);
+        writef(g, "~Mthis.bra = this.c;~N", p);
     }
 }
 
 static void generate_assignto(struct generator * g, struct node * p) {
     write_comment(g, p);
-    g->V[0] = p->name;
-    writef(g, "~M~V0 = base.assign_to();~N", p);
+    writef(g, "~M~V = this.current.slice(0, this.limit);~N", p);
 }
 
 static void generate_sliceto(struct generator * g, struct node * p) {
     write_comment(g, p);
-    g->V[0] = p->name;
-    writef(g, "~M~V0 = base.slice_to();~N"
-              "~Mif (~V0 == '')~N"
-              "~M{~N"
-              "~+~Mreturn false;~N~-"
-              "~M}~N", p);
+    writef(g, "~M~V = this.slice_to();~N", p);
 }
 
 static void generate_address(struct generator * g, struct node * p) {
@@ -815,60 +803,59 @@ static void generate_address(struct generator * g, struct node * p) {
 }
 
 static void generate_insert(struct generator * g, struct node * p, int style) {
-    int c_count;
-    int keep_c = style == c_attach;
     write_comment(g, p);
+    int keep_c = style == c_attach;
     if (p->mode == m_backward) keep_c = !keep_c;
     if (keep_c) {
-        c_count = ++g->keep_count;
-        g->I[0] = c_count;
-        w(g, "~{~M~C /** number */ c~I0 = base.cursor;~N");
+        w(g, "~{~Mconst /** number */ c = this.c;~N");
+        writef(g, "~Mthis.insert(c, c, ", p);
+    } else {
+        writef(g, "~Mthis.insert(this.c, this.c, ", p);
     }
-    writef(g, "~Mbase.insert(base.cursor, base.cursor, ", p);
     generate_address(g, p);
     writef(g, ");~N", p);
-    if (keep_c) {
-        g->I[0] = c_count;
-        w(g, "~Mbase.cursor = c~I0;~N~}");
-    }
+    if (keep_c) w(g, "~Mthis.c = c;~N~}");
 }
 
-static void generate_assignfrom(struct generator * g, struct node * p) {
-    int c_count;
-    int keep_c = p->mode == m_forward; /* like 'attach' */
-
+static void generate_stringassign(struct generator * g, struct node * p) {
     write_comment(g, p);
+    int keep_c = p->mode == m_forward; /* like 'attach' */
     if (keep_c) {
-        c_count = ++g->keep_count;
-        g->I[0] = c_count;
-        w(g, "~{~M~C /** number */ c~I0 = base.cursor;~N");
-    }
-    if (p->mode == m_forward) {
-        writef(g, "~Mbase.insert(base.cursor, base.limit, ", p);
+        w(g, "~{~Mconst /** number */ c = this.c;~N");
+        if (p->mode == m_forward) {
+            writef(g, "~Mthis.insert(c, this.limit, ", p);
+        } else {
+            writef(g, "~Mthis.insert(this.limit_backward, c, ", p);
+        }
     } else {
-        writef(g, "~Mbase.insert(base.limit_backward, base.cursor, ", p);
+        if (p->mode == m_forward) {
+            writef(g, "~Mthis.insert(this.c, this.limit, ", p);
+        } else {
+            writef(g, "~Mthis.insert(this.limit_backward, this.c, ", p);
+        }
     }
     generate_address(g, p);
     writef(g, ");~N", p);
     if (keep_c) {
-        g->I[0] = c_count;
-        w(g, "~Mbase.cursor = c~I0;~N~}");
+        w(g, "~Mthis.c = c;~N~}");
     }
 }
 
 static void generate_slicefrom(struct generator * g, struct node * p) {
     write_comment(g, p);
-    w(g, "~Mif (!base.slice_from(");
+    if (p->literalstring && SIZE(p->literalstring) == 0) {
+        w(g, "~Mthis.slice_del();~N");
+        return;
+    }
+    w(g, "~Mthis.slice_from(");
     generate_address(g, p);
-    writef(g, "))~N"
-              "~M{~N"
-              "~+~Mreturn false;~N~-"
-              "~M}~N", p);
+    w(g, ");~N");
 }
 
 static void generate_setlimit(struct generator * g, struct node * p) {
-    struct str * varname = vars_newname(g);
     write_comment(g, p);
+    struct str * varname = vars_newname(g);
+
     if (p->left && p->left->type == c_tomark) {
         /* Special case for:
          *
@@ -880,30 +867,32 @@ static void generate_setlimit(struct generator * g, struct node * p) {
          */
         struct node * q = p->left;
         write_comment(g, q);
+
         g->S[0] = q->mode == m_forward ? ">" : "<";
-        w(g, "~Mif (base.cursor ~S0 "); generate_AE(g, q->AE); w(g, ")~N");
-        write_block_start(g);
-        write_failure(g);
-        write_block_end(g);
+        w(g, "~Mif (this.c ~S0 "); generate_AE(g, q->AE); w(g, ") ");
+        write_failure_after_if(g);
         g->unreachable = false;
 
         g->B[0] = str_data(varname);
-        w(g, "~M~C /** number */ ~B0 = ");
         if (p->mode == m_forward) {
-            w(g, "base.limit - base.cursor;~N");
-            w(g, "~Mbase.limit = ");
+            w(g, "~Mlet /** number */ ~B0 = this.limit;~N");
+            w(g, "~Mthis.limit = ");
+            generate_AE(g, q->AE);
+            w(g, ";~N");
+            w(g, "~M~B0 -= this.limit;~N");
         } else {
-            w(g, "base.limit_backward;~N");
-            w(g, "~Mbase.limit_backward = ");
+            w(g, "~Mconst /** number */ ~B0 = this.limit_backward;~N");
+            w(g, "~Mthis.limit_backward = ");
+            generate_AE(g, q->AE);
+            w(g, ";~N");
         }
-        generate_AE(g, q->AE); writef(g, ";~N", q);
 
         if (p->mode == m_forward) {
-            str_assign(g->failure_str, "base.limit += ");
+            str_assign(g->failure_str, "this.limit += ");
             str_append(g->failure_str, varname);
             str_append_ch(g->failure_str, ';');
         } else {
-            str_assign(g->failure_str, "base.limit_backward = ");
+            str_assign(g->failure_str, "this.limit_backward = ");
             str_append(g->failure_str, varname);
             str_append_ch(g->failure_str, ';');
         }
@@ -915,22 +904,22 @@ static void generate_setlimit(struct generator * g, struct node * p) {
 
         if (!g->unreachable) {
             g->B[0] = str_data(varname);
-            w(g, "~M~C /** number */ ~B0 = ");
+            w(g, "~Mconst /** number */ ~B0 = ");
             if (p->mode == m_forward) {
-                w(g, "base.limit - base.cursor;~N");
-                w(g, "~Mbase.limit = base.cursor;~N");
+                w(g, "this.limit - this.c;~N");
+                w(g, "~Mthis.limit = this.c;~N");
             } else {
-                w(g, "base.limit_backward;~N");
-                w(g, "~Mbase.limit_backward = base.cursor;~N");
+                w(g, "this.limit_backward;~N");
+                w(g, "~Mthis.limit_backward = this.c;~N");
             }
             write_restorecursor(g, p, savevar);
 
             if (p->mode == m_forward) {
-                str_assign(g->failure_str, "base.limit += ");
+                str_assign(g->failure_str, "this.limit += ");
                 str_append(g->failure_str, varname);
                 str_append_ch(g->failure_str, ';');
             } else {
-                str_assign(g->failure_str, "base.limit_backward = ");
+                str_assign(g->failure_str, "this.limit_backward = ");
                 str_append(g->failure_str, varname);
                 str_append_ch(g->failure_str, ';');
             }
@@ -955,38 +944,74 @@ static void generate_setlimit(struct generator * g, struct node * p) {
 static void generate_dollar(struct generator * g, struct node * p) {
     write_comment(g, p);
 
+    int a0 = g->failure_label;
+    struct str * a1 = str_copy(g->failure_str);
+    int label = new_label(g);
+    g->failure_label = label;
+    str_clear(g->failure_str);
+
     struct str * savevar = vars_newname(g);
     g->B[0] = str_data(savevar);
     writef(g, "~{~N"
-              "~M~D /** !Object */ ~B0 = new ~P();~N", p);
-    writef(g, "~M~B0.copy_from(base);~N", p);
+              "~Mconst /** !Object */ ~B0 = new ~P();~N", p);
+    writef(g, "~M~B0.copy_from(this);~N", p);
+
+    writef(g, "~Mthis.current = ~V;~N"
+              "~Mthis.c = 0;~N"
+              "~Mthis.limit_backward = 0;~N"
+              "~Mthis.limit = this.current.length;~N", p);
+    if (p->left->possible_signals == -1) {
+        /* Assume failure. */
+        w(g, "~Mlet /**boolean*/ ~B0_f = true;~N");
+    }
+
+    wsetlab_begin(g, g->failure_label);
 
-    ++g->copy_from_count;
-    str_assign(g->failure_str, "base.copy_from(");
-    str_append(g->failure_str, savevar);
-    str_append_string(g->failure_str, ");");
-    g->V[0] = p->name;
-    writef(g, "~Mbase.current = ~V0;~N"
-              "~Mbase.cursor = 0;~N"
-              "~Mbase.limit_backward = 0;~N"
-              "~Mbase.limit = base.current.length;~N", p);
     generate(g, p->left);
-    if (!g->unreachable) {
-        g->V[0] = p->name;
-        writef(g, "~M~V0 = base.current;~N", p);
-        write_margin(g);
-        write_str(g, g->failure_str);
-        write_newline(g);
+
+    if (p->left->possible_signals == -1) {
+        /* Mark success. */
+        g->B[0] = str_data(savevar);
+        w(g, "~M~B0_f = false;~N");
+    }
+
+    wsetlab_end(g);
+
+    g->failure_label = a0;
+    str_delete(g->failure_str);
+    g->failure_str = a1;
+
+    g->B[0] = str_data(savevar);
+    writef(g, "~M~V = this.current;~N"
+              "~Mthis.copy_from(~B0);~N", p);
+    ++g->copy_from_count;
+
+    if (p->left->possible_signals == 0) {
+        // p->left always signals f.
+        write_failure(g);
+    } else if (p->left->possible_signals == -1) {
+        write_failure_if(g, "~B0_f", p);
     }
     w(g, "~}");
+
     str_delete(savevar);
 }
 
 static void generate_integer_assign(struct generator * g, struct node * p, const char * s) {
     write_comment(g, p);
-    g->V[0] = p->name;
+    if (p->AE->type == c_number && p->AE->number == 1) {
+        if (strcmp(s, "+=") == 0) {
+            // Optimise `+= 1` to increment.
+            writef(g, "~M++~V;~N", p);
+            return;
+        } else if (strcmp(s, "-=") == 0) {
+            // Optimise `-= 1` to decrement.
+            writef(g, "~M--~V;~N", p);
+            return;
+        }
+    }
     g->S[0] = s;
-    w(g, "~M~V0 ~S0 ");
+    writef(g, "~M~V ~S0 ", p);
     generate_AE(g, p->AE);
     w(g, ";~N");
 }
@@ -994,7 +1019,7 @@ static void generate_integer_assign(struct generator * g, struct node * p, const
 static void generate_integer_test(struct generator * g, struct node * p) {
     write_comment(g, p);
     int relop = p->type;
-    int optimise_to_return = (g->failure_label == x_return && p->right && p->right->type == c_functionend);
+    int optimise_to_return = tailcallable(g, p);
     if (optimise_to_return) {
         w(g, "~Mreturn ");
         p->right = NULL;
@@ -1004,39 +1029,42 @@ static void generate_integer_test(struct generator * g, struct node * p) {
         relop ^= 1;
     }
     generate_AE(g, p->left);
-    // Relational operators are the same as C.
-    write_c_relop(g, relop);
+    write_relop(g, relop);
     generate_AE(g, p->AE);
     if (optimise_to_return) {
         w(g, ";~N");
     } else {
-        w(g, ")~N");
-        write_block_start(g);
-        write_failure(g);
-        write_block_end(g);
+        w(g, ") ");
+        write_failure_after_if(g);
         g->unreachable = false;
     }
 }
 
 static void generate_call(struct generator * g, struct node * p) {
-    int signals = check_possible_signals_list(g, p->name->definition, c_define, 0);
+    int signals = p->name->definition->possible_signals;
     write_comment(g, p);
-    g->V[0] = p->name;
-    if (g->failure_label == x_return &&
-        (signals == 0 || (p->right && p->right->type == c_functionend))) {
-        /* Always fails or tail call. */
-        writef(g, "~Mreturn ~V0();~N", p);
+    if (tailcallable(g, p)) {
+        /* Tail call. */
+        writef(g, "~Mreturn ~V();~N", p);
+        p->right = NULL;
+        g->unreachable = true;
+        return;
+    }
+    if (just_return_on_fail(g) && signals == 0) {
+        /* Always fails. */
+        writef(g, "~Mreturn ~V();~N", p);
+        g->unreachable = true;
         return;
     }
     if (signals == 1) {
         /* Always succeeds. */
-        writef(g, "~M~V0();~N", p);
+        writef(g, "~M~V();~N", p);
     } else if (signals == 0) {
         /* Always fails. */
-        writef(g, "~M~V0();~N", p);
+        writef(g, "~M~V();~N", p);
         write_failure(g);
     } else {
-        write_failure_if(g, "!~V0()", p);
+        write_failure_if(g, "!~V()", p);
     }
 }
 
@@ -1046,41 +1074,44 @@ static void generate_grouping(struct generator * g, struct node * p, int complem
     struct grouping * q = p->name->grouping;
     g->S[0] = p->mode == m_forward ? "" : "_b";
     g->S[1] = complement ? "out" : "in";
-    g->V[0] = p->name;
     g->I[0] = q->smallest_ch;
     g->I[1] = q->largest_ch;
-    write_failure_if(g, "!(base.~S1_grouping~S0(~V0, ~I0, ~I1))", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~Mreturn this.~S1_grouping~S0(~V, ~I0, ~I1);~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "!(this.~S1_grouping~S0(~V, ~I0, ~I1))", p);
+    }
 }
 
 static void generate_namedstring(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "" : "_b";
-    g->V[0] = p->name;
-    write_failure_if(g, "!(base.eq_s~S0(~V0))", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~Mreturn this.eq_s~S0(~V);~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "!(this.eq_s~S0(~V))", p);
+    }
 }
 
 static void generate_literalstring(struct generator * g, struct node * p) {
-    symbol * b = p->literalstring;
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "" : "_b";
-    g->L[0] = b;
-    write_failure_if(g, "!(base.eq_s~S0(~L0))", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~Mreturn this.eq_s~S0(~L);~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "!(this.eq_s~S0(~L))", p);
+    }
 }
 
 static void generate_define(struct generator * g, struct node * p) {
-    struct name * q = p->name;
-    if (q->type == t_routine && !q->used) return;
-
     write_newline(g);
     write_comment(g, p);
 
-    g->V[0] = q;
-    if (q->type == t_routine) {
-        w(g, "~M/** @return {boolean} */~N"
-             "~Mfunction ~W0() {~+~N");
-    } else {
-        w(g, "~Mthis.~W0 = /** @return {boolean} */ function() {~+~N");
-    }
+    writef(g, "~M/** @return {boolean} */~N"
+              "~M#~W() {~+~N", p);
 
     /* Save output. */
     struct str * saved_output = g->outbuf;
@@ -1091,24 +1122,67 @@ static void generate_define(struct generator * g, struct node * p) {
     g->next_label = 0;
     g->var_number = 0;
 
-    if (p->amongvar_needed) {
-        w(g, "~M~D /** number */ among_var;~N");
+    struct name * q = p->name;
+
+    if (q->amongvar_needed) {
+        // The "among var" (`a`) is only assigned to, but the initialisation
+        // can be generated in a nested block so it seems hard to declare it as
+        // const and still have it visible when we want to use it.
+        w(g, "~Mlet /** number */ a;~N");
+    }
+
+    /* Declare localised variables. */
+    for (struct name * name = g->analyser->names; name; name = name->next) {
+        if (name->local_to == q) {
+            switch (name->type) {
+                case t_string:
+                    w(g, "~Mlet /** string */ ");
+                    write_varname(g, name);
+                    w(g, ";~N");
+                    break;
+                case t_integer:
+                    w(g, "~Mlet /** number */ ");
+                    write_varname(g, name);
+                    w(g, ";~N");
+                    break;
+                case t_boolean:
+                    w(g, "~Mlet /** boolean */ ");
+                    write_varname(g, name);
+                    w(g, ";~N");
+                    break;
+            }
+        }
     }
+
     str_clear(g->failure_str);
     g->failure_label = x_return;
     g->unreachable = false;
     g->keep_count = 0;
-    int signals = check_possible_signals_list(g, p->left, c_define, 0);
 
     /* Generate function body. */
     generate(g, p->left);
     if (p->left->right) {
         assert(p->left->right->type == c_functionend);
-        if (signals) {
+        if (p->left->possible_signals) {
             generate(g, p->left->right);
         }
     }
-    w(g, "~-~M};~N");
+    w(g, "~-~M}~N");
+
+    if (q->type == t_external) {
+        w(g, "~N");
+        w(g, "~M/**@return{string}*/~N");
+        writef(g, "~M~W(/**string*/input) {~+~N", p);
+        w(g, "~Mthis.setCurrent(input);~N");
+        writef(g, "~Mthis.#~W();~N", p);
+        w(g, "~Mreturn this.getCurrent();~N");
+        w(g, "~-~M}~N");
+
+        if (SIZE(q->s) == 4 && memcmp(q->s, "stem", 4) == 0) {
+            w(g, "~N");
+            w(g, "~MstemWord = this.stem;~N");
+        }
+    }
 
     str_append(saved_output, g->declarations);
     str_append(saved_output, g->outbuf);
@@ -1132,14 +1206,18 @@ static void generate_substring(struct generator * g, struct node * p) {
     g->I[0] = x->number;
 
     if (x->amongvar_needed) {
-        writef(g, "~Mamong_var = base.find_among~S0(a_~I0);~N", p);
+        writef(g, "~Ma = this.find_among~S0(a_~I0~F);~N", p);
         if (!x->always_matches) {
-            write_failure_if(g, "among_var == 0", p);
+            write_failure_if(g, "a === 0", p);
         }
     } else if (x->always_matches) {
-        writef(g, "~Mbase.find_among~S0(a_~I0);~N", p);
+        writef(g, "~Mthis.find_among~S0(a_~I0~F);~N", p);
+    } else if (x->command_count == 0 && tailcallable(g, p)) {
+        writef(g, "~Mreturn this.find_among~S0(a_~I0~F) !== 0;~N", p);
+        x->node->right = NULL;
+        g->unreachable = true;
     } else {
-        write_failure_if(g, "base.find_among~S0(a_~I0) == 0", p);
+        write_failure_if(g, "this.find_among~S0(a_~I0~F) === 0", p);
     }
 }
 
@@ -1156,23 +1234,51 @@ static void generate_among(struct generator * g, struct node * p) {
         /* Only one outcome ("no match" already handled). */
         generate(g, x->commands[0]);
     } else if (x->command_count > 0) {
-        w(g, "~Mswitch (among_var) {~N~+");
+        if (x->same_action == c_slicefrom && x->command_count > 1) {
+            if (x->nocommand_count > 0) {
+                w(g, "~Mif (a > 0) {~N~+");
+            }
+            write_comment(g, x->commands[0]);
+            g->I[0] = x->number;
+            w(g, "~Mthis.slice_from(as_~I0[a - 1]);~N");
+            if (x->nocommand_count > 0) {
+                write_block_end(g);
+            }
+            g->unreachable = false;
+            return;
+        }
+
+        w(g, "~Mswitch (a) {~N~+");
         for (int i = 1; i <= x->command_count; i++) {
             g->I[0] = i;
-            w(g, "~Mcase ~I0:~N~+");
+            w(g, "~Mcase ~I0: {~N~+");
             generate(g, x->commands[i - 1]);
             if (!g->unreachable) w(g, "~Mbreak;~N");
-            w(g, "~-");
+            w(g, "~-~M}~N");
             g->unreachable = false;
         }
         write_block_end(g);
     }
 }
 
-static void generate_booltest(struct generator * g, struct node * p) {
+static void generate_booltest(struct generator * g, struct node * p, int inverted) {
     write_comment(g, p);
-    g->V[0] = p->name;
-    write_failure_if(g, "!~V0", p);
+    if (tailcallable(g, p)) {
+        // Optimise at end of function.
+        if (inverted) {
+            writef(g, "~Mreturn !~V;~N", p);
+        } else {
+            writef(g, "~Mreturn ~V;~N", p);
+        }
+        p->right = NULL;
+        g->unreachable = true;
+        return;
+    }
+    if (inverted) {
+        write_failure_if(g, "~V", p);
+    } else {
+        write_failure_if(g, "!~V", p);
+    }
 }
 
 static void generate_false(struct generator * g, struct node * p) {
@@ -1184,7 +1290,7 @@ static void generate_debug(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->I[0] = g->debug_count++;
     g->I[1] = p->line_number;
-    writef(g, "~Mbase.debug(~I0, ~I1);~N", p);
+    writef(g, "~Mthis.debug(~I0, ~I1);~N", p);
 }
 
 static void generate(struct generator * g, struct node * p) {
@@ -1217,25 +1323,21 @@ static void generate(struct generator * g, struct node * p) {
         case c_repeat:        generate_repeat(g, p); break;
         case c_loop:          generate_loop(g, p); break;
         case c_atleast:       generate_atleast(g, p); break;
-        case c_setmark:       generate_setmark(g, p); break;
         case c_tomark:        generate_tomark(g, p); break;
-        case c_atmark:        generate_atmark(g, p); break;
         case c_hop:           generate_hop(g, p); break;
-        case c_delete:        generate_delete(g, p); break;
         case c_next:          generate_next(g, p); break;
         case c_tolimit:       generate_tolimit(g, p); break;
-        case c_atlimit:       generate_atlimit(g, p); break;
         case c_leftslice:     generate_leftslice(g, p); break;
         case c_rightslice:    generate_rightslice(g, p); break;
         case c_assignto:      generate_assignto(g, p); break;
         case c_sliceto:       generate_sliceto(g, p); break;
-        case c_assign:        generate_assignfrom(g, p); break;
+        case c_stringassign:  generate_stringassign(g, p); break;
         case c_insert:
         case c_attach:        generate_insert(g, p, p->type); break;
         case c_slicefrom:     generate_slicefrom(g, p); break;
         case c_setlimit:      generate_setlimit(g, p); break;
         case c_dollar:        generate_dollar(g, p); break;
-        case c_mathassign:    generate_integer_assign(g, p, "="); break;
+        case c_assign:        generate_integer_assign(g, p, "="); break;
         case c_plusassign:    generate_integer_assign(g, p, "+="); break;
         case c_minusassign:   generate_integer_assign(g, p, "-="); break;
         case c_multiplyassign:generate_integer_assign(g, p, "*="); break;
@@ -1243,8 +1345,7 @@ static void generate(struct generator * g, struct node * p) {
             /* Snowball specifies integer division with semantics matching C,
              * so we need to use `Math.trunc(x/y)` here.
              */
-            g->V[0] = p->name;
-            w(g, "~M~V0 = Math.trunc(~V0 / ");
+            writef(g, "~M~V = Math.trunc(~V / ", p);
             generate_AE(g, p->AE);
             w(g, ");~N");
             break;
@@ -1263,7 +1364,8 @@ static void generate(struct generator * g, struct node * p) {
         case c_literalstring: generate_literalstring(g, p); break;
         case c_among:         generate_among(g, p); break;
         case c_substring:     generate_substring(g, p); break;
-        case c_booltest:      generate_booltest(g, p); break;
+        case c_booltest:      generate_booltest(g, p, false); break;
+        case c_not_booltest:  generate_booltest(g, p, true); break;
         case c_false:         generate_false(g, p); break;
         case c_true:          break;
         case c_debug:         generate_debug(g, p); break;
@@ -1278,40 +1380,15 @@ static void generate(struct generator * g, struct node * p) {
 }
 
 static void generate_class_begin(struct generator * g) {
-    if (g->options->js_esm) {
-        w(g, "// deno-lint-ignore-file~N"
-             "import ~P from './base-stemmer.mjs'~N"
-             "~N"
-             "/** @typedef {{ stemWord(word: string): string }} Stemmer */~N"
-             "~N"
-             "/** @type {{ new(): Stemmer }} */~N"
-             "~C ~n = function() {~+~N"
-             "~M~D base = new ~P();~N");
-    } else {
-        w(g, "/**@constructor*/~N"
-             "~D ~n = function() {~+~N"
-             "~M~C ~P = require('./base-stemmer.js');~N"
-             "~M~D base = new ~P();~N");
-    }
+    w(g, "import ~P from './base-stemmer.js'~N"
+         "~N"
+         "export default class extends ~P {~+~N");
     write_newline(g);
 }
 
 static void generate_class_end(struct generator * g) {
+    w(g, "~-}~N");
     w(g, "~N");
-    w(g, "~M/**@return{string}*/~N");
-    w(g, "~Mthis['stemWord'] = function(/**string*/word) {~+~N");
-    w(g, "~Mbase.setCurrent(word);~N");
-    w(g, "~Mthis.stem();~N");
-    w(g, "~Mreturn base.getCurrent();~N");
-    w(g, "~-~M};~N");
-    w(g, "~-};~N");
-    if (g->options->js_esm) {
-        w(g, "~N"
-             "export default ~n~N");
-    } else {
-        w(g, "~N"
-             "if (typeof module === 'object' && module.exports) module.exports = ~n;~N");
-    }
 }
 
 static void generate_among_table(struct generator * g, struct among * x) {
@@ -1320,22 +1397,36 @@ static void generate_among_table(struct generator * g, struct among * x) {
     struct amongvec * v = x->b;
 
     g->I[0] = x->number;
-    w(g, "~M~C a_~I0 = [~N~+");
+    w(g, "~Mconst a_~I0 = [~N~+");
 
     for (int i = 0; i < x->literalstring_count; i++) {
-        g->I[0] = v[i].i;
-        g->I[1] = v[i].result;
-        g->L[0] = v[i].b;
-        g->S[0] = i < x->literalstring_count - 1 ? "," : "";
+        if (i) w(g, ",~N");
+        g->I[0] = v[i].result;
 
-        w(g, "~M[~L0, ~I0, ~I1");
+        w(g, "~M[");
+        write_literal_string(g, v[i].b);
+        w(g, ", ~I0");
+        if (v[i].i >= 0 || v[i].function != NULL) {
+            w(g, ", ");
+            write_int(g, v[i].i >= 0 ? i - v[i].i : 0);
+        }
         if (v[i].function != NULL) {
             w(g, ", ");
-            write_varname(g, v[i].function);
+            write_int(g, v[i].function_index);
+        }
+        w(g, "]");
+    }
+    w(g, "~N~-~M];~N~N");
+
+    if (x->same_action == c_slicefrom && x->command_count > 1) {
+        g->I[0] = x->number;
+        w(g, "~Mconst /** Array<string> */ as_~I0 = [");
+        for (int i = 1; i <= x->command_count; i++) {
+            if (i > 1) w(g, ", ");
+            write_literal_string(g, x->commands[i - 1]->left->literalstring);
         }
-        w(g, "]~S0~N");
+        w(g, "];~N~N");
     }
-    w(g, "~-~M];~N~N");
 }
 
 static void generate_amongs(struct generator * g) {
@@ -1344,11 +1435,45 @@ static void generate_amongs(struct generator * g) {
     }
 }
 
-static void set_bit(symbol * b, int i) { b[i/8] |= 1 << i%8; }
+static void generate_among_dispatcher(struct generator * g, struct among * x) {
+    if (x->function_count <= 1) return;
+
+    struct amongvec * v = x->b;
+
+    write_comment(g, x->node);
+
+    g->I[0] = x->number;
+    w(g, "~N~M/** @return {boolean} */~N");
+    w(g, "~M#af_~I0() {~N~+");
+    w(g, "~Mswitch (this.af) {~N~+");
+    for (int n = 1; n <= x->function_count; n++) {
+        w(g, "~Mcase ");
+        write_int(g, n);
+        w(g, ": return ");
+        for (int i = 0; i < x->literalstring_count; i++) {
+            if (v[i].function_index == n) {
+                write_varref(g, v[i].function);
+                w(g, "();~N");
+                break;
+            }
+        }
+    }
+    w(g, "~-~M}~N");
+    w(g, "~Mreturn false;~N");
+    w(g, "~-~M}~N");
+}
+
+static void generate_among_dispatchers(struct generator * g) {
+    for (struct among * x = g->analyser->amongs; x; x = x->next) {
+        generate_among_dispatcher(g, x);
+    }
+}
+
+static void set_bit(symbol * b, int i) { b[i >> 3] |= 1 << (i & 7); }
 
 static void generate_grouping_table(struct generator * g, struct grouping * q) {
     int range = q->largest_ch - q->smallest_ch + 1;
-    int size = (range + 7)/ 8;  /* assume 8 bits per symbol */
+    int size = (range + 7) / 8;  /* assume 8 bits per symbol */
     symbol * b = q->b;
     symbol * map = create_b(size);
 
@@ -1356,11 +1481,12 @@ static void generate_grouping_table(struct generator * g, struct grouping * q) {
 
     for (int i = 0; i < SIZE(b); i++) set_bit(map, b[i] - q->smallest_ch);
 
-    g->V[0] = q->name;
-    w(g, "~M~C /** Array<int> */ ~W0 = [");
+    w(g, "~Mconst /** Array<number> */ ");
+    write_varname(g, q->name);
+    write_string(g, " = [");
     for (int i = 0; i < size; i++) {
+        if (i) w(g, ", ");
         write_int(g, map[i]);
-        if (i < size - 1) w(g, ", ");
     }
     w(g, "];~N~N");
 
@@ -1369,27 +1495,32 @@ static void generate_grouping_table(struct generator * g, struct grouping * q) {
 
 static void generate_groupings(struct generator * g) {
     for (struct grouping * q = g->analyser->groupings; q; q = q->next) {
-        if (q->name->used)
-            generate_grouping_table(g, q);
+        generate_grouping_table(g, q);
     }
 }
 
 static void generate_members(struct generator * g) {
-    int wrote_members = false;
+    bool wrote_members = false;
 
     for (struct name * q = g->analyser->names; q; q = q->next) {
-        g->V[0] = q;
+        if (q->local_to) continue;
         switch (q->type) {
             case t_string:
-                w(g, "~M~D /** string */ ~W0 = '';~N");
+                w(g, "~M#");
+                write_varname(g, q);
+                w(g, "/** string */ = '';~N");
                 wrote_members = true;
                 break;
             case t_integer:
-                w(g, "~M~D /** number */ ~W0 = 0;~N");
+                w(g, "~M#");
+                write_varname(g, q);
+                w(g, "/** number */ = 0;~N");
                 wrote_members = true;
                 break;
             case t_boolean:
-                w(g, "~M~D /** boolean */ ~W0 = false;~N");
+                w(g, "~M#");
+                write_varname(g, q);
+                w(g, "/** boolean */ = false;~N");
                 wrote_members = true;
                 break;
         }
@@ -1410,12 +1541,30 @@ extern void generate_program_js(struct generator * g) {
 
     write_start_comment(g, "// ", NULL);
 
-    generate_class_begin(g);
+    // Disable some deno-lint warnings which the generated code can trigger.
+    w(g, "// deno-lint-ignore-file"
+         // Some of our generated deno-lint-ignore comments may not be used.
+         " ban-unused-ignore"
+         // Expressions in conditionals may be constant.
+         " no-constant-condition"
+         // Empty blocks may be generated in some cases.
+         " no-empty"
+         // Among var `a` is only assigned to once per `among`, but is declared
+         // at the start of the function and may be initialised in a nested
+         // block.
+         //
+         // Some localised variables may only be assigned to once.
+         " prefer-const~N~N");
 
     generate_amongs(g);
     generate_groupings(g);
 
+    generate_class_begin(g);
+
     generate_members(g);
+
+    generate_among_dispatchers(g);
+
     generate_methods(g);
 
     generate_class_end(g);