mittens 0.3.4 → 0.3.5

data/vendor/snowball/compiler/generator_js.c

@@ -42,7 +42,7 @@ static void write_varref(struct generator * g, struct name * p) {
     write_varname(g, p);
 }
 
-static void write_literal_string(struct generator * g, symbol * p) {
+static void write_literal_string(struct generator * g, const symbol * p) {
     write_char(g, '"');
     for (int i = 0; i < SIZE(p); i++) {
         int ch = p[i];
@@ -78,7 +78,7 @@ static void write_savecursor(struct generator * g, struct node * p,
     g->B[0] = str_data(savevar);
     g->S[1] = "";
     if (p->mode != m_forward) g->S[1] = "this.limit - ";
-    writef(g, "~Mconst /** number */ ~B0 = ~S1this.c;~N", p);
+    writef(g, "~Mconst /**@type {number}*/ ~B0 = ~S1this.c;~N", p);
 }
 
 static void append_restore_string(struct node * p, struct str * out, struct str * savevar) {
@@ -208,22 +208,22 @@ static void writef(struct generator * g, const char * input, struct node * p) {
             }
             case 'F': { // Among function dispatcher.
                 struct among * x = p->among;
-                if (x->function_count == 0) {
+                if (x->unique_function_count == 0) {
                     continue;
                 }
 
                 w(g, ", ");
 
-                if (x->function_count == 1) {
+                if (x->unique_function_count == 1) {
                     // Only one different function used in this among.
-                    struct amongvec * v = x->b;
+                    struct amongvec * v = x->v;
                     for (int j = 0; j < x->literalstring_count; j++) {
                         if (v[j].function) {
                             write_varref(g, v[j].function);
                             goto continue_outer_loop;
                         }
                     }
-                    fprintf(stderr, "function_count == 1 but no among functions\n");
+                    fprintf(stderr, "unique_function_count == 1 but no among functions\n");
                     exit(1);
 continue_outer_loop:
                     continue;
@@ -644,7 +644,7 @@ static void generate_loop(struct generator * g, struct node * p) {
     write_comment(g, p);
     struct str * loopvar = vars_newname(g);
     g->B[0] = str_data(loopvar);
-    w(g, "~Mfor (let /** number */ ~B0 = ");
+    w(g, "~Mfor (let /**@type {number}*/ ~B0 = ");
     generate_AE(g, p->AE);
     g->B[0] = str_data(loopvar);
     writef(g, "; ~B0 > 0; ~B0--)~N", p);
@@ -747,7 +747,7 @@ static void generate_hop(struct generator * g, struct node * p) {
         write_failure_if(g, "this.c ~S0 ~I0 ~S1", p);
         writef(g, "~Mthis.c ~S0= ~I0;~N", p);
     } else {
-        w(g, "~{~Mconst /** number */ c = this.c ~S0 ");
+        w(g, "~{~Mconst /**@type {number}*/ c = this.c ~S0 ");
         generate_AE(g, p->AE);
         w(g, ";~N");
         write_failure_if(g, "c ~S1 || c ~S2 this.c", p);
@@ -807,7 +807,7 @@ static void generate_insert(struct generator * g, struct node * p, int style) {
     int keep_c = style == c_attach;
     if (p->mode == m_backward) keep_c = !keep_c;
     if (keep_c) {
-        w(g, "~{~Mconst /** number */ c = this.c;~N");
+        w(g, "~{~Mconst /**@type {number}*/ c = this.c;~N");
         writef(g, "~Mthis.insert(c, c, ", p);
     } else {
         writef(g, "~Mthis.insert(this.c, this.c, ", p);
@@ -821,7 +821,7 @@ 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) {
-        w(g, "~{~Mconst /** number */ c = this.c;~N");
+        w(g, "~{~Mconst /**@type {number}*/ c = this.c;~N");
         if (p->mode == m_forward) {
             writef(g, "~Mthis.insert(c, this.limit, ", p);
         } else {
@@ -875,13 +875,13 @@ static void generate_setlimit(struct generator * g, struct node * p) {
 
         g->B[0] = str_data(varname);
         if (p->mode == m_forward) {
-            w(g, "~Mlet /** number */ ~B0 = this.limit;~N");
+            w(g, "~Mlet /**@type {number}*/ ~B0 = this.limit;~N");
             w(g, "~Mthis.limit = ");
             generate_AE(g, q->AE);
             w(g, ";~N");
             w(g, "~M~B0 -= this.limit;~N");
         } else {
-            w(g, "~Mconst /** number */ ~B0 = this.limit_backward;~N");
+            w(g, "~Mconst /**@type {number}*/ ~B0 = this.limit_backward;~N");
             w(g, "~Mthis.limit_backward = ");
             generate_AE(g, q->AE);
             w(g, ";~N");
@@ -904,7 +904,7 @@ static void generate_setlimit(struct generator * g, struct node * p) {
 
         if (!g->unreachable) {
             g->B[0] = str_data(varname);
-            w(g, "~Mconst /** number */ ~B0 = ");
+            w(g, "~Mconst /**@type {number}*/ ~B0 = ");
             if (p->mode == m_forward) {
                 w(g, "this.limit - this.c;~N");
                 w(g, "~Mthis.limit = this.c;~N");
@@ -953,7 +953,7 @@ static void generate_dollar(struct generator * g, struct node * p) {
     struct str * savevar = vars_newname(g);
     g->B[0] = str_data(savevar);
     writef(g, "~{~N"
-              "~Mconst /** !Object */ ~B0 = new ~P();~N", p);
+              "~Mconst /**@type {~P}*/ ~B0 = new ~P();~N", p);
     writef(g, "~M~B0.copy_from(this);~N", p);
 
     writef(g, "~Mthis.current = ~V;~N"
@@ -962,7 +962,7 @@ static void generate_dollar(struct generator * g, struct node * p) {
               "~Mthis.limit = this.current.length;~N", p);
     if (p->left->possible_signals == -1) {
         /* Assume failure. */
-        w(g, "~Mlet /**boolean*/ ~B0_f = true;~N");
+        w(g, "~Mlet /**@type {boolean}*/ ~B0_f = true;~N");
     }
 
     wsetlab_begin(g, g->failure_label);
@@ -1024,7 +1024,10 @@ static void generate_integer_test(struct generator * g, struct node * p) {
         w(g, "~Mreturn ");
         p->right = NULL;
     } else {
-        w(g, "~Mif (");
+        // Generate a typescript annotation cast to boolean to suppress
+        // deno check errors for constant if expressions, since a constant
+        // integer test is valid Snowball code.
+        w(g, "~Mif (/**@type {boolean}*/(");
         // We want the inverse of the snowball test here.
         relop ^= 1;
     }
@@ -1034,7 +1037,7 @@ static void generate_integer_test(struct generator * g, struct node * p) {
     if (optimise_to_return) {
         w(g, ";~N");
     } else {
-        w(g, ") ");
+        w(g, ")) ");
         write_failure_after_if(g);
         g->unreachable = false;
     }
@@ -1114,7 +1117,7 @@ static void generate_define(struct generator * g, struct node * p) {
               "~M#~W() {~+~N", p);
 
     /* Save output. */
-    struct str * saved_output = g->outbuf;
+    struct str * saved_outbuf = g->outbuf;
     struct str * saved_declarations = g->declarations;
     g->outbuf = str_new();
     g->declarations = str_new();
@@ -1124,11 +1127,11 @@ static void generate_define(struct generator * g, struct node * p) {
 
     struct name * q = p->name;
 
-    if (q->amongvar_needed) {
+    if (amongvar_needed(p->left)) {
         // The "among var" (`a`) is only assigned to, but the initialisation
         // can be generated in a nested block so it seems hard to declare it as
         // const and still have it visible when we want to use it.
-        w(g, "~Mlet /** number */ a;~N");
+        w(g, "~Mlet /**@type {number}*/ a;~N");
     }
 
     /* Declare localised variables. */
@@ -1136,17 +1139,17 @@ static void generate_define(struct generator * g, struct node * p) {
         if (name->local_to == q) {
             switch (name->type) {
                 case t_string:
-                    w(g, "~Mlet /** string */ ");
+                    w(g, "~Mlet /**@type {string}*/ ");
                     write_varname(g, name);
                     w(g, ";~N");
                     break;
                 case t_integer:
-                    w(g, "~Mlet /** number */ ");
+                    w(g, "~Mlet /**@type {number}*/ ");
                     write_varname(g, name);
                     w(g, ";~N");
                     break;
                 case t_boolean:
-                    w(g, "~Mlet /** boolean */ ");
+                    w(g, "~Mlet /**@type {boolean}*/ ");
                     write_varname(g, name);
                     w(g, ";~N");
                     break;
@@ -1172,7 +1175,7 @@ static void generate_define(struct generator * g, struct node * p) {
     if (q->type == t_external) {
         w(g, "~N");
         w(g, "~M/**@return{string}*/~N");
-        writef(g, "~M~W(/**string*/input) {~+~N", p);
+        writef(g, "~M~W(/**@type {string}*/input) {~+~N", p);
         w(g, "~Mthis.setCurrent(input);~N");
         writef(g, "~Mthis.#~W();~N", p);
         w(g, "~Mreturn this.getCurrent();~N");
@@ -1184,12 +1187,12 @@ static void generate_define(struct generator * g, struct node * p) {
         }
     }
 
-    str_append(saved_output, g->declarations);
-    str_append(saved_output, g->outbuf);
+    str_append(saved_outbuf, g->declarations);
+    str_append(saved_outbuf, g->outbuf);
     str_delete(g->declarations);
     str_delete(g->outbuf);
     g->declarations = saved_declarations;
-    g->outbuf = saved_output;
+    g->outbuf = saved_outbuf;
 }
 
 static void generate_functionend(struct generator * g, struct node * p) {
@@ -1290,7 +1293,7 @@ static void generate_debug(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->I[0] = g->debug_count++;
     g->I[1] = p->line_number;
-    writef(g, "~Mthis.debug(~I0, ~I1);~N", p);
+    writef(g, "~Mthis.#debug(~I0, ~I1);~N", p);
 }
 
 static void generate(struct generator * g, struct node * p) {
@@ -1394,7 +1397,7 @@ static void generate_class_end(struct generator * g) {
 static void generate_among_table(struct generator * g, struct among * x) {
     write_comment(g, x->node);
 
-    struct amongvec * v = x->b;
+    struct amongvec * v = x->v;
 
     g->I[0] = x->number;
     w(g, "~Mconst a_~I0 = [~N~+");
@@ -1420,7 +1423,7 @@ static void generate_among_table(struct generator * g, struct among * x) {
 
     if (x->same_action == c_slicefrom && x->command_count > 1) {
         g->I[0] = x->number;
-        w(g, "~Mconst /** Array<string> */ as_~I0 = [");
+        w(g, "~Mconst /**@type {Array<string>}*/ as_~I0 = [");
         for (int i = 1; i <= x->command_count; i++) {
             if (i > 1) w(g, ", ");
             write_literal_string(g, x->commands[i - 1]->left->literalstring);
@@ -1431,14 +1434,14 @@ static void generate_among_table(struct generator * g, struct among * x) {
 
 static void generate_amongs(struct generator * g) {
     for (struct among * x = g->analyser->amongs; x; x = x->next) {
-        generate_among_table(g, x);
+        if (!x->duplicate) generate_among_table(g, x);
     }
 }
 
 static void generate_among_dispatcher(struct generator * g, struct among * x) {
-    if (x->function_count <= 1) return;
+    if (x->unique_function_count <= 1) return;
 
-    struct amongvec * v = x->b;
+    struct amongvec * v = x->v;
 
     write_comment(g, x->node);
 
@@ -1446,7 +1449,7 @@ static void generate_among_dispatcher(struct generator * g, struct among * x) {
     w(g, "~N~M/** @return {boolean} */~N");
     w(g, "~M#af_~I0() {~N~+");
     w(g, "~Mswitch (this.af) {~N~+");
-    for (int n = 1; n <= x->function_count; n++) {
+    for (int n = 1; n <= x->unique_function_count; n++) {
         w(g, "~Mcase ");
         write_int(g, n);
         w(g, ": return ");
@@ -1481,7 +1484,7 @@ 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);
 
-    w(g, "~Mconst /** Array<number> */ ");
+    w(g, "~Mconst /**@type {Array<number>}*/ ");
     write_varname(g, q->name);
     write_string(g, " = [");
     for (int i = 0; i < size; i++) {
@@ -1508,19 +1511,19 @@ static void generate_members(struct generator * g) {
             case t_string:
                 w(g, "~M#");
                 write_varname(g, q);
-                w(g, "/** string */ = '';~N");
+                w(g, "/**@type {string}*/ = '';~N");
                 wrote_members = true;
                 break;
             case t_integer:
                 w(g, "~M#");
                 write_varname(g, q);
-                w(g, "/** number */ = 0;~N");
+                w(g, "/**@type {number}*/ = 0;~N");
                 wrote_members = true;
                 break;
             case t_boolean:
                 w(g, "~M#");
                 write_varname(g, q);
-                w(g, "/** boolean */ = false;~N");
+                w(g, "/**@type {boolean}*/ = false;~N");
                 wrote_members = true;
                 break;
         }
@@ -1563,6 +1566,30 @@ extern void generate_program_js(struct generator * g) {
 
     generate_members(g);
 
+    if (g->analyser->debug_used) {
+       w(g, "~N"
+            "~M/**~N"
+            "~M/* @param {number} n~N"
+            "~M/* @param {number} line~N"
+            "~M */~N"
+            "~M#debug(n, line) {~N~+"
+            "~Mconst len = this.current.length;~N"
+            "~Mlet s = `${n<10?'  ':n<100?' ':''}${n} (line ${line<10?'   ':line<100?'  ':line<1000?' ':''}${line}): [${len}]'`;~N"
+            "~Mfor (let i = 0; i <= len; ++i) {~N~+"
+            "~Mif (this.limit_backward === i) s = s + '{';~N"
+            "~Mif (this.bra === i) s = s + '[';~N"
+            "~Mif (this.c === i) s = s + '|';~N"
+            "~Mif (this.ket === i) s = s + ']';~N"
+            "~Mif (this.limit === i) s = s + '}';~N"
+            "~Mif (i < len) {~N~+"
+            "~Mconst ch = this.current[i];~N"
+            "~Mif (ch === '\\0') s = s + '#'; else s = s + ch;~N~-"
+            "~M}~N~-"
+            "~M}~N"
+            "~Mconsole.log(s + \"'\");~N~-"
+            "~M}~N");
+    }
+
     generate_among_dispatchers(g);
 
     generate_methods(g);

data/vendor/snowball/compiler/generator_pascal.c

@@ -59,7 +59,7 @@ static void write_varname(struct generator * g, struct name * p) {
     write_s(g, p->s);
 }
 
-static void write_literal_string(struct generator * g, symbol * p) {
+static void write_literal_string(struct generator * g, const symbol * p) {
     if (SIZE(p) == 0) {
         write_string(g, "''");
         return;
@@ -1118,7 +1118,7 @@ static void generate_define(struct generator * g, struct node * p) {
     writef(g, "~MFunction T~n.~W : Boolean;~N", p);
 
     /* Save output. */
-    struct str * saved_output = g->outbuf;
+    struct str * saved_outbuf = g->outbuf;
     struct str * saved_declarations = g->declarations;
     g->outbuf = str_new();
     g->declarations = str_new();
@@ -1142,61 +1142,67 @@ static void generate_define(struct generator * g, struct node * p) {
     }
     w(g, "~}");
 
-    if (q->amongvar_needed) {
-        str_append_string(g->declarations, "    AmongVar : Integer;\n");
+    struct str * temp = g->outbuf;
+    g->outbuf = g->declarations;
+
+    g->margin++;
+
+    if (amongvar_needed(p->left)) {
+        w(g, "~MAmongVar : Integer;~N");
     }
 
     if (g->temporary_used) {
-        str_append_string(g->declarations, "    C : Integer;\n");
+        w(g, "~MC : 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_margin(g);
                     write_varname(g, name);
-                    w(g,  " : AnsiString;\n");
+                    w(g, " : AnsiString;~N");
                     break;
                 case t_integer:
-                    w(g,  "    ");
+                    write_margin(g);
                     write_varname(g, name);
-                    w(g,  " : Integer;\n");
+                    w(g, " : Integer;~N");
                     break;
                 case t_boolean:
-                    w(g,  "    ");
+                    write_margin(g);
                     write_varname(g, name);
-                    w(g,  " : Boolean;\n");
+                    w(g, " : Boolean;~N");
                     break;
             }
         }
     }
-    g->outbuf = temp;
+    g->margin--;
+    g->outbuf = saved_outbuf;
 
     if (str_len(g->declarations) > 0) {
-        str_append_string(saved_output, "Var\n");
-        str_append(saved_output, g->declarations);
+        w(g, "~MVar~N");
+        str_append(saved_outbuf, g->declarations);
     }
 
     if (g->next_label) {
-        str_append_string(saved_output, "Label\n");
+        w(g, "~MLabel~N~+");
 
         int num = g->next_label;
         for (int i = 0; i < num; ++i) {
-            str_append_string(saved_output, "    lab");
-            str_append_int(saved_output, i);
-            str_append_string(saved_output, i == num - 1 ? ";\n" : ",\n");
+            if (i) w(g, ",~N");
+            w(g, "~Mlab");
+            write_int(g, i);
         }
+        w(g, ";~N");
+
+        g->margin--;
     }
 
-    str_append(saved_output, g->outbuf);
+    str_append(saved_outbuf, temp);
     str_delete(g->declarations);
-    str_delete(g->outbuf);
+    str_delete(temp);
     g->declarations = saved_declarations;
-    g->outbuf = saved_output;
 }
 
 static void generate_functionend(struct generator * g, struct node * p) {
@@ -1281,7 +1287,7 @@ static void generate_debug(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->I[0] = g->debug_count++;
     g->I[1] = p->line_number;
-    writef(g, "~Mdebug(~I0, ~I1);~N", p);
+    writef(g, "~MDebug(~I0, ~I1);~N", p);
 }
 
 static void generate(struct generator * g, struct node * p) {
@@ -1397,6 +1403,10 @@ static void generate_method_decls(struct generator * g) {
     w(g, "~Mpublic~N~+");
     w(g, "~MConstructor Create;~N");
 
+    if (g->analyser->debug_used) {
+       w(g, "~Mprocedure Debug(N : Integer; Line : Integer);~N");
+    }
+
     for (struct name * q = g->analyser->names; q; q = q->next) {
         if (q->type == t_external) {
             generate_method_decl(g, q);
@@ -1470,7 +1480,7 @@ static void generate_among_decls(struct generator * g) {
 static void generate_among_table(struct generator * g, struct among * x) {
     write_comment(g, x->node);
 
-    struct amongvec * v = x->b;
+    struct amongvec * v = x->v;
 
     g->I[0] = x->number;
     g->I[1] = x->literalstring_count;
@@ -1505,7 +1515,7 @@ static void generate_among_table(struct generator * g, struct among * x) {
 
 static void generate_amongs(struct generator * g) {
     for (struct among * x = g->analyser->amongs; x; x = x->next) {
-        generate_among_table(g, x);
+        if (!x->duplicate) generate_among_table(g, x);
     }
 }
 
@@ -1570,6 +1580,39 @@ extern void generate_program_pascal(struct generator * g) {
     /* generate implementation. */
     generate_groupings(g);
     generate_constructor(g);
+
+    if (g->analyser->debug_used) {
+       w(g, "~N"
+            "~Mprocedure T~n.Debug(N : Integer; Line : Integer);~N~+"
+            "~MVar Len : Integer;~N"
+            "~MVar Ch  : Char;~N"
+            "~MVar I   : Integer;~N"
+            "~-~MBegin~N~+"
+            "~MLen := Length(FCurrent);~N"
+            "~MIf N < 10 Then Write(' ');~N"
+            "~MIf N < 100 Then Write(' ');~N"
+            "~MWrite(N, ' (line ');~N"
+            "~MIf Line < 10 Then Write(' ');~N"
+            "~MIf Line < 100 Then Write(' ');~N"
+            "~MIf Line < 1000 Then Write(' ');~N"
+            "~MWrite(Line, '): [', Len, ']''');~N"
+            "~MFor I := 0 To Len Do~N"
+            "~MBegin~N~+"
+            "~MIf FBkLimit = I Then Write('{');~N"
+            "~MIf FBra = I Then Write('[');~N"
+            "~MIf FCursor = I Then Write('|');~N"
+            "~MIf FKet = I Then Write(']');~N"
+            "~MIf FLimit = I Then Write('}');~N"
+            "~MIf I < Len Then~N"
+            "~MBegin~N~+"
+            "~MCh := FCurrent[I + 1];~N"
+            "~MIf Ch = #0 Then Write('#') Else Write(Ch);~N"
+            "~-~MEnd;~N"
+            "~-~MEnd;~N"
+            "~MWriteLn('''');~N"
+            "~-~MEnd;~N");
+    }
+
     generate_methods(g);
 
     generate_unit_end(g);

data/vendor/snowball/compiler/generator_php.c

@@ -46,7 +46,7 @@ static void write_varref(struct generator * g, struct name * p) {
     write_varname(g, p);
 }
 
-static void write_literal_string(struct generator * g, symbol * p) {
+static void write_literal_string(struct generator * g, const symbol * p) {
     int i = 0;
     write_char(g, '"');
     while (i < SIZE(p)) {
@@ -57,7 +57,7 @@ static void write_literal_string(struct generator * g, symbol * p) {
             write_char(g, ch);
         } else {
             write_string(g, "\\u{");
-            write_hex4(g, ch);
+            write_hex(g, ch);
             write_string(g, "}");
         }
     }
@@ -71,7 +71,7 @@ static void write_literal_char(struct generator * g, symbol ch) {
         write_char(g, ch);
     } else {
         write_string(g, "\\u{");
-        write_hex4(g, ch);
+        write_hex(g, ch);
         write_string(g, "}");
     }
     write_char(g, '"');
@@ -722,10 +722,10 @@ static void generate_hop(struct generator * g, struct node * p) {
     // Generate the AE to a temporary block so we can substitute it in
     // write_failure_if().
     struct str * ae = str_new();
-    struct str * s = g->outbuf;
+    struct str * saved_outbuf = g->outbuf;
     g->outbuf = ae;
     generate_AE(g, p->AE);
-    g->outbuf = s;
+    g->outbuf = saved_outbuf;
     g->B[0] = str_data(ae);
     g->S[0] = p->mode == m_forward ? "" : "_back";
     g->S[1] = p->AE->type == c_number ? "" : "_checked";
@@ -1095,7 +1095,7 @@ static void generate_define(struct generator * g, struct node * p) {
     write_block_start(g);
 
     /* Save output. */
-    struct str * saved_output = g->outbuf;
+    struct str * saved_outbuf = g->outbuf;
     struct str * saved_declarations = g->declarations;
     g->outbuf = str_new();
     g->declarations = str_new();
@@ -1118,12 +1118,12 @@ static void generate_define(struct generator * g, struct node * p) {
     }
     write_block_end(g);
 
-    str_append(saved_output, g->declarations);
-    str_append(saved_output, g->outbuf);
+    str_append(saved_outbuf, g->declarations);
+    str_append(saved_outbuf, g->outbuf);
     str_delete(g->declarations);
     str_delete(g->outbuf);
     g->declarations = saved_declarations;
-    g->outbuf = saved_output;
+    g->outbuf = saved_outbuf;
 }
 
 static void generate_functionend(struct generator * g, struct node * p) {
@@ -1224,7 +1224,7 @@ static void generate_debug(struct generator * g, struct node * p) {
     write_comment(g, p);
     g->I[0] = g->debug_count++;
     g->I[1] = p->line_number;
-    writef(g, "~M$this->debug(~I0, ~I1);~N", p);
+    writef(g, "~M$this->_debug(~I0, ~I1);~N", p);
 }
 
 static void generate(struct generator * g, struct node * p) {
@@ -1325,7 +1325,7 @@ static void generate_class_end(struct generator * g) {
 static void generate_among_table(struct generator * g, struct among * x) {
     write_comment(g, x->node);
 
-    struct amongvec * v = x->b;
+    struct amongvec * v = x->v;
 
     g->I[0] = x->number;
     w(g, "~Mprivate const array A_~I0 = [~N~+");
@@ -1360,7 +1360,7 @@ static void generate_among_table(struct generator * g, struct among * x) {
 
 static void generate_amongs(struct generator * g) {
     for (struct among * x = g->analyser->amongs; x; x = x->next) {
-        generate_among_table(g, x);
+        if (!x->duplicate) generate_among_table(g, x);
     }
 }
 
@@ -1435,6 +1435,27 @@ extern void generate_program_php(struct generator * g) {
     generate_groupings(g);
 
     generate_members(g);
+
+    if (g->analyser->debug_used) {
+       w(g, "~N"
+            "~Mprivate function _debug(int $n, int $line): void {~N~+"
+            "~M$len = strlen($this->current);~N"
+            "~Mprintf(\"%3d (line %4d): [%d]'\", $n, $line, $len);~N"
+            "~Mfor ($i = 0; $i <= $len; ++$i) {~N~+"
+            "~Mif ($this->limit_backward === $i) echo '{';~N"
+            "~Mif ($this->bra === $i) echo '[';~N"
+            "~Mif ($this->cursor === $i) echo '|';~N"
+            "~Mif ($this->ket === $i) echo ']';~N"
+            "~Mif ($this->limit === $i) echo '}';~N"
+            "~Mif ($i < $len) {~N~+"
+            "~M$ch = $this->current[$i];~N"
+            "~Mif ($ch === '\\0') echo '#'; else echo $ch;~N~-"
+            "~M}~N~-"
+            "~M}~N"
+            "~Mecho \"'\\n\";~N~-"
+            "~M}~N");
+    }
+
     generate_methods(g);
 
     generate_class_end(g);