mittens 0.3.0 → 0.3.2

data/vendor/snowball/compiler/generator_pascal.c

@@ -1,113 +1,90 @@
 #include <assert.h>
+#include <ctype.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"
 
 #define BASE_UNIT   "SnowballProgram"
 #define BASE_CLASS  "T" BASE_UNIT
 
-/* 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) {
-    if (p->type != t_external) {
+    if (p->type == t_external) {
+        if (g->options->externals_prefix) {
+            write_string(g, g->options->externals_prefix);
+        }
+    } else {
         /* Pascal identifiers are case-insensitive but Snowball identifiers
-         * should be case-sensitive.  To address this, we encode the case of
-         * the identifier.  For readability of the generated code, the
-         * encoding tries to be minimally intrusive for common cases.
-         *
-         * After the letter which indicates the type and before the "_" we
-         * encode the case pattern in the Snowball identifier using "U" for
-         * an upper-case letter, "l" for a lower-case letter and nothing for
-         * other characters.  Any trailing string of "l" is omitted (since
-         * it's redundant and decreases readability).
-         *
-         * Identifiers without any upper-case encode most simply, e.g. I_foo2
+         * should be case-sensitive.  To address this, if any groups of
+         * identifiers of the same type have the same case, we insert a counter
+         * after the type-code for all but one of them.  This count is unique
+         * within each type of variable so this avoid collisions while being
+         * minimally intrusive on the readability of the generated code.
          *
-         * A capitalised identifier is also concise, e.g. IU_Foo2
+         * So for example:
          *
-         * All-caps gives a string of Us, e.g. IUUUUUUUU_SHOUTING
-         *
-         * But any example can be handled, e.g. IUllU_Foo79_Bar
+         * Snowball integer `i` -> Pascal `I_i`
+         * Snowball integer `I` -> Pascal `I2_i`
          *
          * We don't try to solve this problem for external identifiers - it
          * seems more helpful to leave those alone and encourage snowball
          * program authors to avoid naming externals which only differ by
          * case.
+         *
+         * We use the same naming scheme for both global and local variables.
          */
-        int len = SIZE(p->s);
-        int lower_pending = 0;
         write_char(g, "SBIrxg"[p->type]);
