mittens 0.3.4 → 0.3.5

data/vendor/snowball/compiler/generator_csharp.c

@@ -36,7 +36,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];
@@ -194,21 +194,21 @@ 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) {
                     write_string(g, "null");
                     continue;
                 }
 
-                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;
@@ -1069,7 +1069,7 @@ static void generate_define(struct generator * g, struct node * p) {
     g->next_label = 0;
     g->var_number = 0;
 
-    if (q->amongvar_needed) {
+    if (amongvar_needed(p->left)) {
         w(g, "~Mint among_var;~N");
     }
 
@@ -1209,7 +1209,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, "~M_debug(~I0, ~I1);~N", p);
 }
 
 static void generate(struct generator * g, struct node * p) {
@@ -1329,7 +1329,7 @@ static void generate_among_table(struct generator * g, struct among * x) {
     write_newline(g);
     write_comment(g, x->node);
 
-    struct amongvec * v = x->b;
+    struct amongvec * v = x->v;
 
     g->I[0] = x->number;
     w(g, "~Mprivate static readonly Among[] a_~I0 = new[] ~N~M{~N~+");
@@ -1345,11 +1345,11 @@ static void generate_among_table(struct generator * g, struct among * x) {
     }
     w(g, "~N~-~M};~N");
 
-    if (x->function_count <= 1) return;
+    if (x->unique_function_count <= 1) return;
 
     w(g, "~N~Mprivate bool af_~I0() {~N~+");
     w(g, "~Mswitch (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 ");
@@ -1368,7 +1368,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);
     }
     w(g, "~N");
 }
@@ -1440,6 +1440,29 @@ extern void generate_program_csharp(struct generator * g) {
     generate_members(g);
     generate_groupings(g);
     generate_amongs(g);
+
+    if (g->analyser->debug_used) {
+       w(g, "~N"
+            "~Mprivate void _debug(int n, int line)~N"
+            "~M{~N~+"
+            "~MConsole.Write(\"{0,3} (line {1,4}): [{2}]'\", n, line, current.Length);~N"
+            "~Mfor (int i = 0; i <= current.Length; ++i)~N"
+            "~M{~N~+"
+            "~Mif (limit_backward == i) Console.Write('{');~N"
+            "~Mif (bra == i) Console.Write('[');~N"
+            "~Mif (cursor == i) Console.Write('|');~N"
+            "~Mif (ket == i) Console.Write(']');~N"
+            "~Mif (limit == i) Console.Write('}');~N"
+            "~Mif (i < current.Length)~N"
+            "~M{~N~+"
+            "~Mchar ch = current[i];~N"
+            "~Mif (ch == '\\0') Console.Write('#'); else Console.Write(ch);~N~-"
+            "~M}~N~-"
+            "~M}~N"
+            "~MConsole.WriteLine(\"'\");~N~-"
+            "~M}~N");
+    }
+
     generate_methods(g);
 
     generate_class_end(g);

data/vendor/snowball/compiler/generator_dart.c

@@ -36,7 +36,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];
@@ -205,12 +205,12 @@ static void writef(struct generator * g, const char * input, struct node * p) {
                     write_string(g, "null");
                     continue;
                 }
