isomorfeus-ferret 0.12.2 → 0.12.6

data/ext/isomorfeus_ferret_ext/stem_UTF_8_spanish.h

@@ -1,4 +1,4 @@
-/* This file was generated automatically by the Snowball to ANSI C compiler */
+/* Generated by Snowball 2.2.0 - https://snowballstem.org/ */
 
 extern struct SN_env * spanish_UTF_8_create_env(void);
 extern void spanish_UTF_8_close_env(struct SN_env * z);

data/ext/isomorfeus_ferret_ext/stem_UTF_8_swedish.c

@@ -1,8 +1,9 @@
-/* This file was generated automatically by the Snowball to ANSI C compiler */
+/* Generated by Snowball 2.2.0 - https://snowballstem.org/ */
 
 #include "stem_header.h"
 
 extern int swedish_UTF_8_stem(struct SN_env * z);
+
 static int r_other_suffix(struct SN_env * z);
 static int r_consonant_pair(struct SN_env * z);
 static int r_main_suffix(struct SN_env * z);
@@ -51,43 +52,43 @@ static const symbol s_0_36[3] = { 'a', 's', 't' };
 
 static const struct among a_0[37] =
 {
-/*  0 */ { 1, s_0_0, -1, 1, 0},
-/*  1 */ { 4, s_0_1, 0, 1, 0},
-/*  2 */ { 4, s_0_2, 0, 1, 0},
-/*  3 */ { 7, s_0_3, 2, 1, 0},
-/*  4 */ { 4, s_0_4, 0, 1, 0},
-/*  5 */ { 2, s_0_5, -1, 1, 0},
-/*  6 */ { 1, s_0_6, -1, 1, 0},
-/*  7 */ { 3, s_0_7, 6, 1, 0},
-/*  8 */ { 4, s_0_8, 6, 1, 0},
-/*  9 */ { 4, s_0_9, 6, 1, 0},
-/* 10 */ { 3, s_0_10, 6, 1, 0},
-/* 11 */ { 4, s_0_11, 6, 1, 0},
-/* 12 */ { 2, s_0_12, -1, 1, 0},
-/* 13 */ { 5, s_0_13, 12, 1, 0},
-/* 14 */ { 4, s_0_14, 12, 1, 0},
-/* 15 */ { 5, s_0_15, 12, 1, 0},
-/* 16 */ { 3, s_0_16, -1, 1, 0},
-/* 17 */ { 2, s_0_17, -1, 1, 0},
-/* 18 */ { 2, s_0_18, -1, 1, 0},
-/* 19 */ { 5, s_0_19, 18, 1, 0},
-/* 20 */ { 2, s_0_20, -1, 1, 0},
-/* 21 */ { 1, s_0_21, -1, 2, 0},
-/* 22 */ { 2, s_0_22, 21, 1, 0},
-/* 23 */ { 5, s_0_23, 22, 1, 0},
-/* 24 */ { 5, s_0_24, 22, 1, 0},
-/* 25 */ { 5, s_0_25, 22, 1, 0},
-/* 26 */ { 2, s_0_26, 21, 1, 0},
-/* 27 */ { 4, s_0_27, 26, 1, 0},
-/* 28 */ { 5, s_0_28, 26, 1, 0},
-/* 29 */ { 3, s_0_29, 21, 1, 0},
-/* 30 */ { 5, s_0_30, 29, 1, 0},
-/* 31 */ { 6, s_0_31, 29, 1, 0},
-/* 32 */ { 4, s_0_32, 21, 1, 0},
-/* 33 */ { 2, s_0_33, -1, 1, 0},
-/* 34 */ { 5, s_0_34, -1, 1, 0},
-/* 35 */ { 3, s_0_35, -1, 1, 0},
-/* 36 */ { 3, s_0_36, -1, 1, 0}
+{ 1, s_0_0, -1, 1, 0},
+{ 4, s_0_1, 0, 1, 0},
+{ 4, s_0_2, 0, 1, 0},
+{ 7, s_0_3, 2, 1, 0},
+{ 4, s_0_4, 0, 1, 0},
+{ 2, s_0_5, -1, 1, 0},
+{ 1, s_0_6, -1, 1, 0},
+{ 3, s_0_7, 6, 1, 0},
+{ 4, s_0_8, 6, 1, 0},
+{ 4, s_0_9, 6, 1, 0},
+{ 3, s_0_10, 6, 1, 0},
+{ 4, s_0_11, 6, 1, 0},
+{ 2, s_0_12, -1, 1, 0},
+{ 5, s_0_13, 12, 1, 0},
+{ 4, s_0_14, 12, 1, 0},
+{ 5, s_0_15, 12, 1, 0},
+{ 3, s_0_16, -1, 1, 0},
+{ 2, s_0_17, -1, 1, 0},
+{ 2, s_0_18, -1, 1, 0},
+{ 5, s_0_19, 18, 1, 0},
+{ 2, s_0_20, -1, 1, 0},
+{ 1, s_0_21, -1, 2, 0},
+{ 2, s_0_22, 21, 1, 0},
+{ 5, s_0_23, 22, 1, 0},
+{ 5, s_0_24, 22, 1, 0},
+{ 5, s_0_25, 22, 1, 0},
+{ 2, s_0_26, 21, 1, 0},
+{ 4, s_0_27, 26, 1, 0},
+{ 5, s_0_28, 26, 1, 0},
+{ 3, s_0_29, 21, 1, 0},
+{ 5, s_0_30, 29, 1, 0},
+{ 6, s_0_31, 29, 1, 0},
+{ 4, s_0_32, 21, 1, 0},
+{ 2, s_0_33, -1, 1, 0},
+{ 5, s_0_34, -1, 1, 0},
+{ 3, s_0_35, -1, 1, 0},
+{ 3, s_0_36, -1, 1, 0}
 };
 
 static const symbol s_1_0[2] = { 'd', 'd' };
