mittens 0.3.0 → 0.3.2

data/vendor/snowball/compiler/generator_python.c

@@ -1,43 +1,44 @@
 #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) {
-    int next_label = g->next_label++;
-    g->max_label = (next_label > g->max_label) ? next_label : g->max_label;
+static int new_label_python(struct generator * g) {
+    int next_label = new_label(g);
+    if (next_label > g->max_label) g->max_label = next_label;
     return next_label;
 }
 
-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;
-}
+#define new_label(G) new_label_python(G)
 
 /* Write routines for items from the syntax tree */
 
+static void write_relop(struct generator * g, int relop) {
+    // Relational operators are the same as C.
+    write_c_relop(g, relop);
+}
+
 static void write_varname(struct generator * g, struct name * p) {
     switch (p->type) {
         case t_external:
-            write_char(g, '_');
+            if (g->options->externals_prefix) {
+                write_string(g, g->options->externals_prefix);
+            }
             break;
         case t_routine:
             write_string(g, "__");
             /* FALLTHRU */
         default: {
-            int ch = "SBIrxg"[p->type];
-            write_char(g, ch);
+            // We use the same naming scheme for both global and local
+            // variables.
+            write_char(g, "SBIrxg"[p->type]);
             write_char(g, '_');
             break;
         }
@@ -45,16 +46,19 @@ static void write_varname(struct generator * g, struct name * p) {
     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) {
-    write_string(g, "self.");
+    if (p->type >= t_routine || p->local_to == NULL) {
+        write_string(g, "self.");
+    }
     write_varname(g, p);
 }
 
 static void write_literal_string(struct generator * g, symbol * p) {
-    write_string(g, "u\"");
+    write_char(g, '"');
     for (int i = 0; i < SIZE(p); i++) {
         int ch = p[i];
-        if (32 <= ch && ch < 0x590 && ch != 127) {
+        if ((32 <= ch && ch < 127) || (0xa0 < ch && ch < 0x590)) {
             if (ch == '"' || ch == '\\') write_char(g, '\\');
             // Our Python generator uses ENC_WIDECHARS so we need to convert.
             write_wchar_as_utf8(g, ch);
@@ -66,11 +70,11 @@ static void write_literal_string(struct generator * g, symbol * p) {
             write_hex4(g, ch);
         }
     }
-    write_string(g, "\"");
+    write_char(g, '"');
 }
 
 static void write_literal_char(struct generator * g, symbol ch) {
-    write_string(g, "u\"");
+    write_char(g, '"');
     if (32 <= ch && ch < 0x590 && ch != 127) {
         if (ch == '"' || ch == '\\') write_char(g, '\\');
         // Python uses ENC_WIDECHARS so we need to convert.
@@ -82,18 +86,14 @@ static void write_literal_char(struct generator * g, symbol ch) {
         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);
 }
 
@@ -143,11 +143,8 @@ static void wsetlab_begin(struct generator * g) {
 static void wsetlab_end(struct generator * g, int n) {
     g->I[0] = n;
     w(g, "~-~Mexcept lab~I0: pass~N");
-}
-
-static void wgotol(struct generator * g, int n) {
-    g->I[0] = n;
-    w(g, "~Mraise lab~I0()~N");
+    // We can safely reuse this later in this function.
+    g->next_label = n;
 }
 
 static void write_failure(struct generator * g) {
@@ -158,14 +155,15 @@ static void write_failure(struct generator * g) {
     }
     switch (g->failure_label) {
         case x_return:
-            w(g, "~Mreturn False~N");
-            g->unreachable = true;
+            w(g, "~Mreturn False");
             break;
         default:
-            g->I[0] = g->failure_label;
-            w(g, "~Mraise lab~I0()~N");
-            g->unreachable = true;
+            w(g, "~Mraise lab");
+            write_int(g, g->failure_label);
+            w(g, "()");
     }
+    write_newline(g);
+    g->unreachable = true;
 }
 
 static void write_failure_if(struct generator * g, const char * s, struct node * p) {
@@ -189,7 +187,6 @@ static void write_check_limit(struct generator * g, struct node * p) {
 
 /* Formatted write. */
 static void writef(struct generator * g, const char * input, struct node * p) {
-    (void)p;
     int i = 0;
 
     while (input[i]) {
@@ -235,26 +232,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 'n': write_s(g, g->options->name); continue;
             default:
                 printf("Invalid escape sequence ~%c in writef(g, \"%s\", p)\n",
                        ch, input);
@@ -275,50 +263,58 @@ 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, "sys.maxsize"); break;
+            write_string(g, "sys.maxsize");
+            break;
         case c_minint:
-            write_string(g, "(~sys.maxsize)"); break;
+            write_string(g, "(~sys.maxsize)");
+            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 Python's `/` or `//` isn't suitable (`//` would be in cases
              * where we knew that the arguments had the same sign).
-             *
-             * The `float(`...`)` is needed for Python2.
              */
-            write_string(g, "int(float(");
+            write_string(g, "int");
+            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, "self.cursor"); break;
+            w(g, "self.cursor");
+            break;
         case c_limit:
-            w(g, p->mode == m_forward ? "self.limit" : "self.limit_backward"); break;
-        case c_lenof: /* Same as sizeof() for Python. */
-        case c_sizeof:
-            g->V[0] = p->name;
-            w(g, "len(~V0)");
+            w(g, p->mode == m_forward ? "self.limit" : "self.limit_backward");
             break;
         case c_len: /* Same as size() for Python. */
         case c_size:
             w(g, "len(self.current)");
             break;
+        case c_lenof: /* Same as sizeof() for Python. */
+        case c_sizeof:
+            writef(g, "len(~V)", p);
+            break;
     }
 }
 
@@ -332,37 +328,47 @@ static void generate_bra(struct generator * g, struct node * p) {
 }
 
 static void generate_and(struct generator * g, struct node * p) {
-    struct str * savevar = vars_newname(g);
-    int keep_c = K_needed(g, p->left);
+    struct str * savevar = NULL;
+    if (K_needed_for_and(p->left)) {
+        savevar = vars_newname(g);
+    }
 
     write_comment(g, p);
 
-    if (keep_c) write_savecursor(g, p, savevar);
+    if (savevar) {
+        write_savecursor(g, p, savevar);
+    }
 
     p = p->left;
     while (p) {
         generate(g, p);
         if (g->unreachable) break;
-        if (keep_c && p->right != NULL) write_restorecursor(g, p, savevar);
+        if (savevar && p->right != NULL) write_restorecursor(g, p, savevar);
         p = p->right;
     }
-    str_delete(savevar);
+
+    if (savevar) {
+        str_delete(savevar);
+    }
 }
 
 static void generate_or(struct generator * g, struct node * p) {
-    struct str * savevar = vars_newname(g);
-    int keep_c = K_needed(g, p->left);
+    struct str * savevar = NULL;
+    if (K_needed_for_or(p->left)) {
+        savevar = vars_newname(g);
+    }
 
     int a0 = g->failure_label;
     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);
+    w(g, "~Mwhile True:~N~+");
 
-    if (keep_c) 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);
@@ -379,12 +385,14 @@ static void generate_or(struct generator * g, struct node * p) {
         wsetlab_begin(g);
         generate(g, p);
         if (!g->unreachable) {
-            wgotol(g, out_lab);
+            w(g, "~Mbreak~N");
             end_unreachable = false;
         }
         wsetlab_end(g, label);
         g->unreachable = false;
-        if (keep_c) write_restorecursor(g, p, savevar);
+        if (savevar) {
+            write_restorecursor(g, p, savevar);
+        }
         p = p->right;
     }
 
@@ -393,11 +401,14 @@ static void generate_or(struct generator * g, struct node * p) {
     g->failure_str = a1;
 
     generate(g, p);
-    wsetlab_end(g, out_lab);
+    w(g, "~Mbreak~N~-");
     if (!end_unreachable) {
         g->unreachable = false;
     }
-    str_delete(savevar);
+
+    if (savevar) {
+        str_delete(savevar);
+    }
 }
 
 static void generate_backwards(struct generator * g, struct node * p) {
@@ -408,10 +419,11 @@ static void generate_backwards(struct generator * g, struct node * p) {
     w(g, "~Mself.cursor = self.limit_backward~N");
 }
 
-
 static void generate_not(struct generator * g, struct node * p) {
-    struct str * savevar = vars_newname(g);
-    int keep_c = K_needed(g, p->left);
+    struct str * savevar = NULL;
+    if (K_needed_node_on_f(p->left)) {
+        savevar = vars_newname(g);
+    }
 
     int a0 = g->failure_label;
     struct str * a1 = str_copy(g->failure_str);
@@ -420,7 +432,7 @@ static void generate_not(struct generator * g, struct node * p) {
     str_clear(g->failure_str);
 
     write_comment(g, p);
-    if (keep_c) {
+    if (savevar) {
         write_savecursor(g, p, savevar);
     }
 
@@ -437,20 +449,24 @@ static void generate_not(struct generator * g, struct node * p) {
     wsetlab_end(g, label);
     g->unreachable = false;
 
-    if (keep_c) write_restorecursor(g, p, savevar);
-    str_delete(savevar);
+    if (savevar) {
+        write_restorecursor(g, p, savevar);
+        str_delete(savevar);
+    }
 }
 
-
 static void generate_try(struct generator * g, struct node * p) {
-    struct str * savevar = vars_newname(g);
-    int keep_c = K_needed(g, p->left);
+    struct str * savevar = NULL;
+    if (K_needed(p->left)) {
+        savevar = vars_newname(g);
+    }
+
     int label = new_label(g);
     g->failure_label = label;
     str_clear(g->failure_str);
 
     write_comment(g, p);
-    if (keep_c) {
+    if (savevar) {
         write_savecursor(g, p, savevar);
         restore_string(p, g->failure_str, savevar);
     }
@@ -460,19 +476,19 @@ static void generate_try(struct generator * g, struct node * p) {
     wsetlab_end(g, label);
     g->unreachable = false;
 
-    str_delete(savevar);
+    if (savevar) {
+        str_delete(savevar);
+    }
 }
 
 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) {
@@ -482,38 +498,43 @@ 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 = vars_newname(g);
-    int keep_c = K_needed(g, p->left);
+    struct str * savevar = NULL;
+    if (K_needed(p->left)) {
+        savevar = vars_newname(g);
+    }
 
     write_comment(g, p);
 
-    if (keep_c) {
+    if (savevar) {
         write_savecursor(g, p, savevar);
     }
 
     generate(g, p->left);
 
-    if (!g->unreachable) {
-        if (keep_c) {
+    if (savevar) {
+        if (!g->unreachable) {
             write_restorecursor(g, p, savevar);
         }
+        str_delete(savevar);
     }
-    str_delete(savevar);
 }
 
 static void generate_do(struct generator * g, struct node * p) {
-    struct str * savevar = vars_newname(g);
-    int keep_c = K_needed(g, p->left);
+    struct str * savevar = NULL;
+    if (K_needed(p->left)) {
+        savevar = vars_newname(g);
+    }
+
     write_comment(g, p);
-    if (keep_c) 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 {
         int label = new_label(g);
         g->failure_label = label;
@@ -525,8 +546,10 @@ static void generate_do(struct generator * g, struct node * p) {
         g->unreachable = false;
     }
 
-    if (keep_c) write_restorecursor(g, p, savevar);
-    str_delete(savevar);
+    if (savevar) {
+        write_restorecursor(g, p, savevar);
+        str_delete(savevar);
+    }
 }
 
 static void generate_next(struct generator * g, struct node * p) {
@@ -540,8 +563,7 @@ static void generate_GO_grouping(struct generator * g, struct node * p, int is_g
 
     g->S[0] = p->mode == m_forward ? "" : "_b";
     g->S[1] = complement ? "in" : "out";
-    g->V[0] = p->name;
-    write_failure_if(g, "not self.go_~S1_grouping~S0(~n.~W0)", p);
+    write_failure_if(g, "not self.go_~S1_grouping~S0(~n.~W)", p);
     if (!is_goto) {
         if (p->mode == m_forward)
             w(g, "~Mself.cursor += 1~N");
@@ -550,20 +572,21 @@ static void generate_GO_grouping(struct generator * g, struct node * p, int is_g
     }
 }
 
-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 end_unreachable = false;
-    struct str * savevar = vars_newname(g);
-    int keep_c = style == 1 || repeat_restore(g, p->left);
-
     int a0 = g->failure_label;
     struct str * a1 = str_copy(g->failure_str);
 
-    int golab = new_label(g);
-    w(g, "~Mtry:~N~+"
-             "~Mwhile True:~N~+");
-    if (keep_c) write_savecursor(g, p, savevar);
+    bool end_unreachable = false;
+
+    w(g, "~Mwhile True:~N~+");
+
+    struct str * savevar = NULL;
+    if (is_goto || repeat_restore(p->left)) {
+        savevar = vars_newname(g);
+        write_savecursor(g, p, savevar);
+    }
 
     int label = new_label(g);
     g->failure_label = label;
@@ -577,13 +600,15 @@ 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);
-        g->I[0] = golab;
-        w(g, "~Mraise lab~I0()~N");
+        if (is_goto) write_restorecursor(g, p, savevar);
+        w(g, "~Mbreak~N");
     }
     g->unreachable = false;
     wsetlab_end(g, label);
-    if (keep_c) write_restorecursor(g, p, savevar);
+    if (savevar) {
+        write_restorecursor(g, p, savevar);
+        str_delete(savevar);
+    }
 
     g->failure_label = a0;
     str_delete(g->failure_str);
@@ -591,49 +616,45 @@ static void generate_GO(struct generator * g, struct node * p, int style) {
 
     write_check_limit(g, p);
     write_inc_cursor(g, p);
-    w(g, "~-~-");
-    g->I[0] = golab;
-    w(g, "~Mexcept lab~I0: pass~N");
-    str_delete(savevar);
+    w(g, "~-");
     g->unreachable = end_unreachable;
 }
 
 static void generate_loop(struct generator * g, struct node * p) {
-    struct str * loopvar = vars_newname(g);
     write_comment(g, p);
-    g->B[0] = str_data(loopvar);
     if (p->AE->type == c_number && p->AE->number <= 4) {
         // Use a tuple instead of range() for small constant numbers of
         // iterations.
-        w(g, "~Mfor ~B0 in ");
+        w(g, "~Mfor _ in ");
         for (int i = p->AE->number; i > 0; --i) {
             w(g, "0");
             if (i > 1) w(g, ", ");
         }
-        writef(g, ":~N", p);
+        writef(g, ":", p);
     } else {
-        w(g, "~Mfor ~B0 in range(");
+        w(g, "~Mfor _ in range(");
         generate_AE(g, p->AE);
-        g->B[0] = str_data(loopvar);
-        writef(g, "):~N", p);
+        writef(g, "):", p);
     }
     writef(g, "~{", p);
 
     generate(g, p->left);
 
     w(g, "~}");
-    str_delete(loopvar);
     g->unreachable = false;
 }
 
 static void generate_repeat_or_atleast(struct generator * g, struct node * p, struct str * loopvar) {
-    struct str * savevar = vars_newname(g);
-    int keep_c = repeat_restore(g, p->left);
-    int label = new_label(g);
-    g->failure_label = label;
     writef(g, "~Mwhile True:~N~+", p);
-    if (keep_c) write_savecursor(g, p, savevar);
 
+    struct str * savevar = NULL;
+    if (repeat_restore(p->left)) {
+        savevar = vars_newname(g);
+        write_savecursor(g, p, savevar);
+    }
+
+    int label = new_label(g);
+    g->failure_label = label;
     str_clear(g->failure_str);
     wsetlab_begin(g);
     generate(g, p->left);
@@ -650,10 +671,12 @@ static void generate_repeat_or_atleast(struct generator * g, struct node * p, st
     wsetlab_end(g, label);
     g->unreachable = false;
 
-    if (keep_c) write_restorecursor(g, p, savevar);
+    if (savevar) {
+        write_restorecursor(g, p, savevar);
+        str_delete(savevar);
+    }
 
     w(g, "~Mbreak~N~}");
-    str_delete(savevar);
 }
 
 static void generate_repeat(struct generator * g, struct node * p) {
@@ -662,8 +685,9 @@ 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);
+
+    struct str * loopvar = vars_newname(g);
     g->B[0] = str_data(loopvar);
     w(g, "~M~B0 = ");
     generate_AE(g, p->AE);
@@ -683,12 +707,6 @@ 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 = self.cursor~N", p);
-}
-
 static void generate_tomark(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? ">" : "<";
@@ -701,23 +719,10 @@ static void generate_tomark(struct generator * g, struct node * p) {
     w(g, "~Mself.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 self.cursor != "); generate_AE(g, p->AE); writef(g, ":", p);
-    write_block_start(g);
-    write_failure(g);
-    write_block_end(g);
-    g->unreachable = false;
-}
-
 static void generate_hop(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "+" : "-";
 
-    w(g, "~Mc = self.cursor ~S0 ");
-    generate_AE(g, p->AE);
-    w(g, "~N");
-
     g->S[1] = p->mode == m_forward ? "> self.limit" : "< self.limit_backward";
     g->S[2] = p->mode == m_forward ? "<" : ">";
     if (p->AE->type == c_number) {
@@ -725,18 +730,16 @@ static void generate_hop(struct generator * g, struct node * p) {
         //
         // No need to check for negative hop as that's converted to false by
         // the analyser.
-        write_failure_if(g, "c ~S1", p);
+        g->I[0] = p->AE->number;
+        write_failure_if(g, "self.cursor ~S0 ~I0 ~S1", p);
+        w(g, "~Mself.cursor ~S0= ~I0~N");
     } else {
+        w(g, "~Mc = self.cursor ~S0 ");
+        generate_AE(g, p->AE);
+        w(g, "~N");
         write_failure_if(g, "c ~S1 or c ~S2 self.cursor", p);
+        writef(g, "~Mself.cursor = c~N", p);
     }
-    writef(g, "~Mself.cursor = c~N", p);
-}
-
-static void generate_delete(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    writef(g, "~Mif not self.slice_del():~N"
-              "~+~Mreturn False~N~-"
-              "~N", p);
 }
 
 static void generate_tolimit(struct generator * g, struct node * p) {
@@ -745,13 +748,6 @@ static void generate_tolimit(struct generator * g, struct node * p) {
     writef(g, "~Mself.cursor = ~S0~N", p);
 }
 
-static void generate_atlimit(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    g->S[0] = p->mode == m_forward ? "self.limit" : "self.limit_backward";
-    g->S[1] = p->mode == m_forward ? "<" : ">";
-    write_failure_if(g, "self.cursor ~S1 ~S0", p);
-}
-
 static void generate_leftslice(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "self.bra" : "self.ket";
@@ -766,16 +762,12 @@ static void generate_rightslice(struct generator * g, struct node * p) {
 
 static void generate_assignto(struct generator * g, struct node * p) {
     write_comment(g, p);
-    g->V[0] = p->name;
-    writef(g, "~M~V0 = self.assign_to()~N", p);
+    writef(g, "~M~V = self.assign_to()~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 = self.slice_to()~N"
-              "~Mif ~V0 == '':~N"
-              "~+~Mreturn False~N~-", p);
+    writef(g, "~M~V = self.slice_to()~N", p);
 }
 
 static void generate_address(struct generator * g, struct node * p) {
@@ -788,8 +780,8 @@ static void generate_address(struct generator * g, struct node * p) {
 }
 
 static void generate_insert(struct generator * g, struct node * p, int style) {
-    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) w(g, "~Mc = self.cursor~N");
     writef(g, "~Mself.insert(self.cursor, self.cursor, ", p);
@@ -798,11 +790,12 @@ static void generate_insert(struct generator * g, struct node * p, int style) {
     if (keep_c) w(g, "~Mself.cursor = c~N");
 }
 
-static void generate_assignfrom(struct generator * g, struct node * p) {
-    int keep_c = p->mode == m_forward; /* like 'attach' */
-
+static void generate_stringassign(struct generator * g, struct node * p) {
     write_comment(g, p);
-    if (keep_c) writef(g, "~Mc = self.cursor~N", p);
+    int keep_c = p->mode == m_forward; /* like 'attach' */
+    if (keep_c) {
+        writef(g, "~Mc = self.cursor~N", p);
+    }
     if (p->mode == m_forward) {
         writef(g, "~Mself.insert(self.cursor, self.limit, ", p);
     } else {
@@ -810,21 +803,27 @@ static void generate_assignfrom(struct generator * g, struct node * p) {
     }
     generate_address(g, p);
     writef(g, ")~N", p);
-    if (keep_c) w(g, "~Mself.cursor = c~N");
+    if (keep_c) {
+        w(g, "~Mself.cursor = c~N");
+    }
 }
 
 static void generate_slicefrom(struct generator * g, struct node * p) {
     write_comment(g, p);
-    w(g, "~Mif not self.slice_from(");
+    if (p->literalstring && SIZE(p->literalstring) == 0) {
+        w(g, "~Mself.slice_del()~N");
+        return;
+    }
+    w(g, "~Mself.slice_from(");
     generate_address(g, p);
-    writef(g, "):~N"
-              "~+~Mreturn False~N~-", p);
+    w(g, ")~N");
 }
 
 static void generate_setlimit(struct generator * g, struct node * p) {
+    write_comment(g, p);
     struct str * savevar = vars_newname(g);
     struct str * varname = vars_newname(g);
-    write_comment(g, p);
+
     if (p->left && p->left->type == c_tomark) {
         /* Special case for:
          *
@@ -836,6 +835,7 @@ 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 self.cursor ~S0 "); generate_AE(g, q->AE); w(g, ":");
         write_block_start(g);
@@ -845,13 +845,17 @@ static void generate_setlimit(struct generator * g, struct node * p) {
 
         g->B[0] = str_data(varname);
         if (p->mode == m_forward) {
-            w(g, "~M~B0 = self.limit - self.cursor~N");
+            w(g, "~M~B0 = self.limit~N");
             w(g, "~Mself.limit = ");
+            generate_AE(g, q->AE);
+            w(g, "~N");
+            w(g, "~M~B0 -= self.limit~N");
         } else {
             w(g, "~M~B0 = self.limit_backward~N");
             w(g, "~Mself.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, "self.limit += ");
@@ -862,6 +866,7 @@ static void generate_setlimit(struct generator * g, struct node * p) {
         }
     } else {
         write_savecursor(g, p, savevar);
+
         generate(g, p->left);
 
         if (!g->unreachable) {
@@ -902,47 +907,67 @@ static void generate_setlimit(struct generator * g, struct node * p) {
 /* dollar sets snowball up to operate on a string variable as if it were the
  * current string */
 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);
-    write_comment(g, p);
     writef(g, "~M~B0 = BaseStemmer()~N"
               "~M~B0.copy_from(self)~N", p);
 
-    {
-        struct str * saved_output = g->outbuf;
-        str_clear(g->failure_str);
-        g->outbuf = g->failure_str;
-        g->V[0] = p->name;
-        writef(g, "~V0 = self.current; ", p);
-        /* For Python 3, this can just be: super().copy_from(~B0) */
-        writef(g, "super(~n, self).copy_from(~B0)", p);
-        g->failure_str = g->outbuf;
-        g->outbuf = saved_output;
-    }
-
-    writef(g, "~Mself.current = ~V0~N"
+    writef(g, "~Mself.current = ~V~N"
               "~Mself.cursor = 0~N"
               "~Mself.limit = len(self.current)~N", p);
+    if (p->left->possible_signals == -1) {
+        /* Assume failure. */
+        w(g, "~M~B0_f = True~N");
+    }
+
+    wsetlab_begin(g);
+
     generate(g, p->left);
-    if (!g->unreachable) {
-        write_margin(g);
-        write_str(g, g->failure_str);
-        write_newline(g);
+
+    if (!g->unreachable && 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);
+
+    g->failure_label = a0;
+    str_delete(g->failure_str);
+    g->failure_str = a1;
+
+    g->B[0] = str_data(savevar);
+    writef(g, "~M~V = self.current~N"
+              "~Msuper().copy_from(~B0)~N", p);
+
+    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);
+    }
+
     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;
     g->S[0] = s;
-    w(g, "~M~V0 ~S0 "); generate_AE(g, p->AE); w(g, "~N");
+    writef(g, "~M~V ~S0 ", p); generate_AE(g, p->AE); w(g, "~N");
 }
 
 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;
@@ -952,8 +977,7 @@ 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");
@@ -967,24 +991,30 @@ static void generate_integer_test(struct generator * g, struct node * p) {
 }
 
 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, "not ~V0()", p);
+        write_failure_if(g, "not ~V()", p);
     }
 }
 
@@ -993,38 +1023,57 @@ static void generate_grouping(struct generator * g, struct node * p, int complem
 
     g->S[0] = p->mode == m_forward ? "" : "_b";
     g->S[1] = complement ? "out" : "in";
-    g->V[0] = p->name;
-    write_failure_if(g, "not self.~S1_grouping~S0(~n.~W0)", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~Mreturn self.~S1_grouping~S0(~n.~W)~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "not self.~S1_grouping~S0(~n.~W)", 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, "not self.eq_s~S0(~V0)", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~Mreturn self.eq_s~S0(~V)~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "not self.eq_s~S0(~V)", p);
+    }
 }
 
 static void generate_literalstring(struct generator * g, struct node * p) {
-    symbol * b = p->literalstring;
     write_comment(g, p);
+    symbol * b = p->literalstring;
+    if (SIZE(b) == 1) {
+        /* It's quite common to compare with a single character literal string,
+         * so just inline the simpler code for this case rather than making a
+         * function call.
+         */
+        if (p->mode == m_forward) {
+            writef(g, "~Mif self.cursor == self.limit or self.current[self.cursor] != ~L:~f"
+                  "~Mself.cursor += 1~N", p);
+        } else {
+            writef(g, "~Mif self.cursor <= self.limit_backward or self.current[self.cursor - 1] != ~L:~f"
+                  "~Mself.cursor -= 1~N", p);
+        }
+        return;
+    }
+
     g->S[0] = p->mode == m_forward ? "" : "_b";
-    g->L[0] = b;
-    write_failure_if(g, "not self.eq_s~S0(~L0)", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~Mreturn self.eq_s~S0(~L)~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "not self.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;
-    w(g, "~Mdef ~W0(self):~+~N");
-
-    /* Save output. */
-    struct str * saved_output = g->outbuf;
-    g->outbuf = str_new();
+    writef(g, "~Mdef ~W(self):~+~N", p);
 
     g->next_label = 0;
     g->var_number = 0;
@@ -1032,19 +1081,16 @@ static void generate_define(struct generator * g, struct node * p) {
     str_clear(g->failure_str);
     g->failure_label = x_return;
     g->unreachable = false;
-    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, "~-");
-
-    str_append(saved_output, g->outbuf);
-    str_delete(g->outbuf);
-    g->outbuf = saved_output;
 }
 
 static void generate_functionend(struct generator * g, struct node * p) {
@@ -1067,6 +1113,10 @@ static void generate_substring(struct generator * g, struct node * p) {
         }
     } else if (x->always_matches) {
         writef(g, "~Mself.find_among~S0(~n.a_~I0)~N", p);
+    } else if (x->command_count == 0 && tailcallable(g, p)) {
+        writef(g, "~Mreturn self.find_among~S0(~n.a_~I0) != 0~N", p);
+        x->node->right = NULL;
+        g->unreachable = true;
     } else {
         write_failure_if(g, "self.find_among~S0(~n.a_~I0) == 0", p);
     }
@@ -1085,6 +1135,20 @@ 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) {
+        if (x->same_action == c_slicefrom && x->command_count > 1) {
+            if (x->nocommand_count > 0) {
+                w(g, "~Mif among_var > 0:~N~+");
+            }
+            write_comment(g, x->commands[0]);
+            g->I[0] = x->number;
+            w(g, "~Mself.slice_from(~n.as_~I0[among_var - 1])~N");
+            if (x->nocommand_count > 0) {
+                w(g, "~-");
+            }
+            g->unreachable = false;
+            return;
+        }
+
         /* We dispatch the integer result in `among_var` with an if-chain,
          * which is O(n) unless Python has a special optimisation (and
          * profiling with the `timeit` module suggests it doesn't).  There
@@ -1108,10 +1172,24 @@ static void generate_among(struct generator * g, struct node * p) {
     }
 }
 
-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, "not ~V0", p);
+    if (tailcallable(g, p)) {
+        // Optimise at end of function.
+        if (inverted) {
+            writef(g, "~Mreturn not ~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, "not ~V", p);
+    }
 }
 
 static void generate_false(struct generator * g, struct node * p) {
@@ -1156,25 +1234,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;
@@ -1182,11 +1256,8 @@ static void generate(struct generator * g, struct node * p) {
             /* Snowball specifies integer division with semantics matching C,
              * so Python's `/=` or `//=` isn't suitable (`//=` would be in
              * cases where we knew that the arguments had the same sign).
-             *
-             * The `float(`...`)` is needed for Python2.
              */
-            g->V[0] = p->name;
-            w(g, "~M~V0 = int(float(~V0) / ");
+            writef(g, "~M~V = int(~V / ", p);
             generate_AE(g, p->AE);
             w(g, ")~N");
             break;
@@ -1205,7 +1276,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;
@@ -1221,13 +1293,13 @@ static void generate(struct generator * g, struct node * p) {
 
 static void generate_class_begin(struct generator * g) {
     w(g, "from .basestemmer import ");
-    w(g, g->options->parent_class_name);
+    write_string(g, g->options->parent_class_name);
     w(g, "~N"
          "from .among import Among~N"
          "~N"
          "~N"
          "class ~n(");
-    w(g, g->options->parent_class_name);
+    write_string(g, g->options->parent_class_name);
     w(g, "):~N"
          "~+~M'''~N"
          "~MThis class implements the stemming algorithm defined by a snowball script.~N"
@@ -1248,19 +1320,30 @@ static void generate_among_table(struct generator * g, struct among * x) {
 
     w(g, "~Ma_~I0 = [~N~+");
     for (int i = 0; i < x->literalstring_count; i++) {
+        if (i) w(g, ",~N");
         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 ? "," : "";
 
-        w(g, "~MAmong(~L0, ~I0, ~I1");
+        w(g, "~MAmong(");
+        write_literal_string(g, v[i].b);
+        w(g, ", ~I0, ~I1");
         if (v[i].function != NULL) {
             w(g, ", ");
             write_varname(g, v[i].function);
         }
-        w(g, ")~S0~N");
+        w(g, ")");
+    }
+    w(g, "~N~-~M]~N");
+
+    if (x->same_action == c_slicefrom && x->command_count > 1) {
+        g->I[0] = x->number;
+        w(g, "~Mas_~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, ")~N");
     }
-    w(g, "~-~M]~N");
 }
 
 static void generate_amongs(struct generator * g) {
@@ -1272,13 +1355,29 @@ static void generate_amongs(struct generator * g) {
 static void generate_grouping_table(struct generator * g, struct grouping * q) {
     symbol * b = q->b;
 
-    g->V[0] = q->name;
+    write_margin(g);
+    write_varname(g, q->name);
+    if (SIZE(b) <= 3) {
+        // The `s in g` test used in base-stemmer.py works whether g is a
+        // set or a string.
+        //
+        // The generated code for the string is smaller, faster to construct,
+        // and (for a small grouping) seems to be if anything fractionally
+        // faster to test.
+        //
+        // FIXME: The threshold seems about right for Python 3.13 but we should
+        // recheck periodically.
+        write_string(g, " = ");
+        write_literal_string(g, b);
+        w(g, "~N");
+        return;
+    }
 
     // We could use frozenset, but it seems slightly slower to construct which
     // adds to startup time.
-    w(g, "~M~W0 = {");
+    write_string(g, " = {");
     for (int i = 0; i < SIZE(b); i++) {
-        if (i > 0) w(g, ", ");
+        if (i) w(g, ", ");
         write_literal_char(g, b[i]);
     }
     w(g, "}~N~N");
@@ -1286,34 +1385,37 @@ 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) {
     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, "    ~W0 = \"\"~N");
+                write_string(g, "    ");
+                write_varname(g, q);
+                w(g, " = \"\"~N");
                 break;
             case t_integer:
-                w(g, "    ~W0 = 0~N");
+                write_string(g, "    ");
+                write_varname(g, q);
+                w(g, " = 0~N");
                 break;
             case t_boolean:
-                w(g, "    ~W0 = False~N");
+                write_string(g, "    ");
+                write_varname(g, q);
+                w(g, " = False~N");
                 break;
         }
     }
 }
 
 static void generate_methods(struct generator * g) {
-    struct node * p = g->analyser->program;
-    while (p != NULL) {
+    for (struct node * p = g->analyser->program; p; p = p->right) {
         generate(g, p);
         g->unreachable = false;
-        p = p->right;
     }
 }
 
@@ -1328,9 +1430,7 @@ static void generate_label_classes(struct generator * g)
 extern void generate_program_python(struct generator * g) {
     g->outbuf = str_new();
     g->failure_str = str_new();
-
-    // Only needed for Python 2, which defaults to ASCII.
-    w(g, "#-*- coding: utf-8 -*-~N");
+    g->max_label = -1;
 
     write_start_comment(g, "# ", NULL);
     if (g->analyser->int_limits_used) {