-                if (x->function_count == 0) {
+                if (x->unique_function_count == 0) {
                     write_string(g, "null");
                     continue;
                 }
-                if (x->function_count == 1) {
-                    struct amongvec * v = x->b;
+                if (x->unique_function_count == 1) {
+                    struct amongvec * v = x->v;
                     int found = 0;
                     for (int j = 0; j < x->literalstring_count; j++) {
                         if (v[j].function) {
@@ -220,7 +220,7 @@ static void writef(struct generator * g, const char * input, struct node * p) {
                         }
                     }
                     if (!found) {
-                        fprintf(stderr, "function_count == 1 but no among functions\n");
+                        fprintf(stderr, "unique_function_count == 1 but no among functions\n");
                         exit(1);
                     }
                     continue;
@@ -1102,7 +1102,7 @@ static void generate_define(struct generator * g, struct node * p) {
     g->next_label = 0;
     g->var_number = 0;
 
-    if (q->amongvar_needed) {
+    if (amongvar_needed(p->left)) {
         w(g, "~Mint among_var;~N");
     }
 
@@ -1228,7 +1228,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, "~M_debug(~I0, ~I1);~N", p);
 }
 
 static void generate(struct generator * g, struct node * p) {
@@ -1344,7 +1344,7 @@ static void generate_equals(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;
 
@@ -1361,11 +1361,11 @@ static void generate_among_table(struct generator * g, struct among * x) {
     }
     w(g, "~N~-~M];~N~N");
 
-    if (x->function_count <= 1) return;
+    if (x->unique_function_count <= 1) return;
 
     w(g, "~N~Mbool af_~I0() {~N~+");
     w(g, "~Mswitch (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 ");
@@ -1384,7 +1384,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);
     }
 }
 
@@ -1465,6 +1465,34 @@ extern void generate_program_dart(struct generator * g) {
     generate_groupings(g);
 
     generate_members(g);
+
+    if (g->analyser->debug_used) {
+       w(g, "~N"
+            "~Mvoid _debug(int n, int line) {~N~+"
+            "~MString s = '';~N"
+            "~Mfinal len = current.length;~N"
+            "~Mif (n < 10) s += ' ';~N"
+            "~Mif (n < 100) s += ' ';~N"
+            "~Ms += \"$n (line \";~N"
+            "~Mif (line < 10) s += ' ';~N"
+            "~Mif (line < 100) s += ' ';~N"
+            "~Mif (line < 1000) s += ' ';~N"
+            "~Ms += \"$line): [$len]'\";~N"
+            "~Mfor (int i = 0; i <= len; ++i) {~N~+"
+            "~Mif (this.limit_backward == i) s = s + '{';~N"
+            "~Mif (this.bra == i) s = s + '[';~N"
+            "~Mif (this.cursor == i) s = s + '|';~N"
+            "~Mif (this.ket == i) s = s + ']';~N"
+            "~Mif (this.limit == i) s = s + '}';~N"
+            "~Mif (i < len) {~N~+"
+            "~Mfinal ch = current.codeUnitAt(i);~N"
+            "~Mif (ch == 0) s = s + '#'; else s = s + String.fromCharCode(ch);~N~-"
+            "~M}~N~-"
+            "~M}~N"
+            "~Mprint(s + \"'\");~N~-"
+            "~M}~N");
+    }
+
     generate_methods(g);
     generate_equals(g);
 

data/vendor/snowball/compiler/generator_go.c

@@ -33,7 +33,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)) {
@@ -706,10 +706,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";
@@ -1090,7 +1090,7 @@ static void generate_define(struct generator * g, struct node * p) {
         }
     }
 
-    if (q->amongvar_needed) {
+    if (amongvar_needed(p->left)) {
         w(g, "~Mvar among_var int32~N");
     }
 
@@ -1313,7 +1313,7 @@ static void generate_class_begin(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, "~Mvar A_~I0 = []*snowballRuntime.Among{~N~+");
@@ -1338,7 +1338,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);
     }
 }
 

data/vendor/snowball/compiler/generator_java.c

@@ -36,7 +36,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];
@@ -46,9 +46,7 @@ static void write_literal_string(struct generator * g, symbol * p) {
         } else if (ch < 128) {
             // Escape as octal.
             write_char(g, '\\');
-            write_char(g, '0' + ((ch >> 6) & 0x03));
-            write_char(g, '0' + ((ch >> 3) & 0x07));
-            write_char(g, '0' + (ch & 0x07));
+            write_octal3(g, ch);
         } else {
             write_string(g, "\\u");
             write_hex4(g, ch);
@@ -1076,7 +1074,7 @@ static void generate_define(struct generator * g, struct node * p) {
     g->next_label = 0;
     g->var_number = 0;
 
-    if (q->amongvar_needed) {
+    if (amongvar_needed(p->left)) {
         w(g, "~Mint among_var;~N");
     }
 
@@ -1200,7 +1198,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, "~M_debug(~I0, ~I1);~N", p);
 }
 
 static void generate(struct generator * g, struct node * p) {
@@ -1348,7 +1346,7 @@ static void generate_equals(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 final static Among[] a_~I0 = {~N~+");
@@ -1372,7 +1370,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);
     }
 }
 
@@ -1455,6 +1453,29 @@ extern void generate_program_java(struct generator * g) {
     generate_groupings(g);
 
     generate_members(g);
+
+    if (g->analyser->debug_used) {
+       w(g, "~N"
+            "~Mprivate void _debug(int n, int line)~N"
+            "~M{~N~+"
+            "~MSystem.out.format(\"%3d (line %4d): [%d]'\", n, line, length);~N"
+            "~Mfor (int i = 0; i <= length; ++i)~N"
+            "~M{~N~+"
+            "~Mif (limit_backward == i) System.out.write('{');~N"
+            "~Mif (bra == i) System.out.write('[');~N"
+            "~Mif (cursor == i) System.out.write('|');~N"
+            "~Mif (ket == i) System.out.write(']');~N"
+            "~Mif (limit == i) System.out.write('}');~N"
+            "~Mif (i < length)~N"
+            "~M{~N~+"
+            "~Mchar ch = current[i];~N"
+            "~Mif (ch == '\\0') System.out.write('#'); else System.out.write(ch);~N~-"
+            "~M}~N~-"
+            "~M}~N"
+            "~MSystem.out.println(\"'\");~N~-"
+            "~M}~N");
+    }
+
     generate_methods(g);
     generate_equals(g);