@@ -100,13 +101,13 @@ static const symbol s_1_6[2] = { 't', 't' };
 
 static const struct among a_1[7] =
 {
-/*  0 */ { 2, s_1_0, -1, -1, 0},
-/*  1 */ { 2, s_1_1, -1, -1, 0},
-/*  2 */ { 2, s_1_2, -1, -1, 0},
-/*  3 */ { 2, s_1_3, -1, -1, 0},
-/*  4 */ { 2, s_1_4, -1, -1, 0},
-/*  5 */ { 2, s_1_5, -1, -1, 0},
-/*  6 */ { 2, s_1_6, -1, -1, 0}
+{ 2, s_1_0, -1, -1, 0},
+{ 2, s_1_1, -1, -1, 0},
+{ 2, s_1_2, -1, -1, 0},
+{ 2, s_1_3, -1, -1, 0},
+{ 2, s_1_4, -1, -1, 0},
+{ 2, s_1_5, -1, -1, 0},
+{ 2, s_1_6, -1, -1, 0}
 };
 
 static const symbol s_2_0[2] = { 'i', 'g' };
@@ -117,11 +118,11 @@ static const symbol s_2_4[5] = { 'l', 0xC3, 0xB6, 's', 't' };
 
 static const struct among a_2[5] =
 {
-/*  0 */ { 2, s_2_0, -1, 1, 0},
-/*  1 */ { 3, s_2_1, 0, 1, 0},
-/*  2 */ { 3, s_2_2, -1, 1, 0},
-/*  3 */ { 5, s_2_3, -1, 3, 0},
-/*  4 */ { 5, s_2_4, -1, 2, 0}
+{ 2, s_2_0, -1, 1, 0},
+{ 3, s_2_1, 0, 1, 0},
+{ 3, s_2_2, -1, 1, 0},
+{ 5, s_2_3, -1, 3, 0},
+{ 5, s_2_4, -1, 2, 0}
 };
 
 static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 32 };
