mittens 0.1.1 → 0.3.0

data/vendor/snowball/compiler/generator_ada.c

@@ -1,14 +1,13 @@
+#include <assert.h>
 #include <stdlib.h> /* for exit */
 #include <string.h> /* for strlen */
 #include <stdio.h> /* for fprintf etc */
 #include <ctype.h>
-#include <limits.h>
 #include "header.h"
 
 /* prototypes */
 
 static void generate(struct generator * g, struct node * p);
-static void generate_next(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);
 
@@ -17,7 +16,6 @@ static int new_label(struct generator * g) {
 }
 
 static struct str * vars_newname(struct generator * g) {
-
     struct str * output;
     g->var_number++;
     output = str_new();
@@ -29,17 +27,19 @@ static struct str * vars_newname(struct generator * g) {
 /* Write routines for items from the syntax tree */
 
 static void write_varname(struct generator * g, struct name * p) {
-
-    int ch = p->b[0];
     if (p->type != t_external) {
         write_char(g, "SBIRXG"[p->type]);
         write_char(g, '_');
-    }   
-    write_char(g, toupper(ch));
-    str_append_b_tail(g->outbuf, p->b, 1);
+    }
 
-    ch = p->b[SIZE(p->b) - 1];
-    if (ch == '_') {
+    {
+        char save_initial = p->s[0];
+        p->s[0] = toupper(save_initial);
+        str_append_s(g->outbuf, p->s);
+        p->s[0] = save_initial;
+    }
+
+    if (p->s[SIZE(p->s) - 1] == '_') {
         write_char(g, 'E');
     }
 }
@@ -50,11 +50,10 @@ static void write_varref(struct generator * g, struct name * p) {  /* reference
 }
 
 static void write_literal_string(struct generator * g, symbol * p) {
-    int i;
     // Ada supports UTF-8 literal strings, we only need to escape the quote and
     // special characters.
     write_char(g, '"');
-    for (i = 0; i < SIZE(p); i++) {
+    for (int i = 0; i < SIZE(p); i++) {
         int ch = p[i];
         if (ch == '"') {
             write_string(g, "\"\"");
@@ -72,17 +71,30 @@ static void write_literal_string(struct generator * g, symbol * p) {
 }
 
 static void write_margin(struct generator * g) {
-    int i;
-    for (i = 0; i < g->margin; i++) write_string(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);
+    }
 }
 
 /* Write a variable declaration. */
 static void write_declare(struct generator * g,
-                          char * declaration,
+                          const char * declaration,
                           struct node * p) {
     struct str * temp = g->outbuf;
     g->outbuf = g->declarations;
-    write_string(g, "   ");
+    write_string(g, "      ");
     writef(g, declaration, p);
     write_string(g, ";");
     write_newline(g);
@@ -90,54 +102,44 @@ static void write_declare(struct generator * g,
 }
 
 static void write_comment(struct generator * g, struct node * p) {
-    if (g->options->comments) {
-        write_margin(g);
-        write_string(g, "--  ");
-        write_comment_content(g, p);
-        write_newline(g);
-    }
+    if (!g->options->comments) return;
+    write_margin(g);
+    write_string(g, "--  ");
+    write_comment_content(g, p);
+    write_newline(g);
 }
 
 static void write_block_start(struct generator * g) {
     w(g, "~Mbegin~+~N");
 }
 
-static void write_block_end(struct generator * g) {   /* block end */
+static void write_block_end(struct generator * g) {
     w(g, "~-~Mend;~N");
 }
 
-static void restore_string(struct node * p, struct str * out, struct str * savevar) {
-
-    str_clear(out);
-    str_append_string(out, "Z.C := ");
-    if (p->mode != m_forward) str_append_string(out, "Z.L - ");
-    str_append(out, savevar);
-    str_append_string(out, ";");
-}
-
 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] = "Z.L - ";
-    write_declare(g, "   ~B0 : Char_Index", p);
+    write_declare(g, "~B0 : Char_Index", p);
     writef(g, "~M~B0 := ~S1Z.C;~N" , p);
 }
 
+static void append_restore_string(struct node * p, struct str * out, struct str * savevar) {
+    str_append_string(out, "Z.C := ");
+    if (p->mode != m_forward) str_append_string(out, "Z.L - ");
+    str_append(out, savevar);
+    str_append_string(out, ";");
+}
+
 static void write_restorecursor(struct generator * g, struct node * p, struct str * savevar) {
     write_margin(g);
-    if (p->mode == m_forward) {
-        write_string(g, "Z.C := ");
-    } else {
-        write_string(g, "Z.C := Z.L - ");
-    }
-    write_str(g, savevar);
-    write_string(g, ";");
+    append_restore_string(p, g->outbuf, savevar);
     write_newline(g);
 }
 
 static void wsetl(struct generator * g, int n) {
-
     write_newline(g);
     write_margin(g);
     write_string(g, "<<lab");
@@ -156,7 +158,6 @@ static void wgotol(struct generator * g, int n) {
 }
 
 static void write_failure(struct generator * g) {
-
     if (str_len(g->failure_str) != 0) {
         write_margin(g);
         write_str(g, g->failure_str);
@@ -180,8 +181,7 @@ static void write_failure(struct generator * g) {
     g->unreachable = true;
 }
 
-static void write_failure_if(struct generator * g, char * s, struct node * p) {
-
+static void write_failure_if(struct generator * g, const char * s, struct node * p) {
     writef(g, "~Mif ", p);
     writef(g, s, p);
     writef(g, " then~N~+", p);
@@ -201,19 +201,19 @@ 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;
-    int l = strlen(input);
 
-    while (i < l) {
+    while (input[i]) {
         int ch = input[i++];
         if (ch != '~') {
             write_char(g, ch);
             continue;
         }
-        switch (input[i++]) {
-            default: write_char(g, input[i - 1]); continue;
-            case 'C': write_comment(g, p); continue;
-            case 'f': 
+        ch = input[i++];
+        switch (ch) {
+            case '~': write_char(g, '~'); continue;
+            case 'f':
                       write_failure(g);
                       g->unreachable = false;
                       continue;
@@ -221,47 +221,80 @@ static void writef(struct generator * g, const char * input, struct node * p) {
             case 'N': write_newline(g); continue;
             case '{': write_block_start(g); continue;
             case '}': write_block_end(g); continue;
-            case 'S': write_string(g, g->S[input[i++] - '0']); continue;
-            case 'B': write_b(g, g->B[input[i++] - '0']); continue;
-            case 'I': write_int(g, g->I[input[i++] - '0']); continue;
-            case 'V': write_varref(g, g->V[input[i++] - '0']); continue;
-            case 'W': write_varname(g, g->V[input[i++] - '0']); continue;
-            case 'L': write_literal_string(g, g->L[input[i++] - '0']); continue;
+            case 'S': {
+                int j = input[i++] - '0';
+                if (j < 0 || j > (int)(sizeof(g->S) / sizeof(g->S[0]))) {
+                    printf("Invalid escape sequence ~%c%c in writef(g, \"%s\", p)\n",
+                           ch, input[i - 1], input);
+                    exit(1);
+                }
+                write_string(g, g->S[j]);
+                continue;
+            }
+            case 'B': {
+                int j = input[i++] - '0';
+                if (j < 0 || j > (int)(sizeof(g->B) / sizeof(g->B[0])))
+                    goto invalid_escape2;
+                write_s(g, g->B[j]);
+                continue;
+            }
+            case 'I': {
+                int j = input[i++] - '0';
+                if (j < 0 || j > (int)(sizeof(g->I) / sizeof(g->I[0])))
+                    goto invalid_escape2;
+                write_int(g, g->I[j]);
+                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]);
+                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]);
+                continue;
+            }
             case '+': g->margin++; continue;
             case '-': g->margin--; continue;
             case 'n': write_string(g, g->options->name); continue;
+            default:
+                printf("Invalid escape sequence ~%c in writef(g, \"%s\", p)\n",
+                       ch, input);
+                exit(1);
+            invalid_escape2:
+                printf("Invalid escape sequence ~%c%c in writef(g, \"%s\", p)\n",
+                       ch, input[i - 1], input);
+                exit(1);
         }
     }
 }
 
 static void w(struct generator * g, const char * s) {
-    writef(g, s, 0);
+    writef(g, s, NULL);
 }
 
 static int need_among_var(struct node *p) {
-
     while (p) {
-        if (p->type == c_substring || p->type == c_among) {
+        if (p->type == c_among) {
             return 1;
         }
-        if (p->right && need_among_var(p->right)) {
+        if (p->left && need_among_var(p->left)) {
             return 1;
         }
-        p = p->left;
-    }
-    return 0;
-}
-
-static int need_among_handler(struct among *a) {
-    int i;
-    struct amongvec * v = a->b;
-
-    for (i = 0; i < a->literalstring_count; i++, v++) {
-        if (v->function != 0) {
+        if (p->aux && need_among_var(p->aux)) {
             return 1;
         }
+        p = p->right;
     }
-
     return 0;
 }
 
@@ -303,12 +336,15 @@ static void generate_AE(struct generator * g, struct node * p) {
             w(g, "Length_Utf8 (Z)");
             break;
         case c_size:
-            w(g, "Length (Z)");
+            w(g, "Z.Len");
             break;
         case c_lenof:
+            g->V[0] = p->name;
+            w(g, "Length_Utf8 (Ada.Strings.Unbounded.To_String (~V0))");
+            break;
         case c_sizeof:
             g->V[0] = p->name;
-            w(g, "Length_Utf8 (~V0)");
+            w(g, "Ada.Strings.Unbounded.Length (~V0)");
             break;
         default:
             break;
@@ -325,27 +361,34 @@ 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(g, 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 != 0) 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);
+    struct str * savevar = NULL;
+    if (K_needed(g, p->left)) {
+        savevar = vars_newname(g);
+    }
     int used = g->label_used;
-    int keep_c = K_needed(g, p->left);
 
     int a0 = g->failure_label;
     struct str * a1 = str_copy(g->failure_str);
@@ -355,13 +398,13 @@ static void generate_or(struct generator * g, struct node * p) {
 
     write_comment(g, p);
 
-    if (keep_c) write_savecursor(g, p, savevar);
+    if (savevar) write_savecursor(g, p, savevar);
 
     p = p->left;
     str_clear(g->failure_str);
 
-    if (p == 0) {
-        /* p should never be 0 after an or: there should be at least two
+    if (p == NULL) {
+        /* p should never be NULL after an or: there should be at least two
          * sub nodes. */
         fprintf(stderr, "Error: \"or\" node without children nodes.");
         exit(1);
@@ -374,13 +417,11 @@ static void generate_or(struct generator * g, struct node * p) {
             wgotol(g, out_lab);
             end_unreachable = false;
         }
-        
+
         if (g->label_used)
             wsetl(g, g->failure_label);
         g->unreachable = false;
-        if (keep_c) {
-            write_restorecursor(g, p, savevar);
-        }
+        if (savevar) write_restorecursor(g, p, savevar);
         p = p->right;
     }
     g->label_used = used;
@@ -393,32 +434,37 @@ static void generate_or(struct generator * g, struct node * p) {
     if (!end_unreachable) {
         g->unreachable = false;
     }
-    str_delete(savevar);
+
+    if (savevar) {
+        str_delete(savevar);
+    }
 }
 
 static void generate_backwards(struct generator * g, struct node * p) {
-    writef(g, "~MZ.Lb := Z.C; Z.C := Z.L;~C~N", p);
+    write_comment(g, p);
+    writef(g, "~MZ.Lb := Z.C; Z.C := Z.L;~N", p);
     generate(g, p->left);
     w(g, "~MZ.C := Z.Lb;~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(g, p->left)) {
+        savevar = vars_newname(g);
+    }
 
-    int a0 = g->failure_label, l;
+    int a0 = g->failure_label;
     struct str * a1 = str_copy(g->failure_str);
 
     write_comment(g, p);
-    if (keep_c) {
+    if (savevar) {
         write_savecursor(g, p, savevar);
     }
 
     g->failure_label = new_label(g);
     str_clear(g->failure_str);
 
-    l = g->failure_label;
+    int l = g->failure_label;
 
     generate(g, p->left);
 
@@ -433,32 +479,34 @@ static void generate_not(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_try(struct generator * g, struct node * p) {
-    struct str * savevar;
-    int keep_c = K_needed(g, p->left);
+    struct str * savevar = NULL;
+    if (K_needed(g, p->left)) {
+        savevar = vars_newname(g);
+    }
 
     g->failure_label = new_label(g);
     g->label_used = 0;
     str_clear(g->failure_str);
 
     write_comment(g, p);
-    if (keep_c) {
-        savevar = vars_newname(g);
+    if (savevar) {
         write_savecursor(g, p, savevar);
-        restore_string(p, g->failure_str, savevar);
-    }    
+        append_restore_string(p, g->failure_str, savevar);
+    }
 
     generate(g, p->left);
     if (g->label_used)
         wsetl(g, g->failure_label);
     g->unreachable = false;
 
-    if (keep_c) {
+    if (savevar) {
         str_delete(savevar);
     }
 }
@@ -484,30 +532,35 @@ 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(g, 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(g, 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> */
@@ -524,62 +577,60 @@ 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) {
+    write_comment(g, p);
+    if (p->mode == m_forward)
+        w(g, "~MC := Skip_Utf8 (Z);~N");
+    else
+        w(g, "~MC := Skip_Utf8_Backward (Z);~N");
+    write_failure_if(g, "C < 0", p);
+    w(g, "~MZ.C := C;~N");
+    g->temporary_used = true;
 }
 
 static void generate_GO_grouping(struct generator * g, struct node * p, int is_goto, int complement) {
+    write_comment(g, p);
 
     struct grouping * q = p->name->grouping;
     g->S[0] = p->mode == m_forward ? "" : "_Backward";
     g->S[1] = complement ? "In" : "Out";
-    g->S[2] = g->options->encoding == ENC_UTF8 ? "" : "";
     g->V[0] = p->name;
     g->I[0] = q->smallest_ch;
     g->I[1] = q->largest_ch;
     if (is_goto) {
-        writef(g, "~M~S1_Grouping~S0~S2 (Z, ~V0, ~I0, ~I1, True, C);", p);
+        writef(g, "~M~S1_Grouping~S0 (Z, ~V0, ~I0, ~I1, True, C);~N", p);
         write_failure_if(g, "C < 0", p);
     } else {
-        writef(g, "~C"
-              "~M~S1_Grouping~S0~S2 (Z, ~V0, ~I0, ~I1, True, C);~N", p);
+        writef(g, "~M~S1_Grouping~S0 (Z, ~V0, ~I0, ~I1, True, C);~N", p);
         write_failure_if(g, "C < 0", p);
-        
+
         if (p->mode == m_forward)
             w(g, "~MZ.C := Z.C + C;~N");
         else
             w(g, "~MZ.C := Z.C - C;~N");
     }
+    g->temporary_used = true;
 }
 
 static void generate_GO(struct generator * g, struct node * p, int style) {
-    int end_unreachable = false;
+    write_comment(g, p);
+
     int used = g->label_used;
-    /* Initialise to NULL to suppress bogus "may be used uninitialised" warning. */
-    struct str * savevar = NULL;
-    int keep_c = style == 1 || repeat_restore(g, p->left);
+
     int a0 = g->failure_label;
 
+    int end_unreachable = false;
     int golab = new_label(g);
-
-    if (p->left->type == c_grouping || p->left->type == c_non) {
-        /* Special case for "goto" or "gopast" when used on a grouping or an
-         * inverted grouping - the movement of c by the matching action is
-         * exactly what we want! */
-#ifdef OPTIMISATION_WARNINGS
-        printf("Optimising %s %s\n", style ? "goto" : "gopast", p->left->type == c_non ? "non" : "grouping");
-#endif
-        if (g->options->comments) {
-            writef(g, "~M~C", p);
-        }
-        generate_GO_grouping(g, p->left, style, p->left->type == c_non);
-        return;
-    }
-
-    write_comment(g, p);
     w(g, "~Mloop~N~+");
 
-    if (keep_c) {
+    struct str * savevar = NULL;
+    if (style == 1 || repeat_restore(g, p->left)) {
         savevar = vars_newname(g);
         write_savecursor(g, p, savevar);
     }
@@ -602,7 +653,7 @@ static void generate_GO(struct generator * g, struct node * p, int style) {
     g->unreachable = false;
     if (g->label_used)
         wsetl(g, g->failure_label);
-    if (keep_c) {
+    if (savevar) {
         write_restorecursor(g, p, savevar);
         str_delete(savevar);
     }
@@ -612,8 +663,8 @@ static void generate_GO(struct generator * g, struct node * p, int style) {
     write_check_limit(g, p);
     generate_next(g, p);
 
-    g->I[0] = golab;
     w(g, "~-~Mend loop;~N");
+
     g->unreachable = end_unreachable;
 }
 
@@ -621,35 +672,34 @@ 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);
-    write_declare(g, "   ~B0 : Integer", p);
-    w(g, "~MFor ~B0 := ");
+    w(g, "~Mfor ~B0 in reverse 1 .. ");
     generate_AE(g, p->AE);
-    writef(g, " DownTo 1 Do~N", p);
-    writef(g, "~{", p);
+    writef(g, " loop~N~+", p);
 
     generate(g, p->left);
 
-    w(g, "~}");
+    w(g, "~-~Mend loop;~N");
     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 replab = new_label(g);
-    g->I[0] = replab;
     wsetl(g, replab);
     writef(g, "~N~Mloop~N~+", p);
 
-    if (keep_c) write_savecursor(g, p, savevar);
+    struct str * savevar = NULL;
+    if (repeat_restore(g, p->left)) {
+        savevar = vars_newname(g);
+        write_savecursor(g, p, savevar);
+    }
 
     g->failure_label = new_label(g);
     g->label_used = 0;
     generate(g, p->left);
 
     if (!g->unreachable) {
-        if (loopvar != 0) {
+        if (loopvar != NULL) {
             g->B[0] = str_data(loopvar);
             w(g, "~M~B0 := ~B0 - 1;~N");
         }
@@ -661,10 +711,12 @@ static void generate_repeat_or_atleast(struct generator * g, struct node * p, st
         wsetl(g, g->failure_label);
     g->unreachable = false;
 
-    if (keep_c) write_restorecursor(g, p, savevar);
+    if (savevar) {
+        write_restorecursor(g, p, savevar);
+        str_delete(savevar);
+    }
 
     w(g, "~N~Mexit;~N~-~Mend loop;~N");
-    str_delete(savevar);
 }
 
 static void generate_repeat(struct generator * g, struct node * p) {
@@ -678,8 +730,7 @@ static void generate_atleast(struct generator * g, struct node * p) {
     write_comment(g, p);
     w(g, "~{");
     g->B[0] = str_data(loopvar);
-
-    write_declare(g, "   ~B0 : Integer", p);
+    write_declare(g, "~B0 : Integer", p);
     w(g, "~M~B0 := ");
     generate_AE(g, p->AE);
     w(g, ";~N");
@@ -722,22 +773,14 @@ static void generate_atmark(struct generator * g, struct node * p) {
 }
 
 static void generate_hop(struct generator * g, struct node * p) {
+    write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "" : "_Backward";
-    if (g->options->encoding == ENC_UTF8) {
-        w(g, "~MC := Skip_Utf8~S0 (Z, ");
-        generate_AE(g, p->AE); writef(g, ");~C~N", p);
-        write_failure_if(g, "C < 0", p);
-    } else {
-        w(g, "~MC := Z.C ~S0 ");
-        generate_AE(g, p->AE);
-        writef(g, ";~C~N", p);
-        if (p->mode == m_forward) {
-            write_failure_if(g, "C > Z.L or C < Z.C", p);
-        } else {
-            write_failure_if(g, "C < Z.Lb or C > Z.C", p);
-        }
-    }
+
+    w(g, "~MC := Skip_Utf8~S0 (Z, ");
+    generate_AE(g, p->AE); writef(g, ");~N", p);
+    write_failure_if(g, "C < 0", p);
     writef(g, "~MZ.C := C;~N", p);
+    g->temporary_used = true;
 }
 
 static void generate_delete(struct generator * g, struct node * p) {
@@ -745,19 +788,10 @@ static void generate_delete(struct generator * g, struct node * p) {
     writef(g, "~MSlice_Del (Z);~N", p);
 }
 
-static void generate_next(struct generator * g, struct node * p) {
-    write_comment(g, p);
-    if (p->mode == m_forward)
-        w(g, "~MC := Skip_Utf8 (Z);~N");
-    else
-        w(g, "~MC := Skip_Utf8_Backward (Z);~N");
-    write_failure_if(g, "C < 0", p);
-    w(g, "~MZ.C := C;~N");
-}
-
 static void generate_tolimit(struct generator * g, struct node * p) {
+    write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "" : "b";
-    writef(g, "~MZ.C := Z.L~S0;~C~N", p);
+    writef(g, "~MZ.C := Z.L~S0;~N", p);
 }
 
 static void generate_atlimit(struct generator * g, struct node * p) {
@@ -768,18 +802,21 @@ static void generate_atlimit(struct generator * g, struct node * p) {
 }
 
 static void generate_leftslice(struct generator * g, struct node * p) {
+    write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "Bra" : "Ket";
-    writef(g, "~MZ.~S0 := Z.C;~C~N", p);
+    writef(g, "~MZ.~S0 := Z.C;~N", p);
 }
 
 static void generate_rightslice(struct generator * g, struct node * p) {
+    write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "Ket" : "Bra";
-    writef(g, "~MZ.~S0 := Z.C;~C~N", p);
+    writef(g, "~MZ.~S0 := Z.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 := Assign_To (Z, ~V0);~C~N", p);
+    writef(g, "~M~V0 := Assign_To (Z, ~V0);~N", p);
     write_failure_if(g, "~V0 == 0", p);
 }
 
@@ -791,15 +828,16 @@ static void generate_sliceto(struct generator * g, struct node * p) {
 
 static void generate_address(struct generator * g, struct node * p) {
     symbol * b = p->literalstring;
-    if (b != 0) {
+    if (b != NULL) {
         write_literal_string(g, b);
     } else {
-        write_varname(g, p->name);
+        w(g, "Ada.Strings.Unbounded.To_String (");
+        write_varref(g, p->name);
+        w(g, ")");
     }
 }
 
 static void generate_insert(struct generator * g, struct node * p, int style) {
-
     int keep_c = style == c_attach;
     write_comment(g, p);
     if (p->mode == m_backward) keep_c = !keep_c;
@@ -807,7 +845,10 @@ static void generate_insert(struct generator * g, struct node * p, int style) {
     writef(g, "~MInsert (Z, Z.C, Z.C, ", p);
     generate_address(g, p);
     writef(g, ");~N", p);
-    if (keep_c) w(g, "~MZ.C := C;~N");
+    if (keep_c) {
+        w(g, "~MZ.C := C;~N");
+        g->temporary_used = true;
+    }
 }
 
 static void generate_assignfrom(struct generator * g, struct node * p) {
@@ -822,7 +863,10 @@ static void generate_assignfrom(struct generator * g, struct node * p) {
     }
     generate_address(g, p);
     writef(g, ");~N", p);
-    if (keep_c) w(g, "~MZ.C := C;~N");
+    if (keep_c) {
+        w(g, "~MZ.C := C;~N");
+        g->temporary_used = true;
+    }
 }
 
 static void generate_slicefrom(struct generator * g, struct node * p) {
@@ -833,11 +877,11 @@ static void generate_slicefrom(struct generator * g, struct node * p) {
 }
 
 static void generate_setlimit(struct generator * g, struct node * p) {
-    struct str * savevar = vars_newname(g);
     struct str * varname = vars_newname(g);
+    write_comment(g, p);
 
     g->B[0] = str_data(varname);
-    write_declare(g, "   ~B0 : Integer", p);
+    write_declare(g, "~B0 : Integer", p);
     if (p->left && p->left->type == c_tomark) {
         /* Special case for:
          *
@@ -848,8 +892,7 @@ static void generate_setlimit(struct generator * g, struct node * p) {
          * restore c.
          */
         struct node * q = p->left;
-
-        ++g->keep_count;
+        write_comment(g, q);
 
         g->S[0] = q->mode == m_forward ? ">" : "<";
 
@@ -877,8 +920,8 @@ static void generate_setlimit(struct generator * g, struct node * p) {
             str_append(g->failure_str, varname);
             str_append_ch(g->failure_str, ';');
         }
-
     } else {
+        struct str * savevar = vars_newname(g);
         write_savecursor(g, p, savevar);
 
         generate(g, p->left);
@@ -904,6 +947,7 @@ static void generate_setlimit(struct generator * g, struct node * p) {
                 str_append_ch(g->failure_str, ';');
             }
         }
+        str_delete(savevar);
     }
 
     if (!g->unreachable) {
@@ -916,15 +960,15 @@ static void generate_setlimit(struct generator * g, struct node * p) {
         }
     }
     str_delete(varname);
-    str_delete(savevar);
 }
 
 /* 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);
+
     struct str * savevar = vars_newname(g);
     g->B[0] = str_data(savevar);
-    write_comment(g, p);
     g->V[0] = p->name;
 
     {
@@ -969,12 +1013,12 @@ static void generate_dollar(struct generator * g, struct node * p) {
     str_delete(savevar);
 }
 
-static void generate_integer_assign(struct generator * g, struct node * p, char * s) {
-
+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~V0 := ");
 
-    if (s != 0) {
+    if (s != NULL) {
         g->S[0] = s;
         w(g, "~V0 ~S0 ");
     }
@@ -983,60 +1027,82 @@ static void generate_integer_assign(struct generator * g, struct node * p, char
     w(g, ";~N");
 }
 
-static void generate_integer_test(struct generator * g, struct node * p, char * s) {
-
-    w(g, "~Mif not (");
-    generate_AE(g, p->left);
-    write_char(g, ' ');
-    write_string(g, s);
-    write_char(g, ' ');
-    generate_AE(g, p->AE);
-    w(g, ") then~+~N");
-    write_failure(g);
-    w(g, "~-~Mend if;~N");
-    g->unreachable = false;
-}
-
-static void generate_integer_function(struct generator * g, struct node * p, char * s) {
-
-    w(g, "~MResult := (");
+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);
+    if (optimise_to_return) {
+        w(g, "~MResult := (");
+        p->right = NULL;
+    } else {
+        w(g, "~Mif ");
+        // We want the inverse of the snowball test here.
+        relop ^= 1;
+    }
     generate_AE(g, p->left);
-    write_char(g, ' ');
-    write_string(g, s);
-    write_char(g, ' ');
+    write_relop(g, relop);
     generate_AE(g, p->AE);
-    w(g, ");~N");
-    g->unreachable = false;
+    if (optimise_to_return) {
+        w(g, ");~N");
+    } else {
+        w(g, " then~+~N");
+        write_failure(g);
+        w(g, "~-~Mend if;~N");
+        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);
     write_comment(g, p);
     g->V[0] = p->name;
-    writef(g, "~M~V0 (Z, Result);~N", p);
-    write_failure_if(g, "not Result", p);
+    if (g->failure_label == x_return) {
+        if (p->right && p->right->type == c_functionend) {
+            /* Tail call. */
+            writef(g, "~M~V0 (Z, Result);~N", p);
+            return;
+        }
+        if (signals == 0) {
+            /* Always fails. */
+            writef(g, "~M~V0 (Z, Result);~N", p);
+            w(g, "~Mreturn~N");
+            return;
+        }
+    }
+    if (signals == 1) {
+        /* Always succeeds. */
+        writef(g, "~M~V0 (Z, Result);~N", p);
+    } else if (signals == 0) {
+        /* Always fails. */
+        writef(g, "~M~V0 (Z, Result);~N", p);
+        write_failure(g);
+    } else {
+        writef(g, "~M~V0 (Z, Result);~N", p);
+        write_failure_if(g, "not Result", p);
+    }
 }
 
 static void generate_grouping(struct generator * g, struct node * p, int complement) {
+    write_comment(g, p);
 
     struct grouping * q = p->name->grouping;
     g->S[0] = p->mode == m_forward ? "" : "_Backward";
     g->S[1] = complement ? "Out_" : "In_";
-    g->S[2] = g->options->encoding == ENC_UTF8 ? "" : "";
     g->V[0] = p->name;
     g->I[0] = q->smallest_ch;
     g->I[1] = q->largest_ch;
-    writef(g, "~M~S1Grouping~S0~S2 (Z, ~V0, ~I0, ~I1, False, C);~N", p);
+    writef(g, "~M~S1Grouping~S0 (Z, ~V0, ~I0, ~I1, False, C);~N", p);
     write_failure_if(g, "C /= 0", p);
+    g->temporary_used = true;
 }
 
 static void generate_namedstring(struct generator * g, struct node * p) {
-
     write_comment(g, p);
     g->S[0] = p->mode == m_forward ? "" : "_Backward";
     g->V[0] = p->name;
     writef(g, "~MC := Eq_S~S0 (Z, Ada.Strings.Unbounded.To_String (~V0));", p);
     write_failure_if(g, "C = 0", p);
+    g->temporary_used = true;
 }
 
 static void generate_literalstring(struct generator * g, struct node * p) {
@@ -1051,20 +1117,23 @@ static void generate_literalstring(struct generator * g, struct node * p) {
     } else {
         writef(g, "~MZ.C := Z.C - C;~N", p);
     }
+    g->temporary_used = true;
 }
 
 static void generate_define(struct generator * g, struct node * p) {
-    struct str *saved_output;
-    struct str *saved_declarations;
+    struct name * q = p->name;
+    if (q->type == t_routine && !q->used) return;
 
-    /* Generate function header. */
-    g->V[0] = p->name;
-    w(g, "~N~Mprocedure ~W0 (Z : in out Context_Type; Result : out Boolean) is~N");
+    write_newline(g);
+    write_comment(g, p);
 
-    /* Save output*/
-    saved_output = g->outbuf;
-    saved_declarations = g->declarations;
+    /* Generate function header. */
+    g->V[0] = q;
+    w(g, "~Mprocedure ~W0 (Z : in out Context_Type; Result : out Boolean) is~N");
 
+    /* Save output. */
+    struct str *saved_output = g->outbuf;
+    struct str *saved_declarations = g->declarations;
     g->outbuf = str_new();
     g->declarations = str_new();
 
@@ -1076,25 +1145,26 @@ static void generate_define(struct generator * g, struct node * p) {
 
     /* Generate function body. */
     w(g, "~{");
-    switch (p->left->type) {
-        case c_eq:            generate_integer_function(g, p->left, "="); break;
-        case c_ne:            generate_integer_function(g, p->left, "/="); break;
-        case c_gr:            generate_integer_function(g, p->left, ">"); break;
-        case c_ge:            generate_integer_function(g, p->left, ">="); break;
-        case c_ls:            generate_integer_function(g, p->left, "<"); break;
-        case c_le:            generate_integer_function(g, p->left, "<="); break;
-        default:
-            generate(g, p->left);
-            if (!g->unreachable) w(g, "~N~MResult := True;~N");
-            str_append_string(saved_output, "      C : Result_Index;\n");
-            if (need_among_var(p->left) || 1) {
-                str_append_string(saved_output, "      A : Integer;\n");
-            }
-            break;
+    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) {
+            generate(g, p->left->right);
+        }
     }
-    g->V[0] = p->name;
+    g->V[0] = q;
     w(g, "~-~Mend ~W0;~N");
 
+    if (g->temporary_used) {
+        str_append_string(saved_output, "      C : Result_Index;\n");
+    }
+
+    if (need_among_var(p->left)) {
+        str_append_string(saved_output, "      A : Integer;\n");
+    }
+
     if (g->var_number) {
         str_append(saved_output, g->declarations);
     }
@@ -1106,39 +1176,36 @@ static void generate_define(struct generator * g, struct node * p) {
     g->outbuf = saved_output;
 }
 
+static void generate_functionend(struct generator * g, struct node * p) {
+    (void)p;
+    w(g, "~MResult := True;~N");
+}
+
 static void generate_substring(struct generator * g, struct node * p) {
+    write_comment(g, p);
+
     struct among * x = p->among;
     int block = -1;
     unsigned int bitmap = 0;
     struct amongvec * among_cases = x->b;
-    int c;
     int empty_case = -1;
     int n_cases = 0;
     symbol cases[2];
-    int shortest_size = INT_MAX;
+    int shortest_size = x->shortest_size;
     int call_done = 0;
-    int need_handler = need_among_handler(x);
-
-    write_comment(g, p);
+    int need_among_handler = (x->function_count > 0);
 
     g->S[0] = p->mode == m_forward ? "" : "_Backward";
     g->I[0] = x->number;
 
-    /* In forward mode with non-ASCII UTF-8 characters, the first character
+    /* In forward mode with non-ASCII UTF-8 characters, the first byte
      * of the string will often be the same, so instead look at the last
-     * common character position.
+     * common byte position.
      *
      * In backward mode, we can't match if there are fewer characters before
      * the current position than the minimum length.
      */
-    for (c = 0; c < x->literalstring_count; ++c) {
-        int size = among_cases[c].size;
-        if (size != 0 && size < shortest_size) {
-            shortest_size = size;
-        }
-    }
-
-    for (c = 0; c < x->literalstring_count; ++c) {
+    for (int c = 0; c < x->literalstring_count; ++c) {
         symbol ch;
         if (among_cases[c].size == 0) {
             empty_case = c;
@@ -1225,16 +1292,18 @@ static void generate_substring(struct generator * g, struct node * p) {
              * so not matching the bitmap means we match the empty string.
              */
             g->I[4] = among_cases[empty_case].result;
-            writef(g, "~MA := ~I4;~-~N~Melse~+~C", p);
-            if (need_handler) {
+            writef(g, "~MA := ~I4;~-~N~Melse~+~N", p);
+            if (need_among_handler) {
                 writef(g, "~MFind_Among~S0 (Z, A_~I0, Among_String, Among_Handler'Access, A);~N", p);
             } else {
                 writef(g, "~MFind_Among~S0 (Z, A_~I0, Among_String, null, A);~N", p);
             }
-            write_failure_if(g, "A = 0", p);
+            if (!x->always_matches) {
+                write_failure_if(g, "A = 0", p);
+            }
             call_done = 1;
         } else {
-            writef(g, "~f~C", p);
+            write_failure(g);
         }
         writef(g, "~-~Mend if;~N", p);
     } else {
@@ -1244,31 +1313,32 @@ static void generate_substring(struct generator * g, struct node * p) {
     }
 
     if (!call_done) {
-        if (need_handler) {
+        if (need_among_handler) {
             writef(g, "~MFind_Among~S0 (Z, A_~I0, Among_String, Among_Handler'Access, A);~N", p);
         } else {
             writef(g, "~MFind_Among~S0 (Z, A_~I0, Among_String, null, A);~N", p);
         }
-        write_failure_if(g, "A = 0", p);
+        if (!x->always_matches) {
+            write_failure_if(g, "A = 0", p);
+        }
     }
 }
 
 static void generate_among(struct generator * g, struct node * p) {
-
     struct among * x = p->among;
 
-    if (x->substring == 0) generate_substring(g, p);
-
-    if (x->starter != 0) generate(g, x->starter);
+    if (x->substring == NULL) {
+        generate_substring(g, p);
+    } else {
+        write_comment(g, p);
+    }
 
     if (x->command_count == 1 && x->nocommand_count == 0) {
         /* Only one outcome ("no match" already handled). */
         generate(g, x->commands[0]);
     } else if (x->command_count > 0) {
-        int i;
-        write_comment(g, p);
         w(g, "~Mcase A is~N~+");
-        for (i = 1; i <= x->command_count; i++) {
+        for (int i = 1; i <= x->command_count; i++) {
             g->I[0] = i;
             w(g, "~Mwhen ~I0 =>~N");
             g->margin++;
@@ -1283,20 +1353,17 @@ static void generate_among(struct generator * g, struct node * p) {
 }
 
 static void generate_booltest(struct generator * g, struct node * p) {
-
     write_comment(g, p);
     g->V[0] = p->name;
     write_failure_if(g, "not ~V0", p);
 }
 
 static void generate_false(struct generator * g, struct node * p) {
-
     write_comment(g, p);
     write_failure(g);
 }
 
 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;
@@ -1304,14 +1371,10 @@ static void generate_debug(struct generator * g, struct node * p) {
 }
 
 static void generate(struct generator * g, struct node * p) {
-
-    int a0;
-    struct str * a1;
-
     if (g->unreachable) return;
 
-    a0 = g->failure_label;
-    a1 = str_copy(g->failure_str);
+    int a0 = g->failure_label;
+    struct str * a1 = str_copy(g->failure_str);
 
     switch (p->type) {
         case c_define:        generate_define(g, p); break;
@@ -1329,6 +1392,11 @@ static void generate(struct generator * g, struct node * p) {
         case c_do:            generate_do(g, p); break;
         case c_goto:          generate_GO(g, p, 1); break;
         case c_gopast:        generate_GO(g, p, 0); break;
+        case c_goto_grouping: generate_GO_grouping(g, p, 1, 0); break;
+        case c_gopast_grouping:
+                              generate_GO_grouping(g, p, 0, 0); break;
+        case c_goto_non:      generate_GO_grouping(g, p, 1, 1); break;
+        case c_gopast_non:    generate_GO_grouping(g, p, 0, 1); break;
         case c_repeat:        generate_repeat(g, p); break;
         case c_loop:          generate_loop(g, p); break;
         case c_atleast:       generate_atleast(g, p); break;
@@ -1355,12 +1423,14 @@ static void generate(struct generator * g, struct node * p) {
         case c_minusassign:   generate_integer_assign(g, p, "-"); break;
         case c_multiplyassign:generate_integer_assign(g, p, "*"); break;
         case c_divideassign:  generate_integer_assign(g, p, "/"); break;
-        case c_eq:            generate_integer_test(g, p, "="); break;
-        case c_ne:            generate_integer_test(g, p, "/="); break;
-        case c_gr:            generate_integer_test(g, p, ">"); break;
-        case c_ge:            generate_integer_test(g, p, ">="); break;
-        case c_ls:            generate_integer_test(g, p, "<"); break;
-        case c_le:            generate_integer_test(g, p, "<="); break;
+        case c_eq:
+        case c_ne:
+        case c_gt:
+        case c_ge:
+        case c_lt:
+        case c_le:
+            generate_integer_test(g, p);
+            break;
         case c_call:          generate_call(g, p); break;
         case c_grouping:      generate_grouping(g, p, false); break;
         case c_non:           generate_grouping(g, p, true); break;
@@ -1372,6 +1442,7 @@ static void generate(struct generator * g, struct node * p) {
         case c_false:         generate_false(g, p); break;
         case c_true:          break;
         case c_debug:         generate_debug(g, p); break;
+        case c_functionend:   generate_functionend(g, p); break;
         default: fprintf(stderr, "%d encountered\n", p->type);
                  exit(1);
     }
@@ -1393,51 +1464,31 @@ static void generate_method_decl(struct generator * g, struct name * q) {
 }
 
 static void generate_method_decls(struct generator * g, enum name_types type) {
-    struct name * q;
     struct among * a = g->analyser->amongs;
-    int need_handler = 0;
+    int need_among_handler = 0;
 
-    for (q = g->analyser->names; q; q = q->next) {
+    for (struct name * q = g->analyser->names; q; q = q->next) {
         if ((enum name_types)q->type == type) {
             generate_method_decl(g, q);
         }
     }
 
-    while (a != 0 && need_handler == 0) {
-        need_handler = need_among_handler(a);
+    while (a != NULL && need_among_handler == 0) {
+        need_among_handler = (a->function_count > 0);
         a = a->next;
     }
-    if (need_handler) {
+    if (need_among_handler) {
         w(g, "~N~Mprocedure Among_Handler (Context : in out Stemmer.Context_Type'Class; Operation : in Operation_Index; Result : out Boolean);~N");
     }
 }
 
-static int has_string_variable(struct generator * g) {
-    struct name * q;
-    for (q = g->analyser->names; q; q = q->next) {
-        g->V[0] = q;
-        if (q->type == t_string) {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 static void generate_member_decls(struct generator * g) {
-    struct name * q;
-    int count = 0;
-
-    
-    for (q = g->analyser->names; q; q = q->next) {
-        if (q->type == t_string || q->type == t_integer || q->type == t_boolean)
-            count++;
-    }
-
     w(g, "   type Context_Type is new Stemmer.Context_Type with");
-    if (count > 0) {
+    if (g->analyser->name_count[t_string] > 0 ||
+        g->analyser->name_count[t_integer] > 0 ||
+        g->analyser->name_count[t_boolean] > 0) {
         w(g, " record~N~+");
-        for (q = g->analyser->names; q; q = q->next) {
+        for (struct name * q = g->analyser->names; q; q = q->next) {
             g->V[0] = q;
             switch (q->type) {
                 case t_string:
@@ -1460,13 +1511,12 @@ static void generate_member_decls(struct generator * g) {
 }
 
 static int generate_among_string(struct generator * g, struct among * x, int count) {
-    int i;
     struct amongvec * v = x->b;
     int limit = count == 0 ? 38 : 80;
 
     g->I[0] = x->number;
 
-    for (i = 0; i < x->literalstring_count; i++, v++) {
+    for (int i = 0; i < x->literalstring_count; i++, v++) {
         /* Write among's string. */
         g->L[0] = v->b;
         g->I[1] = i;
@@ -1484,7 +1534,8 @@ static int generate_among_string(struct generator * g, struct among * x, int cou
 }
 
 static int generate_among_table(struct generator * g, struct among * x, int start_pos, int *operation) {
-    int i;
+    write_comment(g, x->node);
+
     struct amongvec * v = x->b;
 
     g->I[0] = x->number;
@@ -1493,7 +1544,7 @@ static int generate_among_table(struct generator * g, struct among * x, int star
     w(g, "~MA_~I0 : constant Among_Array_Type (0 .. ~I1) := ~+(~N");
 
     v = x->b;
-    for (i = 0; i < x->literalstring_count; i++, v++) {
+    for (int i = 0; i < x->literalstring_count; i++) {
         g->I[1] = start_pos;
 
         /* Write among's string position. */
@@ -1502,18 +1553,18 @@ static int generate_among_table(struct generator * g, struct among * x, int star
         } else {
             w(g, "~M(~I1, ");
         }
-        start_pos = start_pos + SIZE(v->b);
+        start_pos = start_pos + SIZE(v[i].b);
         g->I[1] = start_pos - 1;
         w(g, "~I1, ");
 
         /* Write among's index & result. */
-        g->I[2] = v->i;
+        g->I[2] = v[i].i;
         w(g, "~I2, ");
-        g->I[2] = v->result;
+        g->I[2] = v[i].result;
         w(g, "~I2, ");
 
         /* Write among's handler. */
-        if (v->function == 0) {
+        if (v[i].function == NULL) {
             w(g, "0)");
         } else {
             *operation = *operation + 1;
@@ -1530,12 +1581,13 @@ static int generate_among_table(struct generator * g, struct among * x, int star
 
 static int generate_amongs(struct generator * g) {
     struct among * a = g->analyser->amongs;
+    if (!a) return 0;
     int count;
     int start_pos;
-    
+
     w(g, "~MAmong_String : constant String := ~+");
     count = 0;
-    while (a != 0) {
+    while (a != NULL) {
         count = generate_among_string(g, a, count);
         a = a->next;
     }
@@ -1544,7 +1596,7 @@ static int generate_amongs(struct generator * g) {
     int operation = 0;
     start_pos = 1;
     a = g->analyser->amongs;
-    while (a != 0) {
+    while (a != NULL) {
         start_pos = generate_among_table(g, a, start_pos, &operation);
         a = a->next;
     }
@@ -1556,34 +1608,29 @@ static int generate_constructor(struct generator * g) {
 }
 
 static void generate_methods(struct generator * g) {
-    struct node * p = g->analyser->program;
-    while (p != 0) {
+    for (struct node * p = g->analyser->program; p; p = p->right) {
         generate(g, p);
-        p = p->right;
+        g->unreachable = false;
     }
 }
 
 static int generate_operations_dispatcher(struct generator * g) {
-    struct among * a = g->analyser->amongs;
-    int i;
     int operation = 0;
 
     w(g, "~N~Mprocedure Among_Handler (Context : in out Stemmer.Context_Type'Class; Operation : in Operation_Index; Result : out Boolean) is~N");
     w(g, "~Mbegin~+~N~M");
     w(g, "case Operation is~+~N~M");
-    a = g->analyser->amongs;
-    while (a != 0) {
-        struct amongvec * v = a->b;
-        for (i = 0; i < a->literalstring_count; i++, v++) {
-            if (v->function != 0) {
+    for (struct among * x = g->analyser->amongs; x; x = x->next) {
+        struct amongvec * v = x->b;
+        for (int i = 0; i < x->literalstring_count; i++) {
+            if (v[i].function != NULL) {
                 operation++;
                 g->I[2] = operation;
                 w(g, "when ~I2 =>~N~M");
-                g->V[0] = v->function;
+                g->V[0] = v[i].function;
                 w(g, "   ~W0 (Context_Type (Context), Result);~N~M");
             }
         }
-        a = a->next;
     }
     w(g, "when others =>~N~M");
     w(g, "   Result := False;~-~N~Mend case;~-~N~M");
@@ -1594,36 +1641,29 @@ static int generate_operations_dispatcher(struct generator * g) {
 static void set_bit(symbol * b, int i) { b[i/8] |= 1 << i%8; }
 
 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 */
     symbol * b = q->b;
     symbol * map = create_b(size);
-    int i;
-    int count = 0;
     int need_comma = 0;
 
-    for (i = 0; i < size; i++) map[i] = 0;
+    for (int i = 0; i < size; i++) map[i] = 0;
 
-    /* Using unicode would require revision here */
-
-    for (i = 0; i < SIZE(b); i++) set_bit(map, b[i] - q->smallest_ch);
+    for (int i = 0; i < SIZE(b); i++) set_bit(map, b[i] - q->smallest_ch);
 
     g->V[0] = q->name;
     g->I[0] = 8 * size - 1;
     w(g, "~N~M~W0 : constant Grouping_Array (0 .. ~I0) := (~N~+~M");
-    for (i = 0; i < size; i++) {
+    for (int i = 0; i < size; i++) {
         unsigned char m = map[i];
-        int j;
-        count++;
         if (i != 0) {
             w(g, ",~N~M");
             need_comma = 0;
         }
-        for (j = 0; j < 8; j++) {
+        for (int j = 0; j < 8; j++) {
             if (need_comma)
                 w(g, ", ");
-                
+
             if (m & (1 << j)) {
                 w(g, "True");
             } else {
@@ -1633,20 +1673,18 @@ static void generate_grouping_table(struct generator * g, struct grouping * q) {
         }
     }
     w(g, "~N~-~M);~N");
-    
+
     lose_b(map);
 }
 
 static void generate_groupings(struct generator * g) {
-    struct grouping * q;
-    for (q = g->analyser->groupings; q; q = q->next) {
+    for (struct grouping * q = g->analyser->groupings; q; q = q->next) {
         if (q->name->used)
             generate_grouping_table(g, q);
     }
 }
 
 extern void generate_program_ada(struct generator * g) {
-
     g->outbuf = str_new();
     g->failure_str = str_new();
 
@@ -1683,7 +1721,7 @@ extern void generate_program_ada(struct generator * g) {
 
     g->margin = 0;
     write_start_comment(g, "--  ", NULL);
-    if (has_string_variable(g)) {
+    if (g->analyser->name_count[t_string]) {
         w(g, "private with Ada.Strings.Unbounded;~N");
     }
     w(g, "package Stemmer.");