ferret 0.11.6 → 0.11.8.4

data/ext/{stem_ISO_8859_1_dutch.c → STEMMER_stem_ISO_8859_1_dutch.c}

@@ -3,7 +3,13 @@
 
 #include "header.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern int dutch_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
 static int r_standard_suffix(struct SN_env * z);
 static int r_undouble(struct SN_env * z);
 static int r_R2(struct SN_env * z);
@@ -13,22 +19,30 @@ static int r_en_ending(struct SN_env * z);
 static int r_e_ending(struct SN_env * z);
 static int r_postlude(struct SN_env * z);
 static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 extern struct SN_env * dutch_ISO_8859_1_create_env(void);
 extern void dutch_ISO_8859_1_close_env(struct SN_env * z);
 
-static symbol s_0_1[1] = { 0xE1 };
-static symbol s_0_2[1] = { 0xE4 };
-static symbol s_0_3[1] = { 0xE9 };
-static symbol s_0_4[1] = { 0xEB };
-static symbol s_0_5[1] = { 0xED };
-static symbol s_0_6[1] = { 0xEF };
-static symbol s_0_7[1] = { 0xF3 };
-static symbol s_0_8[1] = { 0xF6 };
-static symbol s_0_9[1] = { 0xFA };
-static symbol s_0_10[1] = { 0xFC };
-
-static struct among a_0[11] =
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[1] = { 0xE1 };
+static const symbol s_0_2[1] = { 0xE4 };
+static const symbol s_0_3[1] = { 0xE9 };
+static const symbol s_0_4[1] = { 0xEB };
+static const symbol s_0_5[1] = { 0xED };
+static const symbol s_0_6[1] = { 0xEF };
+static const symbol s_0_7[1] = { 0xF3 };
+static const symbol s_0_8[1] = { 0xF6 };
+static const symbol s_0_9[1] = { 0xFA };
+static const symbol s_0_10[1] = { 0xFC };
+
+static const struct among a_0[11] =
 {
 /*  0 */ { 0, 0, -1, 6, 0},
 /*  1 */ { 1, s_0_1, 0, 1, 0},
@@ -43,34 +57,34 @@ static struct among a_0[11] =
 /* 10 */ { 1, s_0_10, 0, 5, 0}
 };
 
-static symbol s_1_1[1] = { 'I' };
-static symbol s_1_2[1] = { 'Y' };
+static const symbol s_1_1[1] = { 'I' };
+static const symbol s_1_2[1] = { 'Y' };
 
-static struct among a_1[3] =
+static const struct among a_1[3] =
 {
 /*  0 */ { 0, 0, -1, 3, 0},
 /*  1 */ { 1, s_1_1, 0, 2, 0},
 /*  2 */ { 1, s_1_2, 0, 1, 0}
 };
 
-static symbol s_2_0[2] = { 'd', 'd' };
-static symbol s_2_1[2] = { 'k', 'k' };
-static symbol s_2_2[2] = { 't', 't' };
+static const symbol s_2_0[2] = { 'd', 'd' };
+static const symbol s_2_1[2] = { 'k', 'k' };
+static const symbol s_2_2[2] = { 't', 't' };
 
-static struct among a_2[3] =
+static const struct among a_2[3] =
 {
 /*  0 */ { 2, s_2_0, -1, -1, 0},
 /*  1 */ { 2, s_2_1, -1, -1, 0},
 /*  2 */ { 2, s_2_2, -1, -1, 0}
 };
 
-static symbol s_3_0[3] = { 'e', 'n', 'e' };
-static symbol s_3_1[2] = { 's', 'e' };
-static symbol s_3_2[2] = { 'e', 'n' };
-static symbol s_3_3[5] = { 'h', 'e', 'd', 'e', 'n' };
-static symbol s_3_4[1] = { 's' };
+static const symbol s_3_0[3] = { 'e', 'n', 'e' };
+static const symbol s_3_1[2] = { 's', 'e' };
+static const symbol s_3_2[2] = { 'e', 'n' };
+static const symbol s_3_3[5] = { 'h', 'e', 'd', 'e', 'n' };
+static const symbol s_3_4[1] = { 's' };
 