-        for (int i = 0; i != len; ++i) {
-            int ch = p->s[i];
-            if (ch >= 'a' && ch <= 'z') {
-                ++lower_pending;
-            } else if (ch >= 'A' && ch <= 'Z') {
-                while (lower_pending) {
-                    write_char(g, 'l');
-                    --lower_pending;
-                }
-                write_char(g, 'U');
-            }
+        if (p->case_collision) {
+            write_int(g, p->count);
         }
-
         write_char(g, '_');
     }
     write_s(g, p->s);
 }
 
 static void write_literal_string(struct generator * g, symbol * p) {
-    write_char(g, '\'');
+    if (SIZE(p) == 0) {
+        write_string(g, "''");
+        return;
+    }
+    bool in_quotes = false;
     for (int i = 0; i < SIZE(p); i++) {
         int ch = p[i];
-        if (ch == '\'') {
-            write_string(g, "''");
-        } else if (32 <= ch && ch < 127) {
+        if (32 <= ch && ch < 127) {
+            if (!in_quotes) {
+                write_char(g, '\'');
+                in_quotes = true;
+            }
+            if (ch == '\'') write_char(g, '\'');
             write_char(g, ch);
         } else {
-            write_char(g, '\'');
+            if (in_quotes) {
+                write_char(g, '\'');
+                in_quotes = false;
+            }
             write_char(g, '#');
-            write_int (g, ch);
-            write_char(g, '\'');
+            write_int(g, ch);
         }
     }
-    write_char(g, '\'');
-}
-
-static void write_margin(struct generator * g) {
-    for (int i = 0; i < g->margin; i++) write_string(g, "    ");
-}
-
-static void write_relop(struct generator * g, int relop) {
-    switch (relop) {
-        case c_eq: write_string(g, " = "); break;
-        case c_ne: write_string(g, " <> "); break;
-        case c_gt: write_string(g, " > "); break;
-        case c_ge: write_string(g, " >= "); break;
-        case c_lt: write_string(g, " < "); break;
-        case c_le: write_string(g, " <= "); break;
-        default:
-            fprintf(stderr, "Unexpected type #%d in generate_integer_test\n", relop);
-            exit(1);
+    if (in_quotes) {
+        write_char(g, '\'');
     }
 }
 
@@ -119,7 +96,7 @@ static void write_declare(struct generator * g,
     g->outbuf = g->declarations;
     write_string(g, "    ");
     writef(g, declaration, p);
-    write_string(g, ";");
+    write_char(g, ';');
     write_newline(g);
     g->outbuf = temp;
 }
@@ -127,9 +104,8 @@ static void write_declare(struct generator * 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_string(g, " }");
+    write_string(g, "// ");
+    write_comment_content(g, p, NULL);
     write_newline(g);
 }
 
@@ -154,7 +130,7 @@ static void append_restore_string(struct node * p, struct str * out, struct str
     str_append_string(out, "FCursor := ");
     if (p->mode != m_forward) str_append_string(out, "FLimit - ");
     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) {
@@ -169,25 +145,12 @@ static void write_inc_cursor(struct generator * g, struct node * p) {
     write_newline(g);
 }
 
-static void wsetlab_begin(struct generator * g) {
-    w(g, "~MRepeat~N~+");
-}
-
-static void wsetlab_end(struct generator * g, int n) {
-    w(g, "~-~MUntil True;~N");
+static void wsetl(struct generator * g, int n) {
     w(g, "lab");
     write_int(g, n);
     w(g, ":~N");
 }
 
-static void wgotol(struct generator * g, int n) {
-    write_margin(g);
-    write_string(g, "goto lab");
-    write_int(g, n);
-    write_string(g, ";");
-    write_newline(g);
-}
-
 static void write_failure(struct generator * g) {
     if (str_len(g->failure_str) != 0) {
         write_margin(g);
@@ -198,15 +161,15 @@ static void write_failure(struct generator * g) {
     switch (g->failure_label) {
         case x_return:
             write_string(g, "Begin Result := False; Exit; End;");
-            g->unreachable = true;
             break;
         default:
             write_string(g, "goto lab");
             write_int(g, g->failure_label);
-            write_string(g, ";");
-            g->unreachable = true;
+            write_char(g, ';');
+            g->label_used = 1;
     }
     write_newline(g);
+    g->unreachable = true;
 }
 
 static void write_failure_if(struct generator * g, const char * s, struct node * p) {
@@ -230,7 +193,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]) {
@@ -276,23 +238,18 @@ 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;
-                write_varname(g, g->V[j]);
+            case 'W':
+                write_varname(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 'L':
+                write_literal_string(g, p->literalstring);
+                continue;
+            case 's':
+                write_int(g, SIZE(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);
@@ -313,38 +270,52 @@ static void generate_AE(struct generator * g, struct node * p) {
     const char * s;
     switch (p->type) {
         case c_name:
-            write_varname(g, p->name); break;
+            write_varname(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, "MAXINT"); break;
+            write_string(g, "MAXINT");
+            break;
         case c_minint:
-            write_string(g, "(-MAXINT - 1)"); break;
+            write_string(g, "(-MAXINT - 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 = " - "; goto label0;
+            s = " * ";
+            goto label0;
         case c_divide:
             s = " div ";
+            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;
+            write_char(g, '(');
+            generate_AE(g, p->left);
+            write_string(g, s);
+            generate_AE(g, p->right);
+            write_char(g, ')');
+            break;
         case c_cursor:
-            w(g, "FCursor"); break;
+            w(g, "FCursor");
+            break;
         case c_limit:
-            w(g, p->mode == m_forward ? "FLimit" : "FBkLimit"); break;
+            w(g, p->mode == m_forward ? "FLimit" : "FBkLimit");
+            break;
         case c_len:
         case c_size:
             w(g, "Length(current)");
             break;
         case c_lenof:
         case c_sizeof:
-            g->V[0] = p->name;
-            w(g, "Length(~V0)");
+            writef(g, "Length(~V)", p);
             break;
     }
 }
@@ -360,13 +331,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) {
@@ -383,20 +356,22 @@ 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);
     }
 
+    int used = g->label_used;
     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, "~MRepeat~N~+");
 
-    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);
@@ -407,26 +382,33 @@ static void generate_or(struct generator * g, struct node * p) {
         fprintf(stderr, "Error: \"or\" node without children nodes.");
         exit(1);
     }
-    while (p->right) {
-        g->failure_label = new_label(g);
-        wsetlab_begin(g);
+    while (p->right != NULL) {
+        int label = new_label(g);
+        g->failure_label = label;
+        g->label_used = 0;
         generate(g, p);
         if (!g->unreachable) {
-            wgotol(g, out_lab);
+            w(g, "~MBreak;~N");
             end_unreachable = false;
         }
-        wsetlab_end(g, g->failure_label);
+
+        if (g->label_used)
+            wsetl(g, g->failure_label);
         g->unreachable = false;
-        if (savevar) write_restorecursor(g, p, savevar);
+        if (savevar) {
+            write_restorecursor(g, p, savevar);
+        }
         p = p->right;
     }
 
+    g->label_used = used;
     g->failure_label = a0;
     str_delete(g->failure_str);
     g->failure_str = a1;
 
     generate(g, p);
-    wsetlab_end(g, out_lab);
+
+    w(g, "~-~MUntil True;~N");
     if (!end_unreachable) {
         g->unreachable = false;
     }
@@ -443,10 +425,9 @@ static void generate_backwards(struct generator * g, struct node * p) {
     w(g, "~MFCursor := FBkLimit;~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);
     }
 
@@ -459,12 +440,10 @@ 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);
-    int l = g->failure_label;
-
     generate(g, p->left);
 
     g->failure_label = a0;
@@ -473,7 +452,9 @@ static void generate_not(struct generator * g, struct node * p) {
 
     if (!g->unreachable) write_failure(g);
 
-    wsetlab_end(g, l);
+    if (g->label_used)
+        wsetl(g, label);
+
     g->unreachable = false;
 
     if (savevar) {
@@ -483,14 +464,15 @@ 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;
+    g->label_used = 0;
     str_clear(g->failure_str);
 
     write_comment(g, p);
@@ -499,9 +481,10 @@ static void generate_try(struct generator * g, struct node * p) {
         append_restore_string(p, g->failure_str, savevar);
     }
 
-    wsetlab_begin(g);
     generate(g, p->left);
-    wsetlab_end(g, g->failure_label);
+
+    if (g->label_used)
+        wsetl(g, g->failure_label);
     g->unreachable = false;
 
     if (savevar) {
@@ -511,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) {
@@ -528,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);
     }
 
@@ -553,25 +533,28 @@ 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);
         generate(g, p->left);
-        wsetlab_end(g, g->failure_label);
+
+        if (g->label_used)
+            wsetl(g, g->failure_label);
         g->unreachable = false;
     }
 
@@ -593,37 +576,36 @@ 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 ? "" : "Bk";
     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, "Not (Go~S1Grouping~S0(~V0, ~I0, ~I1))", p);
+    write_failure_if(g, "Not (Go~S1Grouping~S0(~V, ~I0, ~I1))", p);
     if (!is_goto) {
-        write_string(g, p->mode == m_forward ? "Inc(FCursor);" : "Dec(FCursor);");
+        w(g, p->mode == m_forward ? "~MInc(FCursor);~N" : "~MDec(FCursor);~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 used = g->label_used;
     int a0 = g->failure_label;
     struct str * a1 = str_copy(g->failure_str);
 
-    int end_unreachable = false;
-
-    int golab = new_label(g);
+    bool end_unreachable = false;
 
     w(g, "~MWhile True Do~N");
-    w(g, "~{");
+    write_block_start(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;
+    g->label_used = 0;
     str_clear(g->failure_str);
-    wsetlab_begin(g);
     generate(g, p->left);
 
     if (g->unreachable) {
@@ -632,32 +614,32 @@ 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, "~Mgoto lab~I0;~N");
+        if (is_goto) write_restorecursor(g, p, savevar);
+        w(g, "~MBreak;~N");
     }
+
     g->unreachable = false;
-    wsetlab_end(g, g->failure_label);
+    if (g->label_used)
+        wsetl(g, g->failure_label);
     if (savevar) {
         write_restorecursor(g, p, savevar);
         str_delete(savevar);
     }
 
+    g->label_used = used;
     g->failure_label = a0;
     str_delete(g->failure_str);
     g->failure_str = a1;
 
     write_check_limit(g, p);
     write_inc_cursor(g, p);
-
-    g->I[0] = golab;
-    w(g, "~}lab~I0:~N");
+    write_block_end(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);
+    struct str * loopvar = vars_newname(g);
     g->B[0] = str_data(loopvar);
     write_declare(g, "~B0 : Integer", p);
     w(g, "~MFor ~B0 := ");
@@ -675,17 +657,18 @@ 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) {
     int replab = new_label(g);
     g->I[0] = replab;
-    writef(g, "lab~I0:~N~MWhile True Do~N~{", p);
+    writef(g, "lab~I0:~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;
+    g->label_used = 0;
     str_clear(g->failure_str);
-    wsetlab_begin(g);
     generate(g, p->left);
 
     if (!g->unreachable) {
@@ -697,8 +680,8 @@ static void generate_repeat_or_atleast(struct generator * g, struct node * p, st
         g->I[0] = replab;
         w(g, "~Mgoto lab~I0;~N");
     }
-
-    wsetlab_end(g, g->failure_label);
+    if (g->label_used)
+        wsetl(g, g->failure_label);
     g->unreachable = false;
 
     if (savevar) {
@@ -706,7 +689,7 @@ static void generate_repeat_or_atleast(struct generator * g, struct node * p, st
         str_delete(savevar);
     }
 
-    w(g, "~MBreak;~N~}");
+    w(g, "~}");
 }
 
 static void generate_repeat(struct generator * g, struct node * p) {
@@ -715,10 +698,10 @@ 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);
     write_declare(g, "~B0 : Integer", p);
     w(g, "~M~B0 := ");
@@ -740,12 +723,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~W0 := FCursor;~N", p);
-}
-
 static void generate_tomark(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? ">" : "<";
@@ -758,15 +735,6 @@ static void generate_tomark(struct generator * g, struct node * p) {
     w(g, "~MFCursor := "); 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 (FCursor <> "); generate_AE(g, p->AE); writef(g, ") Then~N", 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 ? "+" : "-";
@@ -791,24 +759,12 @@ static void generate_hop(struct generator * g, struct node * p) {
     g->temporary_used = true;
 }
 
-static void generate_delete(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    writef(g, "~MSliceDel;~N", p);
-}
-
 static void generate_tolimit(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "FLimit" : "FBkLimit";
     writef(g, "~MFCursor := ~S0;~N", p);
 }
 
-static void generate_atlimit(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    g->S[0] = p->mode == m_forward ? "FLimit" : "FBkLimit";
-    g->S[1] = p->mode == m_forward ? "<" : ">";
-    write_failure_if(g, "FCursor ~S1 ~S0", p);
-}
-
 static void generate_leftslice(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "FBra" : "FKet";
@@ -823,14 +779,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 := AssignTo();~N", p);
+    writef(g, "~M~V := AssignTo();~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 := SliceTo();~N", p);
+    writef(g, "~M~V := SliceTo();~N", p);
 }
 
 static void generate_address(struct generator * g, struct node * p) {
@@ -843,8 +797,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 := FCursor;~N");
@@ -856,10 +810,9 @@ static void generate_insert(struct generator * g, struct node * p, int style) {
     if (keep_c) w(g, "~MFCursor := 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);
+    int keep_c = p->mode == m_forward; /* like 'attach' */
     if (keep_c) {
         writef(g, "~{~MC := FCursor;~N", p);
         g->temporary_used = true;
@@ -871,19 +824,26 @@ static void generate_assignfrom(struct generator * g, struct node * p) {
     }
     generate_address(g, p);
     writef(g, ");~N", p);
-    if (keep_c) w(g, "~MFCursor := c;~N~}");
+    if (keep_c) {
+        w(g, "~MFCursor := c;~N~}");
+    }
 }
 
 static void generate_slicefrom(struct generator * g, struct node * p) {
     write_comment(g, p);
+    if (p->literalstring && SIZE(p->literalstring) == 0) {
+        w(g, "~MSliceDel;~N");
+        return;
+    }
     w(g, "~MSliceFrom(");
     generate_address(g, p);
-    writef(g, ");~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:
          *
@@ -895,6 +855,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 (FCursor ~S0 "); generate_AE(g, q->AE); w(g, ") Then~N");
         write_block_start(g);
@@ -905,14 +866,17 @@ static void generate_setlimit(struct generator * g, struct node * p) {
         g->B[0] = str_data(varname);
         write_declare(g, "~B0 : Integer", p);
         if (p->mode == m_forward) {
-            w(g, "~M~B0 := FLimit - FCursor;~N");
+            w(g, "~M~B0 := FLimit;~N");
             w(g, "~MFLimit := ");
+            generate_AE(g, q->AE);
+            w(g, ";~N");
+            w(g, "~M~B0 := ~B0 - FLimit;~N");
         } else {
             w(g, "~M~B0 := FBkLimit;~N");
             w(g, "~MFBkLimit := ");
+            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, "FLimit := FLimit + ");
@@ -971,24 +935,16 @@ 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 used = g->label_used;
+    int a0 = g->failure_label;
+    struct str * a1 = str_copy(g->failure_str);
+    int label = new_label(g);
+    g->failure_label = label;
+    g->label_used = 0;
+    str_clear(g->failure_str);
+
     struct str * savevar = vars_newname(g);
     g->B[0] = str_data(savevar);
-    g->V[0] = p->name;
-
-    {
-        struct str * saved_output = g->outbuf;
-        str_clear(g->failure_str);
-        g->outbuf = g->failure_str;
-        writef(g, "~V0 := FCurrent; "
-                  "FCurrent := ~B0_Current; "
-                  "FCursor := ~B0_Cursor; "
-                  "FLimit := ~B0_Limit; "
-                  "FBkLimit := ~B0_BkLimit; "
-                  "FBra := ~B0_Bra; "
-                  "FKet := ~B0_Ket;", p);
-        g->failure_str = g->outbuf;
-        g->outbuf = saved_output;
-    }
 
     write_declare(g, "~B0_Current : AnsiString", p);
     write_declare(g, "~B0_Cursor : Integer", p);
@@ -1003,27 +959,58 @@ static void generate_dollar(struct generator * g, struct node * p) {
               "~M~B0_BkLimit := FBkLimit;~N"
               "~M~B0_Bra := FBra;~N"
               "~M~B0_Ket := FKet;~N"
-              "~MFCurrent := ~V0;~N"
+              "~MFCurrent := ~V;~N"
               "~MFCursor := 0;~N"
               "~MFLimit := Length(current);~N", p);
+    if (p->left->possible_signals == -1) {
+        /* Assume failure. */
+        write_declare(g, "~B0_F : Boolean", p);
+        w(g, "~M~B0_F := True;~N");
+    }
+
     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");
+    }
+
+    if (g->label_used)
+        wsetl(g, g->failure_label);
+
+    g->label_used = used;
+    g->failure_label = a0;
+    str_delete(g->failure_str);
+    g->failure_str = a1;
+
+    g->B[0] = str_data(savevar);
+    writef(g, "~M~V := FCurrent;~N"
+              "~MFCurrent := ~B0_Current;~N"
+              "~MFCursor := ~B0_Cursor;~N"
+              "~MFLimit := ~B0_Limit;~N"
+              "~MFBkLimit := ~B0_BkLimit;~N"
+              "~MFBra := ~B0_Bra;~N"
+              "~MFKet := ~B0_Ket;~N", p);
+
+    if (p->left->possible_signals == 0) {
+        // p->left always signals f.
+        w(g, "~M~f~N");
+    } 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;
-    w(g, "~M~W0 := ");
+    writef(g, "~M~W := ", p);
 
     if (s != NULL) {
         g->S[0] = s;
-        w(g, "~W0 ~S0 ");
+        writef(g, "~W ~S0 ", p);
     }
 
     generate_AE(g, p->AE);
@@ -1033,7 +1020,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, "~MResult := ");
         p->right = NULL;
@@ -1057,30 +1044,29 @@ 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) {
-        if (p->right && p->right->type == c_functionend) {
-            /* Tail call. */
-            writef(g, "~MResult = ~V0;~N", p);
-            return;
-        }
-        if (signals == 0) {
-            /* Always fails. */
-            writef(g, "~MBegin; Result = ~V0; Exit; End;~N", p);
-            return;
-        }
+    if (tailcallable(g, p)) {
+        /* Tail call. */
+        writef(g, "~MResult := ~V;~N", p);
+        p->right = NULL;
+        return;
+    }
+    if (just_return_on_fail(g) && signals == 0) {
+        /* Always fails. */
+        writef(g, "~MBegin; Result := ~V; Exit; End;~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);
     }
 }
 
@@ -1090,42 +1076,50 @@ 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 ? "" : "Bk";
     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, "Not (~S1Grouping~S0(~V0, ~I0, ~I1))", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~MResult := ~S1Grouping~S0(~V, ~I0, ~I1);~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "Not (~S1Grouping~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 ? "" : "Bk";
-    g->V[0] = p->name;
-    write_failure_if(g, "Not (EqV~S0(~V0))", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~MResult := EqS~S0(~V);~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "Not (EqS~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 ? "" : "Bk";
-    g->I[0] = SIZE(b);
-    g->L[0] = b;
-    write_failure_if(g, "Not (EqS~S0(~I0, ~L0))", p);
+    if (tailcallable(g, p)) {
+        writef(g, "~MResult := EqS~S0(~L);~N", p);
+        p->right = NULL;
+    } else {
+        write_failure_if(g, "Not (EqS~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);
 
     /* Generate function header. */
-    g->V[0] = q;
-    w(g, "~MFunction T~n.~W0 : Boolean;~N");
+    writef(g, "~MFunction T~n.~W : Boolean;~N", p);
 
     /* Save output. */
-    struct str *saved_output = g->outbuf;
-    struct str *saved_declarations = g->declarations;
+    struct str * saved_output = g->outbuf;
+    struct str * saved_declarations = g->declarations;
     g->outbuf = str_new();
     g->declarations = str_new();
 
@@ -1138,24 +1132,49 @@ static void generate_define(struct generator * g, struct node * p) {
 
     /* Generate function body. */
     w(g, "~{");
-    int signals = check_possible_signals_list(g, p->left, c_define, 0);
     g->temporary_used = false;
     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, "~}");
 
+    if (q->amongvar_needed) {
+        str_append_string(g->declarations, "    AmongVar : Integer;\n");
+    }
+
     if (g->temporary_used) {
         str_append_string(g->declarations, "    C : Integer;\n");
     }
 
-    if (p->amongvar_needed) {
-        str_append_string(g->declarations, "    AmongVar : Integer;\n");
+    /* Declare localised variables. */
+    struct str * temp = g->outbuf;
+    g->outbuf = g->declarations;
+    for (struct name * name = g->analyser->names; name; name = name->next) {
+        if (name->local_to == q) {
+            switch (name->type) {
+                case t_string:
+                    w(g,  "    ");
+                    write_varname(g, name);
+                    w(g,  " : AnsiString;\n");
+                    break;
+                case t_integer:
+                    w(g,  "    ");
+                    write_varname(g, name);
+                    w(g,  " : Integer;\n");
+                    break;
+                case t_boolean:
+                    w(g,  "    ");
+                    write_varname(g, name);
+                    w(g,  " : Boolean;\n");
+                    break;
+            }
+        }
     }
+    g->outbuf = temp;
 
     if (str_len(g->declarations) > 0) {
         str_append_string(saved_output, "Var\n");
@@ -1201,6 +1220,9 @@ static void generate_substring(struct generator * g, struct node * p) {
         }
     } else if (x->always_matches) {
         writef(g, "~MFindAmong~S0(a_~I0, ~I1);~N", p);
+    } else if (x->command_count == 0 && tailcallable(g, p)) {
+        writef(g, "~MResult := FindAmong~S0(a_~I0, ~I1) <> 0;~N", p);
+        x->node->right = NULL;
     } else {
         write_failure_if(g, "FindAmong~S0(a_~I0, ~I1) = 0", p);
     }
@@ -1231,10 +1253,23 @@ 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, "~MResult := !~V;~N", p);
+        } else {
+            writef(g, "~MResult := ~V;~N", p);
+        }
+        p->right = NULL;
+        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) {
@@ -1279,25 +1314,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, NULL); break;
+        case c_assign:        generate_integer_assign(g, p, NULL); 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;
@@ -1317,7 +1348,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;
@@ -1333,7 +1365,7 @@ static void generate(struct generator * g, struct node * p) {
 
 /* Class declaration generation. */
 static void generate_unit_start(struct generator * g) {
-    write_start_comment(g, "{ ", " }");
+    write_start_comment(g, "// ", NULL);
     w(g, "Unit ~n;~N~N{$HINTS OFF}~N~NInterface~N~NUses " BASE_UNIT ";~N");
 }
 
@@ -1350,10 +1382,13 @@ static void generate_class_end(struct generator * g) {
 }
 
 static void generate_method_decl(struct generator * g, struct name * q) {
-    g->V[0] = q;
-    w(g, "~MFunction ~W0 : Boolean;");
+    w(g, "~MFunction ");
+    write_varname(g, q);
+    w(g, " : Boolean;");
     if (q->type == t_external) {
-        w(g, " Override;");
+        if (SIZE(q->s) == 4 && memcmp(q->s, "stem", 4) == 0) {
+            w(g, " Override;");
+        }
     }
     w(g, "~N");
 }
@@ -1369,7 +1404,7 @@ static void generate_method_decls(struct generator * g) {
     }
     w(g, "~-");
 
-    int first = true;
+    bool first = true;
     for (struct name * q = g->analyser->names; q; q = q->next) {
         if (q->type == t_routine) {
             if (first) {
@@ -1383,9 +1418,9 @@ static void generate_method_decls(struct generator * g) {
 }
 
 static void generate_member_decls(struct generator * g) {
-    int first = true;
+    bool first = true;
     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:
             case t_integer:
@@ -1396,13 +1431,19 @@ static void generate_member_decls(struct generator * g) {
                 }
                 switch (q->type) {
                     case t_string:
-                        w(g, "~M~W0 : AnsiString;~N");
+                        write_margin(g);
+                        write_varname(g, q);
+                        w(g, " : AnsiString;~N");
                         break;
                     case t_integer:
-                        w(g, "~M~W0 : Integer;~N");
+                        write_margin(g);
+                        write_varname(g, q);
+                        w(g, " : Integer;~N");
                         break;
                     case t_boolean:
-                        w(g, "~M~W0 : Boolean;~N");
+                        write_margin(g);
+                        write_varname(g, q);
+                        w(g, " : Boolean;~N");
                         break;
                 }
         }
@@ -1439,8 +1480,9 @@ static void generate_among_table(struct generator * g, struct among * x) {
         g->I[1] = i;
 
         /* Write among's string. */
-        g->L[0] = v[i].b;
-        w(g, "~Ma_~I0[~I1].Str  := ~L0;~N");
+        w(g, "~Ma_~I0[~I1].Str  := ");
+        write_literal_string(g, v[i].b);
+        w(g, ";~N");
 
         /* Write among's index & result. */
         g->I[2] = v[i].i;
@@ -1453,8 +1495,9 @@ static void generate_among_table(struct generator * g, struct among * x) {
         if (v[i].function == NULL) {
             w(g, "nil;~N~N");
         } else {
-            g->V[0] = v[i].function;
-            w(g, "Self.~W0;~N~N");
+            w(g, "Self.");
+            write_varname(g, v[i].function);
+            w(g, ";~N~N");
         }
     }
     w(g, "~-");
@@ -1473,19 +1516,17 @@ static void generate_constructor(struct generator * g) {
 }
 
 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;
     }
 }
 
-static void set_bit(symbol * b, int i) { b[i/8] |= 1 << i%8; }
+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);
 
@@ -1493,9 +1534,10 @@ 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;
     g->I[0] = size - 1;
-    w(g, "~N~MConst~+~N~M~W0 : Array [0..~I0] Of Char = (~N~+");
+    w(g, "~N~MConst~+~N~M");
+    write_varname(g, q->name);
+    w(g, " : Array [0..~I0] Of Char = (~N~+");
     for (int i = 0; i < size; i++) {
         if (i != 0) w(g, ",~N");
         g->I[0] = map[i];
@@ -1508,8 +1550,7 @@ 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);
     }
 }