@@ -132,54 +133,51 @@ static const symbol s_0[] = { 'l', 0xC3, 0xB6, 's' };
 static const symbol s_1[] = { 'f', 'u', 'l', 'l' };
 
 static int r_mark_regions(struct SN_env * z) {
-    z->I[0] = z->l;
-    {   int c_test = z->c; /* test, line 29 */
-        {   int ret = skip_utf8(z->p, z->c, 0, z->l, + 3);
+    z->I[1] = z->l;
+    {   int c_test1 = z->c;
+        {   int ret = skip_utf8(z->p, z->c, z->l, 3);
             if (ret < 0) return 0;
-            z->c = ret; /* hop, line 29 */
+            z->c = ret;
         }
-        z->I[1] = z->c; /* setmark x, line 29 */
-        z->c = c_test;
+        z->I[0] = z->c;
+        z->c = c_test1;
     }
-    if (out_grouping_U(z, g_v, 97, 246, 1) < 0) return 0; /* goto */ /* grouping v, line 30 */
-    {    /* gopast */ /* non v, line 30 */
+    if (out_grouping_U(z, g_v, 97, 246, 1) < 0) return 0;
+    {
         int ret = in_grouping_U(z, g_v, 97, 246, 1);
         if (ret < 0) return 0;
         z->c += ret;
     }
-    z->I[0] = z->c; /* setmark p1, line 30 */
-     /* try, line 31 */
-    if (!(z->I[0] < z->I[1])) goto lab0;
-    z->I[0] = z->I[1];
+    z->I[1] = z->c;
+
+    if (!(z->I[1] < z->I[0])) goto lab0;
+    z->I[1] = z->I[0];
 lab0:
     return 1;
 }
 
 static int r_main_suffix(struct SN_env * z) {
     int among_var;
-    {   int mlimit; /* setlimit, line 37 */
-        int m1 = z->l - z->c; (void)m1;
-        if (z->c < z->I[0]) return 0;
-        z->c = z->I[0]; /* tomark, line 37 */
-        mlimit = z->lb; z->lb = z->c;
-        z->c = z->l - m1;
-        z->ket = z->c; /* [, line 37 */
-        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851442 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
-        among_var = find_among_b(z, a_0, 37); /* substring, line 37 */
-        if (!(among_var)) { z->lb = mlimit; return 0; }
-        z->bra = z->c; /* ], line 37 */
-        z->lb = mlimit;
+
+    {   int mlimit1;
+        if (z->c < z->I[1]) return 0;
+        mlimit1 = z->lb; z->lb = z->I[1];
+        z->ket = z->c;
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851442 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit1; return 0; }
+        among_var = find_among_b(z, a_0, 37);
+        if (!(among_var)) { z->lb = mlimit1; return 0; }
+        z->bra = z->c;
+        z->lb = mlimit1;
     }
-    switch(among_var) {
-        case 0: return 0;
+    switch (among_var) {
         case 1:
-            {   int ret = slice_del(z); /* delete, line 44 */
+            {   int ret = slice_del(z);
                 if (ret < 0) return ret;
             }
             break;
         case 2:
             if (in_grouping_b_U(z, g_s_ending, 98, 121, 0)) return 0;
-            {   int ret = slice_del(z); /* delete, line 46 */
+            {   int ret = slice_del(z);
                 if (ret < 0) return ret;
             }
             break;
@@ -188,107 +186,94 @@ static int r_main_suffix(struct SN_env * z) {
 }
 
 static int r_consonant_pair(struct SN_env * z) {
-    {   int mlimit; /* setlimit, line 50 */
-        int m1 = z->l - z->c; (void)m1;
-        if (z->c < z->I[0]) return 0;
-        z->c = z->I[0]; /* tomark, line 50 */
-        mlimit = z->lb; z->lb = z->c;
-        z->c = z->l - m1;
-        {   int m2 = z->l - z->c; (void)m2; /* and, line 52 */
-            if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1064976 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
-            if (!(find_among_b(z, a_1, 7))) { z->lb = mlimit; return 0; } /* among, line 51 */
+
+    {   int mlimit1;
+        if (z->c < z->I[1]) return 0;
+        mlimit1 = z->lb; z->lb = z->I[1];
+        {   int m2 = z->l - z->c; (void)m2;
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1064976 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit1; return 0; }
+            if (!(find_among_b(z, a_1, 7))) { z->lb = mlimit1; return 0; }
             z->c = z->l - m2;
-            z->ket = z->c; /* [, line 52 */
-            {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
-                if (ret < 0) { z->lb = mlimit; return 0; }
-                z->c = ret; /* next, line 52 */
+            z->ket = z->c;
+            {   int ret = skip_b_utf8(z->p, z->c, z->lb, 1);
+                if (ret < 0) { z->lb = mlimit1; return 0; }
+                z->c = ret;
             }
-            z->bra = z->c; /* ], line 52 */
-            {   int ret = slice_del(z); /* delete, line 52 */
+            z->bra = z->c;
+            {   int ret = slice_del(z);
                 if (ret < 0) return ret;
             }
         }
-        z->lb = mlimit;
+        z->lb = mlimit1;
     }
     return 1;
 }
 
 static int r_other_suffix(struct SN_env * z) {
     int among_var;
-    {   int mlimit; /* setlimit, line 55 */
-        int m1 = z->l - z->c; (void)m1;
-        if (z->c < z->I[0]) return 0;
-        z->c = z->I[0]; /* tomark, line 55 */
-        mlimit = z->lb; z->lb = z->c;
-        z->c = z->l - m1;
-        z->ket = z->c; /* [, line 56 */
-        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1572992 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
-        among_var = find_among_b(z, a_2, 5); /* substring, line 56 */
-        if (!(among_var)) { z->lb = mlimit; return 0; }
-        z->bra = z->c; /* ], line 56 */
-        switch(among_var) {
-            case 0: { z->lb = mlimit; return 0; }
+
+    {   int mlimit1;
+        if (z->c < z->I[1]) return 0;
+        mlimit1 = z->lb; z->lb = z->I[1];
+        z->ket = z->c;
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1572992 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit1; return 0; }
+        among_var = find_among_b(z, a_2, 5);
+        if (!(among_var)) { z->lb = mlimit1; return 0; }
+        z->bra = z->c;
+        switch (among_var) {
             case 1:
-                {   int ret = slice_del(z); /* delete, line 57 */
+                {   int ret = slice_del(z);
                     if (ret < 0) return ret;
                 }
                 break;
             case 2:
-                {   int ret = slice_from_s(z, 4, s_0); /* <-, line 58 */
+                {   int ret = slice_from_s(z, 4, s_0);
                     if (ret < 0) return ret;
                 }
                 break;
             case 3:
-                {   int ret = slice_from_s(z, 4, s_1); /* <-, line 59 */
+                {   int ret = slice_from_s(z, 4, s_1);
                     if (ret < 0) return ret;
                 }
                 break;
         }
-        z->lb = mlimit;
+        z->lb = mlimit1;
     }
     return 1;
 }
 
 extern int swedish_UTF_8_stem(struct SN_env * z) {
-    {   int c1 = z->c; /* do, line 66 */
+    {   int c1 = z->c;
         {   int ret = r_mark_regions(z);
-            if (ret == 0) goto lab0; /* call mark_regions, line 66 */
             if (ret < 0) return ret;
         }
-    lab0:
         z->c = c1;
     }
-    z->lb = z->c; z->c = z->l; /* backwards, line 67 */
+    z->lb = z->c; z->c = z->l;
 
-    {   int m2 = z->l - z->c; (void)m2; /* do, line 68 */
+    {   int m2 = z->l - z->c; (void)m2;
         {   int ret = r_main_suffix(z);
-            if (ret == 0) goto lab1; /* call main_suffix, line 68 */
             if (ret < 0) return ret;
         }
-    lab1:
         z->c = z->l - m2;
     }
-    {   int m3 = z->l - z->c; (void)m3; /* do, line 69 */
+    {   int m3 = z->l - z->c; (void)m3;
         {   int ret = r_consonant_pair(z);
-            if (ret == 0) goto lab2; /* call consonant_pair, line 69 */
             if (ret < 0) return ret;
         }
-    lab2:
         z->c = z->l - m3;
     }
-    {   int m4 = z->l - z->c; (void)m4; /* do, line 70 */
+    {   int m4 = z->l - z->c; (void)m4;
         {   int ret = r_other_suffix(z);
-            if (ret == 0) goto lab3; /* call other_suffix, line 70 */
             if (ret < 0) return ret;
         }
-    lab3:
         z->c = z->l - m4;
     }
     z->c = z->lb;
     return 1;
 }
 
-extern struct SN_env * swedish_UTF_8_create_env(void) { return SN_create_env(0, 2, 0); }
+extern struct SN_env * swedish_UTF_8_create_env(void) { return SN_create_env(0, 2); }
 
 extern void swedish_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
 

data/ext/isomorfeus_ferret_ext/stem_UTF_8_swedish.h

@@ -1,4 +1,4 @@
-/* This file was generated automatically by the Snowball to ANSI C compiler */
+/* Generated by Snowball 2.2.0 - https://snowballstem.org/ */
 
 extern struct SN_env * swedish_UTF_8_create_env(void);
 extern void swedish_UTF_8_close_env(struct SN_env * z);