-static struct among a_3[5] =
+static const struct among a_3[5] =
 {
 /*  0 */ { 3, s_3_0, -1, 2, 0},
 /*  1 */ { 2, s_3_1, -1, 3, 0},
@@ -79,14 +93,14 @@ static struct among a_3[5] =
 /*  4 */ { 1, s_3_4, -1, 3, 0}
 };
 
-static symbol s_4_0[3] = { 'e', 'n', 'd' };
-static symbol s_4_1[2] = { 'i', 'g' };
-static symbol s_4_2[3] = { 'i', 'n', 'g' };
-static symbol s_4_3[4] = { 'l', 'i', 'j', 'k' };
-static symbol s_4_4[4] = { 'b', 'a', 'a', 'r' };
-static symbol s_4_5[3] = { 'b', 'a', 'r' };
+static const symbol s_4_0[3] = { 'e', 'n', 'd' };
+static const symbol s_4_1[2] = { 'i', 'g' };
+static const symbol s_4_2[3] = { 'i', 'n', 'g' };
+static const symbol s_4_3[4] = { 'l', 'i', 'j', 'k' };
+static const symbol s_4_4[4] = { 'b', 'a', 'a', 'r' };
+static const symbol s_4_5[3] = { 'b', 'a', 'r' };
 
-static struct among a_4[6] =
+static const struct among a_4[6] =
 {
 /*  0 */ { 3, s_4_0, -1, 1, 0},
 /*  1 */ { 2, s_4_1, -1, 2, 0},
@@ -96,12 +110,12 @@ static struct among a_4[6] =
 /*  5 */ { 3, s_4_5, -1, 5, 0}
 };
 
-static symbol s_5_0[2] = { 'a', 'a' };
-static symbol s_5_1[2] = { 'e', 'e' };
-static symbol s_5_2[2] = { 'o', 'o' };
-static symbol s_5_3[2] = { 'u', 'u' };
+static const symbol s_5_0[2] = { 'a', 'a' };
+static const symbol s_5_1[2] = { 'e', 'e' };
+static const symbol s_5_2[2] = { 'o', 'o' };
+static const symbol s_5_3[2] = { 'u', 'u' };
 
-static struct among a_5[4] =
+static const struct among a_5[4] =
 {
 /*  0 */ { 2, s_5_0, -1, -1, 0},
 /*  1 */ { 2, s_5_1, -1, -1, 0},
@@ -109,73 +123,69 @@ static struct among a_5[4] =
 /*  3 */ { 2, s_5_3, -1, -1, 0}
 };
 
