mittens 0.3.3 → 0.3.5

data/vendor/snowball/compiler/driver.c

@@ -80,9 +80,9 @@ static void check_lim(int i, int argc) {
     }
 }
 
-static FILE * get_output(byte * s) {
-    s[SIZE(s)] = 0;
-    const char * filename = (const char *)s;
+static FILE * get_output(byte ** s_ptr) {
+    *s_ptr = ensure_nul_s(*s_ptr);
+    const char * filename = (const char *)*s_ptr;
     FILE * output = fopen(filename, "w");
     if (output == NULL) {
         fprintf(stderr, "Can't open output %s\n", filename);
@@ -396,7 +396,7 @@ static struct options * read_options(int * argc_ptr, char * argv[]) {
 
         const char * dot = strrchr(leaf, '.');
         if (dot) {
-            o->output_file = create_s_from_data(leaf, dot - leaf);
+            o->output_file = create_s_from_data(leaf, (int)(dot - leaf));
         } else {
             o->output_file = create_s_from_sz(leaf);
         }
@@ -404,21 +404,26 @@ static struct options * read_options(int * argc_ptr, char * argv[]) {
     } else {
         // Remove any extension from o->output_file so `-o path/to/english.c`
         // works.
-        o->output_file[SIZE(o->output_file)] = '\0';
         const char * output_file = (const char *)o->output_file;
-        const char * slash = strrchr(output_file, '/');
-        const char * leaf = (slash == NULL) ? output_file : slash + 1;
-
-        slash = strrchr(leaf, '\\');
-        if (slash != NULL) leaf = slash + 1;
-
-        const char * dot = strrchr(leaf, '.');
-        if (dot) {
-            o->extension = create_s_from_sz(dot);
-            SET_SIZE(o->output_file, dot - output_file);
-            o->output_leaf = create_s_from_data(leaf, dot - leaf);
-        } else {
-            o->output_leaf = create_s_from_sz(leaf);
+        int size = SIZE(output_file);
+        int leaf = size;
+        while (leaf > 0) {
+            int ch = output_file[leaf - 1];
+            if (ch == '/' || ch == '\\') break;
+            --leaf;
+        }
+        int ext = size;
+        while (ext > leaf) {
+            int ch = output_file[--ext];
+            if (ch == '.') {
+                o->extension = create_s_from_data(output_file + ext, (int)(size - ext));
+                SET_SIZE(o->output_file, ext);
+                o->output_leaf = create_s_from_data(output_file + leaf, (int)(ext - leaf));
+                break;
+            }
+        }
+        if (ext == leaf) {
+            o->output_leaf = create_s_from_data(output_file + leaf, (int)(size - leaf));
         }
     }
 
@@ -428,7 +433,7 @@ static struct options * read_options(int * argc_ptr, char * argv[]) {
         if (dot) {
             // Trim off any extension (we only remove the last of multiple
             // extensions above).
-            SET_SIZE(o->name, dot - o->name);
+            SET_SIZE(o->name, (int)(dot - o->name));
         }
         switch (o->target_lang) {
             case LANG_CSHARP:
@@ -443,10 +448,10 @@ static struct options * read_options(int * argc_ptr, char * argv[]) {
                  * underscore+letter or hyphen+letter to an upper case
                  * letter.
                  */
-                size_t len = SIZE(o->name);
-                size_t new_len = 0;
+                int len = SIZE(o->name);
+                int new_len = 0;
                 bool uc_next = true;
-                for (size_t j = 0; j != len; ++j) {
+                for (int j = 0; j != len; ++j) {
                     byte ch = o->name[j];
                     if (ch == '_' || ch == '-') {
                         uc_next = true;
@@ -586,7 +591,7 @@ extern int main(int argc, char * argv[]) {
             case LANG_CPLUSPLUS: {
                 byte * s = copy_s(o->output_file);
                 s = add_literal_to_s(s, ".h");
-                o->output_h = get_output(s);
+                o->output_h = get_output(&s);
                 SET_SIZE(s, SIZE(o->output_file));
                 if (o->extension &&
                     !(SIZE(o->extension) == 2 && memcmp(o->extension, ".h", 2) == 0)) {
@@ -596,7 +601,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".c");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
 
                 generate_program_c(g);
@@ -608,7 +613,7 @@ extern int main(int argc, char * argv[]) {
             case LANG_ADA: {
                 byte * s = copy_s(o->output_file);
                 s = add_literal_to_s(s, ".ads");
-                o->output_h = get_output(s);
+                o->output_h = get_output(&s);
                 SET_SIZE(s, SIZE(o->output_file));
                 if (o->extension &&
                     !(SIZE(o->extension) == 4 && memcmp(o->extension, ".ads", 2) == 0)) {
@@ -617,7 +622,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".adb");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
 
                 generate_program_ada(g);
@@ -632,7 +637,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".cs");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_csharp(g);
                 fclose(o->output_src);
@@ -645,7 +650,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".dart");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_dart(g);
                 fclose(o->output_src);
@@ -658,7 +663,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".go");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_go(g);
                 fclose(o->output_src);
@@ -671,7 +676,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".java");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_java(g);
                 fclose(o->output_src);
@@ -684,7 +689,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".js");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_js(g);
                 fclose(o->output_src);
@@ -697,7 +702,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".pas");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_pascal(g);
                 fclose(o->output_src);
@@ -710,7 +715,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".php");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_php(g);
                 fclose(o->output_src);
@@ -723,7 +728,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".py");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_python(g);
                 fclose(o->output_src);
@@ -736,7 +741,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".rs");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_rust(g);
                 fclose(o->output_src);
@@ -749,7 +754,7 @@ extern int main(int argc, char * argv[]) {
                 } else {
                     s = add_literal_to_s(s, ".zig");
                 }
-                o->output_src = get_output(s);
+                o->output_src = get_output(&s);
                 lose_s(s);
                 generate_program_zig(g);
                 fclose(o->output_src);

data/vendor/snowball/compiler/generator.c

@@ -51,7 +51,7 @@ static void write_comment_literalstring(struct generator * g, const symbol *s,
         // Check if the literal string contains the target language end comment
         // string.  Don't try to be clever here as real-world literal strings
         // are unlikely to contain even partial matches.
-        int end_len = strlen(end);
+        int end_len = (int)strlen(end);
         if (end_len <= SIZE(s)) {
             for (int i = 0; i <= SIZE(s) - end_len; ++i) {
                 for (int j = 0; j < end_len; ++j) {
@@ -205,6 +205,12 @@ void write_comment_content(struct generator * g, struct node * p,
         case c_name:
             write_s(g, p->name->s);
             break;
+        case c_slicefrom:
+            if (p->literalstring && SIZE(p->literalstring) == 0) {
+                write_string(g, "delete");
+                break;
+            }
+            /* FALLTHRU */
         default:
             write_string(g, name_of_token(p->type));
             if (p->name) {
@@ -553,6 +559,16 @@ extern int repeat_restore(struct node * p) {
     return repeat_score(p, 0) >= 2;
 }
 
+extern bool
+amongvar_needed(struct node * p)
+{
+    if (!p) return false;
+    if (p->among && p->among->amongvar_needed) return true;
+    return amongvar_needed(p->left) ||
+           amongvar_needed(p->right) ||
+           amongvar_needed(p->aux);
+}
+
 /* Language-independent write routines for simple entities */
 
 static void write_hexdigit(struct generator * g, unsigned i) {
@@ -568,6 +584,13 @@ extern void write_hex(struct generator * g, unsigned i) {
     write_hexdigit(g, i); /* hex integer */
 }
 
+extern void write_octal3(struct generator * g, unsigned n) {
+    assert(n < 256);
+    write_char(g, '0' + ((n >> 6) & 0x03));
+    write_char(g, '0' + ((n >> 3) & 0x07));
+    write_char(g, '0' + (n & 0x07));
+}
+
 extern void write_char(struct generator * g, int ch) {
     str_append_ch(g->outbuf, ch); /* character */
 }

data/vendor/snowball/compiler/generator_ada.c

@@ -65,6 +65,17 @@ static void write_varname(struct generator * g, struct name * p) {
         write_char(g, '_');
     }
 
+    for (int i = SIZE(p->s) - 1; i > 0; --i) {
+        if (p->s[i] == '_' && p->s[i - 1] == '_') {
+            // Ada doesn't allow identifiers containing a double underscore
+            // so generate an identifier based on the number instead.
+            // A Snowball name must start with a letter so this can't
+            // collide.
+            write_int(g, p->count);
+            return;
+        }
+    }
+
     {
         char save_initial = p->s[0];
         p->s[0] = toupper(save_initial);
@@ -83,7 +94,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) {
     if (SIZE(p) == 0) {
         write_string(g, "\"\"");
         return;
@@ -296,22 +307,6 @@ static void w(struct generator * g, const char * s) {
     writef(g, s, NULL);
 }
 
-static int need_among_var(struct node *p) {
-    while (p) {
-        if (p->type == c_among) {
-            return 1;
-        }
-        if (p->left && need_among_var(p->left)) {
-            return 1;
-        }
-        if (p->aux && need_among_var(p->aux)) {
-            return 1;
-        }
-        p = p->right;
-    }
-    return 0;
-}
-
 static void generate_AE(struct generator * g, struct node * p) {
     const char * s;
     switch (p->type) {
@@ -835,8 +830,8 @@ static void generate_rightslice(struct generator * g, struct node * p) {
 
 static void generate_assignto(struct generator * g, struct node * p) {
     write_comment(g, p);
-    writef(g, "~M~V := Assign_To (Z, ~V);~N", p);
-    write_failure_if(g, "~V == 0", p);
+    writef(g, "~MZ.L~W := Z.L;~N", p);
+    writef(g, "~M~V (1 .. Z.L~W) := Z.P (1 .. Z.L);~N", p);
 }
 
 static void generate_sliceto(struct generator * g, struct node * p) {
@@ -1186,7 +1181,7 @@ static void generate_define(struct generator * g, struct node * p) {
     writef(g, "~Mprocedure ~W (Z : in out Context_Type; Result : out Boolean) is~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();
@@ -1220,17 +1215,20 @@ static void generate_define(struct generator * g, struct node * p) {
 
     writef(g, "~-~Mend ~W;~N", p);
 
-    if (need_among_var(p->left)) {
-        str_append_string(saved_output, "      A : Integer;\n");
+    struct str * temp = g->outbuf;
+    g->outbuf = saved_outbuf;
+
+    g->margin++;
+
+    if (p->name->has_among) {
+        w(g, "~MA : Integer;~N");
     }
 
     if (g->temporary_used) {
-        str_append_string(saved_output, "      C : Result_Index;\n");
+        w(g, "~MC : Result_Index;~N");
     }
 
     /* Declare localised variables. */
-    struct str * temp = g->outbuf;
-    g->outbuf = saved_output;
     for (struct name * name = g->analyser->names; name; name = name->next) {
         if (name->local_to == p->name) {
             switch (name->type) {
@@ -1238,29 +1236,32 @@ static void generate_define(struct generator * g, struct node * p) {
                     assert(0);
                     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->margin--;
+
     g->outbuf = temp;
 
     if (g->var_number) {
-        str_append(saved_output, g->declarations);
+        str_append(saved_outbuf, g->declarations);
     }
 
-    str_append(saved_output, g->outbuf);
+    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) {
@@ -1274,7 +1275,7 @@ static void generate_substring(struct generator * g, struct node * p) {
     struct among * x = p->among;
     int block = -1;
     unsigned int bitmap = 0;
-    struct amongvec * among_cases = x->b;
+    struct amongvec * among_cases = x->v;
     int empty_case = -1;
     int n_cases = 0;
     symbol cases[2];
@@ -1484,7 +1485,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(Z, ~I0, ~I1);~N", p);
+    writef(g, "~MDebug(Z, ~I0, ~I1);~N", p);
 }
 
 static void generate(struct generator * g, struct node * p) {
@@ -1621,7 +1622,7 @@ static void generate_member_decls(struct generator * g) {
 }
 
 static int generate_among_string(struct generator * g, struct among * x, int count) {
-    struct amongvec * v = x->b;
+    struct amongvec * v = x->v;
     int limit = count == 0 ? 38 : 80;
 
     g->I[0] = x->number;
@@ -1645,14 +1646,14 @@ 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) {
     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 - 1;
     w(g, "~N~MA_~I0 : constant Among_Array_Type (0 .. ~I1) := ~+(~N");
 
-    v = x->b;
+    v = x->v;
     for (int i = 0; i < x->literalstring_count; i++) {
         g->I[1] = start_pos;
 
@@ -1691,13 +1692,13 @@ static int generate_among_table(struct generator * g, struct among * x, int star
 static void generate_amongs(struct generator * g) {
     if (!g->analyser->amongs) return;
 
-    struct str * s = g->outbuf;
+    struct str * saved_outbuf = g->outbuf;
     g->outbuf = g->declarations;
 
     w(g, "~N~MAmong_String : constant String := ~+");
     int count = 0;
     for (struct among * x = g->analyser->amongs; x != NULL; x = x->next) {
-        if (x->used) {
+        if (x->used && !x->duplicate) {
             count = generate_among_string(g, x, count);
         }
     }
@@ -1706,11 +1707,11 @@ static void generate_amongs(struct generator * g) {
     int operation = 0;
     int start_pos = 1;
     for (struct among * x = g->analyser->amongs; x != NULL; x = x->next) {
-        if (x->used) {
+        if (x->used && !x->duplicate) {
             start_pos = generate_among_table(g, x, start_pos, &operation);
         }
     }
-    g->outbuf = s;
+    g->outbuf = saved_outbuf;
 
     if (operation == 0) return;
 
@@ -1720,7 +1721,7 @@ static void generate_amongs(struct generator * g) {
     w(g, "~Mbegin~+~N~M");
     w(g, "case Operation is~+~N~M");
     for (struct among * x = g->analyser->amongs; x; x = x->next) {
-        struct amongvec * v = x->b;
+        struct amongvec * v = x->v;
         for (int i = 0; i < x->literalstring_count; i++) {
             if (v[i].function != NULL) {
                 operation++;
@@ -1760,7 +1761,7 @@ static void generate_grouping_table(struct generator * g, struct grouping * q) {
     write_varname(g, q->name);
     w(g, " : constant Grouping_Array (0 .. ~I0) := (~N~+~M");
     for (int i = 0; i < size; i++) {
-        unsigned char m = map[i];
+        symbol m = map[i];
         if (i) w(g, ",~N~M");
         for (int j = 0; j < 8; j++) {
             if (j) w(g, ", ");
@@ -1778,12 +1779,12 @@ static void generate_grouping_table(struct generator * g, struct grouping * q) {
 }
 
 static void generate_groupings(struct generator * g) {
-    struct str * s = g->outbuf;
+    struct str * saved_outbuf = g->outbuf;
     g->outbuf = g->declarations;
     for (struct grouping * q = g->analyser->groupings; q; q = q->next) {
         generate_grouping_table(g, q);
     }
-    g->outbuf = s;
+    g->outbuf = saved_outbuf;
 }
 
 extern void generate_program_ada(struct generator * g) {