-static unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
-
-static unsigned char g_v_I[] = { 1, 0, 0, 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
-
-static unsigned char g_v_j[] = { 17, 67, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
-
-static symbol s_0[] = { 'a' };
-static symbol s_1[] = { 'e' };
-static symbol s_2[] = { 'i' };
-static symbol s_3[] = { 'o' };
-static symbol s_4[] = { 'u' };
-static symbol s_5[] = { 'y' };
-static symbol s_6[] = { 'Y' };
-static symbol s_7[] = { 'i' };
-static symbol s_8[] = { 'I' };
-static symbol s_9[] = { 'y' };
-static symbol s_10[] = { 'Y' };
-static symbol s_11[] = { 'y' };
-static symbol s_12[] = { 'i' };
-static symbol s_13[] = { 'e' };
-static symbol s_14[] = { 'g', 'e', 'm' };
-static symbol s_15[] = { 'h', 'e', 'i', 'd' };
-static symbol s_16[] = { 'h', 'e', 'i', 'd' };
-static symbol s_17[] = { 'c' };
-static symbol s_18[] = { 'e', 'n' };
-static symbol s_19[] = { 'i', 'g' };
-static symbol s_20[] = { 'e' };
-static symbol s_21[] = { 'e' };
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const unsigned char g_v_I[] = { 1, 0, 0, 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const unsigned char g_v_j[] = { 17, 67, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const symbol s_0[] = { 'a' };
+static const symbol s_1[] = { 'e' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'o' };
+static const symbol s_4[] = { 'u' };
+static const symbol s_5[] = { 'y' };
+static const symbol s_6[] = { 'Y' };
+static const symbol s_7[] = { 'i' };
+static const symbol s_8[] = { 'I' };
+static const symbol s_9[] = { 'y' };
+static const symbol s_10[] = { 'Y' };
+static const symbol s_11[] = { 'y' };
+static const symbol s_12[] = { 'i' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'g', 'e', 'm' };
+static const symbol s_15[] = { 'h', 'e', 'i', 'd' };
+static const symbol s_16[] = { 'h', 'e', 'i', 'd' };
+static const symbol s_17[] = { 'c' };
+static const symbol s_18[] = { 'e', 'n' };
+static const symbol s_19[] = { 'i', 'g' };
+static const symbol s_20[] = { 'e' };
+static const symbol s_21[] = { 'e' };
 
 static int r_prelude(struct SN_env * z) {
     int among_var;
     {   int c_test = z->c; /* test, line 42 */
         while(1) { /* repeat, line 42 */
-            int c = z->c;
+            int c1 = z->c;
             z->bra = z->c; /* [, line 43 */
+            if (z->c >= z->l || z->p[z->c + 0] >> 5 != 7 || !((340306450 >> (z->p[z->c + 0] & 0x1f)) & 1)) among_var = 6; else
             among_var = find_among(z, a_0, 11); /* substring, line 43 */
             if (!(among_var)) goto lab0;
             z->ket = z->c; /* ], line 43 */
             switch(among_var) {
                 case 0: goto lab0;
                 case 1:
-                    {   int ret;
-                        ret = slice_from_s(z, 1, s_0); /* <-, line 45 */
+                    {   int ret = slice_from_s(z, 1, s_0); /* <-, line 45 */
                         if (ret < 0) return ret;
                     }
                     break;
                 case 2:
-                    {   int ret;
-                        ret = slice_from_s(z, 1, s_1); /* <-, line 47 */
+                    {   int ret = slice_from_s(z, 1, s_1); /* <-, line 47 */
                         if (ret < 0) return ret;
                     }
                     break;
                 case 3:
-                    {   int ret;
-                        ret = slice_from_s(z, 1, s_2); /* <-, line 49 */
+                    {   int ret = slice_from_s(z, 1, s_2); /* <-, line 49 */
                         if (ret < 0) return ret;
                     }
                     break;
                 case 4:
-                    {   int ret;
-                        ret = slice_from_s(z, 1, s_3); /* <-, line 51 */
+                    {   int ret = slice_from_s(z, 1, s_3); /* <-, line 51 */
                         if (ret < 0) return ret;
                     }
                     break;
                 case 5:
-                    {   int ret;
-                        ret = slice_from_s(z, 1, s_4); /* <-, line 53 */
+                    {   int ret = slice_from_s(z, 1, s_4); /* <-, line 53 */
                         if (ret < 0) return ret;
                     }
                     break;
@@ -186,57 +196,54 @@ static int r_prelude(struct SN_env * z) {
             }
             continue;
         lab0:
-            z->c = c;
+            z->c = c1;
             break;
         }
         z->c = c_test;
     }
-    {   int c = z->c; /* try, line 57 */
+    {   int c_keep = z->c; /* try, line 57 */
         z->bra = z->c; /* [, line 57 */
-        if (!(eq_s(z, 1, s_5))) { z->c = c; goto lab1; }
+        if (!(eq_s(z, 1, s_5))) { z->c = c_keep; goto lab1; }
         z->ket = z->c; /* ], line 57 */
-        {   int ret;
-            ret = slice_from_s(z, 1, s_6); /* <-, line 57 */
+        {   int ret = slice_from_s(z, 1, s_6); /* <-, line 57 */
             if (ret < 0) return ret;
         }
     lab1:
         ;
     }
     while(1) { /* repeat, line 58 */
-        int c = z->c;
+        int c2 = z->c;
         while(1) { /* goto, line 58 */
-            int c = z->c;
-            if (!(in_grouping(z, g_v, 97, 232))) goto lab3;
+            int c3 = z->c;
+            if (in_grouping(z, g_v, 97, 232, 0)) goto lab3;
             z->bra = z->c; /* [, line 59 */
-            {   int c = z->c; /* or, line 59 */
+            {   int c4 = z->c; /* or, line 59 */
                 if (!(eq_s(z, 1, s_7))) goto lab5;
                 z->ket = z->c; /* ], line 59 */
-                if (!(in_grouping(z, g_v, 97, 232))) goto lab5;
-                {   int ret;
-                    ret = slice_from_s(z, 1, s_8); /* <-, line 59 */
+                if (in_grouping(z, g_v, 97, 232, 0)) goto lab5;
+                {   int ret = slice_from_s(z, 1, s_8); /* <-, line 59 */
                     if (ret < 0) return ret;
                 }
                 goto lab4;
             lab5:
-                z->c = c;
+                z->c = c4;
                 if (!(eq_s(z, 1, s_9))) goto lab3;
                 z->ket = z->c; /* ], line 60 */
-                {   int ret;
-                    ret = slice_from_s(z, 1, s_10); /* <-, line 60 */
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 60 */
                     if (ret < 0) return ret;
                 }
             }
         lab4:
-            z->c = c;
+            z->c = c3;
             break;
         lab3:
-            z->c = c;
+            z->c = c3;
             if (z->c >= z->l) goto lab2;
             z->c++; /* goto, line 58 */
         }
         continue;
     lab2:
-        z->c = c;
+        z->c = c2;
         break;
     }
     return 1;
@@ -245,38 +252,30 @@ static int r_prelude(struct SN_env * z) {
 static int r_mark_regions(struct SN_env * z) {
     z->I[0] = z->l;
     z->I[1] = z->l;
-    while(1) { /* gopast, line 69 */
-        if (!(in_grouping(z, g_v, 97, 232))) goto lab0;
-        break;
-    lab0:
-        if (z->c >= z->l) return 0;
-        z->c++; /* gopast, line 69 */
+    {    /* gopast */ /* grouping v, line 69 */
+        int ret = out_grouping(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
     }
-    while(1) { /* gopast, line 69 */
-        if (!(out_grouping(z, g_v, 97, 232))) goto lab1;
-        break;
-    lab1:
-        if (z->c >= z->l) return 0;
-        z->c++; /* gopast, line 69 */
+    {    /* gopast */ /* non v, line 69 */
+        int ret = in_grouping(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
     }
     z->I[0] = z->c; /* setmark p1, line 69 */
      /* try, line 70 */
-    if (!(z->I[0] < 3)) goto lab2;
+    if (!(z->I[0] < 3)) goto lab0;
     z->I[0] = 3;
-lab2:
-    while(1) { /* gopast, line 71 */
-        if (!(in_grouping(z, g_v, 97, 232))) goto lab3;
-        break;
-    lab3:
-        if (z->c >= z->l) return 0;
-        z->c++; /* gopast, line 71 */
+lab0:
+    {    /* gopast */ /* grouping v, line 71 */
+        int ret = out_grouping(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
     }
-    while(1) { /* gopast, line 71 */
-        if (!(out_grouping(z, g_v, 97, 232))) goto lab4;
-        break;
-    lab4:
-        if (z->c >= z->l) return 0;
-        z->c++; /* gopast, line 71 */
+    {    /* gopast */ /* non v, line 71 */
+        int ret = in_grouping(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
     }
     z->I[1] = z->c; /* setmark p2, line 71 */
     return 1;
@@ -285,22 +284,21 @@ lab2:
 static int r_postlude(struct SN_env * z) {
     int among_var;
     while(1) { /* repeat, line 75 */
-        int c = z->c;
+        int c1 = z->c;
         z->bra = z->c; /* [, line 77 */
+        if (z->c >= z->l || (z->p[z->c + 0] != 73 && z->p[z->c + 0] != 89)) among_var = 3; else
         among_var = find_among(z, a_1, 3); /* substring, line 77 */
         if (!(among_var)) goto lab0;
         z->ket = z->c; /* ], line 77 */
         switch(among_var) {
             case 0: goto lab0;
             case 1:
-                {   int ret;
-                    ret = slice_from_s(z, 1, s_11); /* <-, line 78 */
+                {   int ret = slice_from_s(z, 1, s_11); /* <-, line 78 */
                     if (ret < 0) return ret;
                 }
                 break;
             case 2:
-                {   int ret;
-                    ret = slice_from_s(z, 1, s_12); /* <-, line 79 */
+                {   int ret = slice_from_s(z, 1, s_12); /* <-, line 79 */
                     if (ret < 0) return ret;
                 }
                 break;
@@ -311,7 +309,7 @@ static int r_postlude(struct SN_env * z) {
         }
         continue;
     lab0:
-        z->c = c;
+        z->c = c1;
         break;
     }
     return 1;
@@ -329,6 +327,7 @@ static int r_R2(struct SN_env * z) {
 
 static int r_undouble(struct SN_env * z) {
     {   int m_test = z->l - z->c; /* test, line 91 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1050640 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
         if (!(find_among_b(z, a_2, 3))) return 0; /* among, line 91 */
         z->c = z->l - m_test;
     }
@@ -336,8 +335,7 @@ static int r_undouble(struct SN_env * z) {
     if (z->c <= z->lb) return 0;
     z->c--; /* next, line 91 */
     z->bra = z->c; /* ], line 91 */
-    {   int ret;
-        ret = slice_del(z); /* delete, line 91 */
+    {   int ret = slice_del(z); /* delete, line 91 */
         if (ret < 0) return ret;
     }
     return 1;
@@ -353,11 +351,10 @@ static int r_e_ending(struct SN_env * z) {
         if (ret < 0) return ret;
     }
     {   int m_test = z->l - z->c; /* test, line 96 */
-        if (!(out_grouping_b(z, g_v, 97, 232))) return 0;
+        if (out_grouping_b(z, g_v, 97, 232, 0)) return 0;
         z->c = z->l - m_test;
     }
-    {   int ret;
-        ret = slice_del(z); /* delete, line 96 */
+    {   int ret = slice_del(z); /* delete, line 96 */
         if (ret < 0) return ret;
     }
     z->B[0] = 1; /* set e_found, line 97 */
@@ -373,18 +370,17 @@ static int r_en_ending(struct SN_env * z) {
         if (ret == 0) return 0; /* call R1, line 102 */
         if (ret < 0) return ret;
     }
-    {   int m = z->l - z->c; (void) m; /* and, line 102 */
-        if (!(out_grouping_b(z, g_v, 97, 232))) return 0;
-        z->c = z->l - m;
-        {   int m = z->l - z->c; (void) m; /* not, line 102 */
+    {   int m1 = z->l - z->c; (void)m1; /* and, line 102 */
+        if (out_grouping_b(z, g_v, 97, 232, 0)) return 0;
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 102 */
             if (!(eq_s_b(z, 3, s_14))) goto lab0;
             return 0;
         lab0:
-            z->c = z->l - m;
+            z->c = z->l - m2;
         }
     }
-    {   int ret;
-        ret = slice_del(z); /* delete, line 102 */
+    {   int ret = slice_del(z); /* delete, line 102 */
         if (ret < 0) return ret;
     }
     {   int ret = r_undouble(z);
@@ -396,8 +392,9 @@ static int r_en_ending(struct SN_env * z) {
 
 static int r_standard_suffix(struct SN_env * z) {
     int among_var;
-    {   int m = z->l - z->c; (void) m; /* do, line 107 */
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 107 */
         z->ket = z->c; /* [, line 108 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((540704 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab0;
         among_var = find_among_b(z, a_3, 5); /* substring, line 108 */
         if (!(among_var)) goto lab0;
         z->bra = z->c; /* ], line 108 */
@@ -408,8 +405,7 @@ static int r_standard_suffix(struct SN_env * z) {
                     if (ret == 0) goto lab0; /* call R1, line 110 */
                     if (ret < 0) return ret;
                 }
-                {   int ret;
-                    ret = slice_from_s(z, 4, s_15); /* <-, line 110 */
+                {   int ret = slice_from_s(z, 4, s_15); /* <-, line 110 */
                     if (ret < 0) return ret;
                 }
                 break;
@@ -424,25 +420,24 @@ static int r_standard_suffix(struct SN_env * z) {
                     if (ret == 0) goto lab0; /* call R1, line 116 */
                     if (ret < 0) return ret;
                 }
-                if (!(out_grouping_b(z, g_v_j, 97, 232))) goto lab0;
-                {   int ret;
-                    ret = slice_del(z); /* delete, line 116 */
+                if (out_grouping_b(z, g_v_j, 97, 232, 0)) goto lab0;
+                {   int ret = slice_del(z); /* delete, line 116 */
                     if (ret < 0) return ret;
                 }
                 break;
         }
     lab0:
-        z->c = z->l - m;
+        z->c = z->l - m1;
     }
-    {   int m = z->l - z->c; (void) m; /* do, line 120 */
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 120 */
         {   int ret = r_e_ending(z);
             if (ret == 0) goto lab1; /* call e_ending, line 120 */
             if (ret < 0) return ret;
         }
     lab1:
-        z->c = z->l - m;
+        z->c = z->l - m2;
     }
-    {   int m = z->l - z->c; (void) m; /* do, line 122 */
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 122 */
         z->ket = z->c; /* [, line 122 */
         if (!(eq_s_b(z, 4, s_16))) goto lab2;
         z->bra = z->c; /* ], line 122 */
@@ -450,14 +445,13 @@ static int r_standard_suffix(struct SN_env * z) {
             if (ret == 0) goto lab2; /* call R2, line 122 */
             if (ret < 0) return ret;
         }
-        {   int m = z->l - z->c; (void) m; /* not, line 122 */
+        {   int m4 = z->l - z->c; (void)m4; /* not, line 122 */
             if (!(eq_s_b(z, 1, s_17))) goto lab3;
             goto lab2;
         lab3:
-            z->c = z->l - m;
+            z->c = z->l - m4;
         }
-        {   int ret;
-            ret = slice_del(z); /* delete, line 122 */
+        {   int ret = slice_del(z); /* delete, line 122 */
             if (ret < 0) return ret;
         }
         z->ket = z->c; /* [, line 123 */
@@ -468,10 +462,11 @@ static int r_standard_suffix(struct SN_env * z) {
             if (ret < 0) return ret;
         }
     lab2:
-        z->c = z->l - m;
+        z->c = z->l - m3;
     }
-    {   int m = z->l - z->c; (void) m; /* do, line 126 */
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 126 */
         z->ket = z->c; /* [, line 127 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((264336 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab4;
         among_var = find_among_b(z, a_4, 6); /* substring, line 127 */
         if (!(among_var)) goto lab4;
         z->bra = z->c; /* ], line 127 */
@@ -482,11 +477,10 @@ static int r_standard_suffix(struct SN_env * z) {
                     if (ret == 0) goto lab4; /* call R2, line 129 */
                     if (ret < 0) return ret;
                 }
-                {   int ret;
-                    ret = slice_del(z); /* delete, line 129 */
+                {   int ret = slice_del(z); /* delete, line 129 */
                     if (ret < 0) return ret;
                 }
-                {   int m = z->l - z->c; (void) m; /* or, line 130 */
+                {   int m6 = z->l - z->c; (void)m6; /* or, line 130 */
                     z->ket = z->c; /* [, line 130 */
                     if (!(eq_s_b(z, 2, s_19))) goto lab6;
                     z->bra = z->c; /* ], line 130 */
@@ -494,19 +488,18 @@ static int r_standard_suffix(struct SN_env * z) {
                         if (ret == 0) goto lab6; /* call R2, line 130 */
                         if (ret < 0) return ret;
                     }
-                    {   int m = z->l - z->c; (void) m; /* not, line 130 */
+                    {   int m7 = z->l - z->c; (void)m7; /* not, line 130 */
                         if (!(eq_s_b(z, 1, s_20))) goto lab7;
                         goto lab6;
                     lab7:
-                        z->c = z->l - m;
+                        z->c = z->l - m7;
                     }
-                    {   int ret;
-                        ret = slice_del(z); /* delete, line 130 */
+                    {   int ret = slice_del(z); /* delete, line 130 */
                         if (ret < 0) return ret;
                     }
                     goto lab5;
                 lab6:
-                    z->c = z->l - m;
+                    z->c = z->l - m6;
                     {   int ret = r_undouble(z);
                         if (ret == 0) goto lab4; /* call undouble, line 130 */
                         if (ret < 0) return ret;
@@ -519,14 +512,13 @@ static int r_standard_suffix(struct SN_env * z) {
                     if (ret == 0) goto lab4; /* call R2, line 133 */
                     if (ret < 0) return ret;
                 }
-                {   int m = z->l - z->c; (void) m; /* not, line 133 */
+                {   int m8 = z->l - z->c; (void)m8; /* not, line 133 */
                     if (!(eq_s_b(z, 1, s_21))) goto lab8;
                     goto lab4;
                 lab8:
-                    z->c = z->l - m;
+                    z->c = z->l - m8;
                 }
-                {   int ret;
-                    ret = slice_del(z); /* delete, line 133 */
+                {   int ret = slice_del(z); /* delete, line 133 */
                     if (ret < 0) return ret;
                 }
                 break;
@@ -535,8 +527,7 @@ static int r_standard_suffix(struct SN_env * z) {
                     if (ret == 0) goto lab4; /* call R2, line 136 */
                     if (ret < 0) return ret;
                 }
-                {   int ret;
-                    ret = slice_del(z); /* delete, line 136 */
+                {   int ret = slice_del(z); /* delete, line 136 */
                     if (ret < 0) return ret;
                 }
                 {   int ret = r_e_ending(z);
@@ -549,8 +540,7 @@ static int r_standard_suffix(struct SN_env * z) {
                     if (ret == 0) goto lab4; /* call R2, line 139 */
                     if (ret < 0) return ret;
                 }
-                {   int ret;
-                    ret = slice_del(z); /* delete, line 139 */
+                {   int ret = slice_del(z); /* delete, line 139 */
                     if (ret < 0) return ret;
                 }
                 break;
@@ -560,76 +550,75 @@ static int r_standard_suffix(struct SN_env * z) {
                     if (ret < 0) return ret;
                 }
                 if (!(z->B[0])) goto lab4; /* Boolean test e_found, line 142 */
-                {   int ret;
-                    ret = slice_del(z); /* delete, line 142 */
+                {   int ret = slice_del(z); /* delete, line 142 */
                     if (ret < 0) return ret;
                 }
                 break;
         }
     lab4:
-        z->c = z->l - m;
+        z->c = z->l - m5;
     }
-    {   int m = z->l - z->c; (void) m; /* do, line 146 */
-        if (!(out_grouping_b(z, g_v_I, 73, 232))) goto lab9;
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 146 */
+        if (out_grouping_b(z, g_v_I, 73, 232, 0)) goto lab9;
         {   int m_test = z->l - z->c; /* test, line 148 */
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((2129954 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab9;
             if (!(find_among_b(z, a_5, 4))) goto lab9; /* among, line 149 */
-            if (!(out_grouping_b(z, g_v, 97, 232))) goto lab9;
+            if (out_grouping_b(z, g_v, 97, 232, 0)) goto lab9;
             z->c = z->l - m_test;
         }
         z->ket = z->c; /* [, line 152 */
         if (z->c <= z->lb) goto lab9;
         z->c--; /* next, line 152 */
         z->bra = z->c; /* ], line 152 */
-        {   int ret;
-            ret = slice_del(z); /* delete, line 152 */
+        {   int ret = slice_del(z); /* delete, line 152 */
             if (ret < 0) return ret;
         }
     lab9:
-        z->c = z->l - m;
+        z->c = z->l - m9;
     }
     return 1;
 }
 
 extern int dutch_ISO_8859_1_stem(struct SN_env * z) {
-    {   int c = z->c; /* do, line 159 */
+    {   int c1 = z->c; /* do, line 159 */
         {   int ret = r_prelude(z);
             if (ret == 0) goto lab0; /* call prelude, line 159 */
             if (ret < 0) return ret;
         }
     lab0:
-        z->c = c;
+        z->c = c1;
     }
-    {   int c = z->c; /* do, line 160 */
+    {   int c2 = z->c; /* do, line 160 */
         {   int ret = r_mark_regions(z);
             if (ret == 0) goto lab1; /* call mark_regions, line 160 */
             if (ret < 0) return ret;
         }
     lab1:
-        z->c = c;
+        z->c = c2;
     }
     z->lb = z->c; z->c = z->l; /* backwards, line 161 */
 
-    {   int m = z->l - z->c; (void) m; /* do, line 162 */
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 162 */
         {   int ret = r_standard_suffix(z);
             if (ret == 0) goto lab2; /* call standard_suffix, line 162 */
             if (ret < 0) return ret;
         }
     lab2:
-        z->c = z->l - m;
+        z->c = z->l - m3;
     }
     z->c = z->lb;
-    {   int c = z->c; /* do, line 163 */
+    {   int c4 = z->c; /* do, line 163 */
         {   int ret = r_postlude(z);
             if (ret == 0) goto lab3; /* call postlude, line 163 */
             if (ret < 0) return ret;
         }
     lab3:
-        z->c = c;
+        z->c = c4;
     }
     return 1;
 }
 
 extern struct SN_env * dutch_ISO_8859_1_create_env(void) { return SN_create_env(0, 2, 1); }
 
-extern void dutch_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z); }
+extern void dutch_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }