ferret 0.11.6 → 0.11.8.4

data/ext/BZLIB_huffman.c

@@ -0,0 +1,205 @@
+
+/*-------------------------------------------------------------*/
+/*--- Huffman coding low-level stuff                        ---*/
+/*---                                             huffman.c ---*/
+/*-------------------------------------------------------------*/
+
+/* ------------------------------------------------------------------
+   This file is part of bzip2/libbzip2, a program and library for
+   lossless, block-sorting data compression.
+
+   bzip2/libbzip2 version 1.0.4 of 20 December 2006
+   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   README file.
+
+   This program is released under the terms of the license contained
+   in the file LICENSE.
+   ------------------------------------------------------------------ */
+
+
+#include "bzlib_private.h"
+
+/*---------------------------------------------------*/
+#define WEIGHTOF(zz0)  ((zz0) & 0xffffff00)
+#define DEPTHOF(zz1)   ((zz1) & 0x000000ff)
+#define MYMAX(zz2,zz3) ((zz2) > (zz3) ? (zz2) : (zz3))
+
+#define ADDWEIGHTS(zw1,zw2)                           \
+   (WEIGHTOF(zw1)+WEIGHTOF(zw2)) |                    \
+   (1 + MYMAX(DEPTHOF(zw1),DEPTHOF(zw2)))
+
+#define UPHEAP(z)                                     \
+{                                                     \
+   Int32 zz, tmp;                                     \
+   zz = z; tmp = heap[zz];                            \
+   while (weight[tmp] < weight[heap[zz >> 1]]) {      \
+      heap[zz] = heap[zz >> 1];                       \
+      zz >>= 1;                                       \
+   }                                                  \
+   heap[zz] = tmp;                                    \
+}
+
+#define DOWNHEAP(z)                                   \
+{                                                     \
+   Int32 zz, yy, tmp;                                 \
+   zz = z; tmp = heap[zz];                            \
+   while (True) {                                     \
+      yy = zz << 1;                                   \
+      if (yy > nHeap) break;                          \
+      if (yy < nHeap &&                               \
+          weight[heap[yy+1]] < weight[heap[yy]])      \
+         yy++;                                        \
+      if (weight[tmp] < weight[heap[yy]]) break;      \
+      heap[zz] = heap[yy];                            \
+      zz = yy;                                        \
+   }                                                  \
+   heap[zz] = tmp;                                    \
+}
+
+
+/*---------------------------------------------------*/
+void BZ2_hbMakeCodeLengths ( UChar *len, 
+                             Int32 *freq,
+                             Int32 alphaSize,
+                             Int32 maxLen )
+{
+   /*--
+      Nodes and heap entries run from 1.  Entry 0
+      for both the heap and nodes is a sentinel.
+   --*/
+   Int32 nNodes, nHeap, n1, n2, i, j, k;
+   Bool  tooLong;
+
+   Int32 heap   [ BZ_MAX_ALPHA_SIZE + 2 ];
+   Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ];
+   Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ]; 
+
+   for (i = 0; i < alphaSize; i++)
+      weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8;
+
+   while (True) {
+
+      nNodes = alphaSize;
+      nHeap = 0;
+
+      heap[0] = 0;
+      weight[0] = 0;
+      parent[0] = -2;
+
+      for (i = 1; i <= alphaSize; i++) {
+         parent[i] = -1;
+         nHeap++;
+         heap[nHeap] = i;
+         UPHEAP(nHeap);
+      }
+
+      AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 );
+   
+      while (nHeap > 1) {
+         n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
+         n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
+         nNodes++;
+         parent[n1] = parent[n2] = nNodes;
+         weight[nNodes] = ADDWEIGHTS(weight[n1], weight[n2]);
+         parent[nNodes] = -1;
+         nHeap++;
+         heap[nHeap] = nNodes;
+         UPHEAP(nHeap);
+      }
+
+      AssertH( nNodes < (BZ_MAX_ALPHA_SIZE * 2), 2002 );
+
+      tooLong = False;
+      for (i = 1; i <= alphaSize; i++) {
+         j = 0;
+         k = i;
+         while (parent[k] >= 0) { k = parent[k]; j++; }
+         len[i-1] = j;
+         if (j > maxLen) tooLong = True;
+      }
+      
+      if (! tooLong) break;
+
+      /* 17 Oct 04: keep-going condition for the following loop used
+         to be 'i < alphaSize', which missed the last element,
+         theoretically leading to the possibility of the compressor
+         looping.  However, this count-scaling step is only needed if
+         one of the generated Huffman code words is longer than
+         maxLen, which up to and including version 1.0.2 was 20 bits,
+         which is extremely unlikely.  In version 1.0.3 maxLen was
+         changed to 17 bits, which has minimal effect on compression
+         ratio, but does mean this scaling step is used from time to
+         time, enough to verify that it works.
+
+         This means that bzip2-1.0.3 and later will only produce
+         Huffman codes with a maximum length of 17 bits.  However, in
+         order to preserve backwards compatibility with bitstreams
+         produced by versions pre-1.0.3, the decompressor must still
+         handle lengths of up to 20. */
+
+      for (i = 1; i <= alphaSize; i++) {
+         j = weight[i] >> 8;
+         j = 1 + (j / 2);
+         weight[i] = j << 8;
+      }
+   }
+}
+
+
+/*---------------------------------------------------*/
+void BZ2_hbAssignCodes ( Int32 *code,
+                         UChar *length,
+                         Int32 minLen,
+                         Int32 maxLen,
+                         Int32 alphaSize )
+{
+   Int32 n, vec, i;
+
+   vec = 0;
+   for (n = minLen; n <= maxLen; n++) {
+      for (i = 0; i < alphaSize; i++)
+         if (length[i] == n) { code[i] = vec; vec++; };
+      vec <<= 1;
+   }
+}
+
+
+/*---------------------------------------------------*/
+void BZ2_hbCreateDecodeTables ( Int32 *limit,
+                                Int32 *base,
+                                Int32 *perm,
+                                UChar *length,
+                                Int32 minLen,
+                                Int32 maxLen,
+                                Int32 alphaSize )
+{
+   Int32 pp, i, j, vec;
+
+   pp = 0;
+   for (i = minLen; i <= maxLen; i++)
+      for (j = 0; j < alphaSize; j++)
+         if (length[j] == i) { perm[pp] = j; pp++; };
+
+   for (i = 0; i < BZ_MAX_CODE_LEN; i++) base[i] = 0;
+   for (i = 0; i < alphaSize; i++) base[length[i]+1]++;
+
+   for (i = 1; i < BZ_MAX_CODE_LEN; i++) base[i] += base[i-1];
+
+   for (i = 0; i < BZ_MAX_CODE_LEN; i++) limit[i] = 0;
+   vec = 0;
+
+   for (i = minLen; i <= maxLen; i++) {
+      vec += (base[i+1] - base[i]);
+      limit[i] = vec-1;
+      vec <<= 1;
+   }
+   for (i = minLen + 1; i <= maxLen; i++)
+      base[i] = ((limit[i-1] + 1) << 1) - base[i];
+}
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                         huffman.c ---*/
+/*-------------------------------------------------------------*/

data/ext/BZLIB_randtable.c

@@ -0,0 +1,84 @@
+
+/*-------------------------------------------------------------*/
+/*--- Table for randomising repetitive blocks               ---*/
+/*---                                           randtable.c ---*/
+/*-------------------------------------------------------------*/
+
+/* ------------------------------------------------------------------
+   This file is part of bzip2/libbzip2, a program and library for
+   lossless, block-sorting data compression.
+
+   bzip2/libbzip2 version 1.0.4 of 20 December 2006
+   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   README file.
+
+   This program is released under the terms of the license contained
+   in the file LICENSE.
+   ------------------------------------------------------------------ */
+
+
+#include "bzlib_private.h"
+
+
+/*---------------------------------------------*/
+Int32 BZ2_rNums[512] = { 
+   619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 
+   985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 
+   733, 859, 335, 708, 621, 574, 73, 654, 730, 472, 
+   419, 436, 278, 496, 867, 210, 399, 680, 480, 51, 
+   878, 465, 811, 169, 869, 675, 611, 697, 867, 561, 
+   862, 687, 507, 283, 482, 129, 807, 591, 733, 623, 
+   150, 238, 59, 379, 684, 877, 625, 169, 643, 105, 
+   170, 607, 520, 932, 727, 476, 693, 425, 174, 647, 
+   73, 122, 335, 530, 442, 853, 695, 249, 445, 515, 
+   909, 545, 703, 919, 874, 474, 882, 500, 594, 612, 
+   641, 801, 220, 162, 819, 984, 589, 513, 495, 799, 
+   161, 604, 958, 533, 221, 400, 386, 867, 600, 782, 
+   382, 596, 414, 171, 516, 375, 682, 485, 911, 276, 
+   98, 553, 163, 354, 666, 933, 424, 341, 533, 870, 
+   227, 730, 475, 186, 263, 647, 537, 686, 600, 224, 
+   469, 68, 770, 919, 190, 373, 294, 822, 808, 206, 
+   184, 943, 795, 384, 383, 461, 404, 758, 839, 887, 
+   715, 67, 618, 276, 204, 918, 873, 777, 604, 560, 
+   951, 160, 578, 722, 79, 804, 96, 409, 713, 940, 
+   652, 934, 970, 447, 318, 353, 859, 672, 112, 785, 
+   645, 863, 803, 350, 139, 93, 354, 99, 820, 908, 
+   609, 772, 154, 274, 580, 184, 79, 626, 630, 742, 
+   653, 282, 762, 623, 680, 81, 927, 626, 789, 125, 
+   411, 521, 938, 300, 821, 78, 343, 175, 128, 250, 
+   170, 774, 972, 275, 999, 639, 495, 78, 352, 126, 
+   857, 956, 358, 619, 580, 124, 737, 594, 701, 612, 
+   669, 112, 134, 694, 363, 992, 809, 743, 168, 974, 
+   944, 375, 748, 52, 600, 747, 642, 182, 862, 81, 
+   344, 805, 988, 739, 511, 655, 814, 334, 249, 515, 
+   897, 955, 664, 981, 649, 113, 974, 459, 893, 228, 
+   433, 837, 553, 268, 926, 240, 102, 654, 459, 51, 
+   686, 754, 806, 760, 493, 403, 415, 394, 687, 700, 
+   946, 670, 656, 610, 738, 392, 760, 799, 887, 653, 
+   978, 321, 576, 617, 626, 502, 894, 679, 243, 440, 
+   680, 879, 194, 572, 640, 724, 926, 56, 204, 700, 
+   707, 151, 457, 449, 797, 195, 791, 558, 945, 679, 
+   297, 59, 87, 824, 713, 663, 412, 693, 342, 606, 
+   134, 108, 571, 364, 631, 212, 174, 643, 304, 329, 
+   343, 97, 430, 751, 497, 314, 983, 374, 822, 928, 
+   140, 206, 73, 263, 980, 736, 876, 478, 430, 305, 
+   170, 514, 364, 692, 829, 82, 855, 953, 676, 246, 
+   369, 970, 294, 750, 807, 827, 150, 790, 288, 923, 
+   804, 378, 215, 828, 592, 281, 565, 555, 710, 82, 
+   896, 831, 547, 261, 524, 462, 293, 465, 502, 56, 
+   661, 821, 976, 991, 658, 869, 905, 758, 745, 193, 
+   768, 550, 608, 933, 378, 286, 215, 979, 792, 961, 
+   61, 688, 793, 644, 986, 403, 106, 366, 905, 644, 
+   372, 567, 466, 434, 645, 210, 389, 550, 919, 135, 
+   780, 773, 635, 389, 707, 100, 626, 958, 165, 504, 
+   920, 176, 193, 713, 857, 265, 203, 50, 668, 108, 
+   645, 990, 626, 197, 510, 357, 358, 850, 858, 364, 
+   936, 638
+};
+
+
+/*-------------------------------------------------------------*/
+/*--- end                                       randtable.c ---*/
+/*-------------------------------------------------------------*/

data/ext/{api.c → STEMMER_api.c}

@@ -19,43 +19,40 @@ extern struct SN_env * SN_create_env(int S_size, int I_size, int B_size)
             z->S[i] = create_s();
             if (z->S[i] == NULL) goto error;
         }
-        z->S_size = S_size;
     }
 
     if (I_size)
     {
         z->I = (int *) calloc(I_size, sizeof(int));
         if (z->I == NULL) goto error;
-        z->I_size = I_size;
     }
 
     if (B_size)
     {
-        z->B = (symbol *) calloc(B_size, sizeof(symbol));
+        z->B = (unsigned char *) calloc(B_size, sizeof(unsigned char));
         if (z->B == NULL) goto error;
-        z->B_size = B_size;
     }
 
     return z;
 error:
-    SN_close_env(z);
+    SN_close_env(z, S_size);
     return NULL;
 }
 
-extern void SN_close_env(struct SN_env * z)
+extern void SN_close_env(struct SN_env * z, int S_size)
 {
     if (z == NULL) return;
-    if (z->S_size)
+    if (S_size)
     {
         int i;
-        for (i = 0; i < z->S_size; i++)
+        for (i = 0; i < S_size; i++)
         {
             lose_s(z->S[i]);
         }
         free(z->S);
     }
-    if (z->I_size) free(z->I);
-    if (z->B_size) free(z->B);
+    free(z->I);
+    free(z->B);
     if (z->p) lose_s(z->p);
     free(z);
 }

data/ext/{libstemmer.c → STEMMER_libstemmer.c}

@@ -19,7 +19,8 @@ sb_stemmer_list(void)
     return algorithm_names;
 }
 
-static stemmer_encoding sb_getenc(const char * charenc)
+static stemmer_encoding_t
+sb_getenc(const char * charenc)
 {
     struct stemmer_encoding * encoding;
     if (charenc == NULL) return ENC_UTF_8;
@@ -33,7 +34,7 @@ static stemmer_encoding sb_getenc(const char * charenc)
 extern struct sb_stemmer *
 sb_stemmer_new(const char * algorithm, const char * charenc)
 {
-    stemmer_encoding enc;
+    stemmer_encoding_t enc;
     struct stemmer_modules * module;
     struct sb_stemmer * stemmer =
 	    (struct sb_stemmer *) malloc(sizeof(struct sb_stemmer));

data/ext/{stem_ISO_8859_1_danish.c → STEMMER_stem_ISO_8859_1_danish.c}

@@ -3,50 +3,64 @@
 
 #include "header.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern int danish_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
 static int r_undouble(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);
 static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 extern struct SN_env * danish_ISO_8859_1_create_env(void);
 extern void danish_ISO_8859_1_close_env(struct SN_env * z);
 
-static symbol s_0_0[3] = { 'h', 'e', 'd' };
-static symbol s_0_1[5] = { 'e', 't', 'h', 'e', 'd' };
-static symbol s_0_2[4] = { 'e', 'r', 'e', 'd' };
-static symbol s_0_3[1] = { 'e' };
-static symbol s_0_4[5] = { 'e', 'r', 'e', 'd', 'e' };
-static symbol s_0_5[4] = { 'e', 'n', 'd', 'e' };
-static symbol s_0_6[6] = { 'e', 'r', 'e', 'n', 'd', 'e' };
-static symbol s_0_7[3] = { 'e', 'n', 'e' };
-static symbol s_0_8[4] = { 'e', 'r', 'n', 'e' };
-static symbol s_0_9[3] = { 'e', 'r', 'e' };
-static symbol s_0_10[2] = { 'e', 'n' };
-static symbol s_0_11[5] = { 'h', 'e', 'd', 'e', 'n' };
-static symbol s_0_12[4] = { 'e', 'r', 'e', 'n' };
-static symbol s_0_13[2] = { 'e', 'r' };
-static symbol s_0_14[5] = { 'h', 'e', 'd', 'e', 'r' };
-static symbol s_0_15[4] = { 'e', 'r', 'e', 'r' };
-static symbol s_0_16[1] = { 's' };
-static symbol s_0_17[4] = { 'h', 'e', 'd', 's' };
-static symbol s_0_18[2] = { 'e', 's' };
-static symbol s_0_19[5] = { 'e', 'n', 'd', 'e', 's' };
-static symbol s_0_20[7] = { 'e', 'r', 'e', 'n', 'd', 'e', 's' };
-static symbol s_0_21[4] = { 'e', 'n', 'e', 's' };
-static symbol s_0_22[5] = { 'e', 'r', 'n', 'e', 's' };
-static symbol s_0_23[4] = { 'e', 'r', 'e', 's' };
-static symbol s_0_24[3] = { 'e', 'n', 's' };
-static symbol s_0_25[6] = { 'h', 'e', 'd', 'e', 'n', 's' };
-static symbol s_0_26[5] = { 'e', 'r', 'e', 'n', 's' };
-static symbol s_0_27[3] = { 'e', 'r', 's' };
-static symbol s_0_28[3] = { 'e', 't', 's' };
-static symbol s_0_29[5] = { 'e', 'r', 'e', 't', 's' };
-static symbol s_0_30[2] = { 'e', 't' };
-static symbol s_0_31[4] = { 'e', 'r', 'e', 't' };
 
-static struct among a_0[32] =
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[3] = { 'h', 'e', 'd' };
+static const symbol s_0_1[5] = { 'e', 't', 'h', 'e', 'd' };
+static const symbol s_0_2[4] = { 'e', 'r', 'e', 'd' };
+static const symbol s_0_3[1] = { 'e' };
+static const symbol s_0_4[5] = { 'e', 'r', 'e', 'd', 'e' };
+static const symbol s_0_5[4] = { 'e', 'n', 'd', 'e' };
+static const symbol s_0_6[6] = { 'e', 'r', 'e', 'n', 'd', 'e' };
+static const symbol s_0_7[3] = { 'e', 'n', 'e' };
+static const symbol s_0_8[4] = { 'e', 'r', 'n', 'e' };
+static const symbol s_0_9[3] = { 'e', 'r', 'e' };
+static const symbol s_0_10[2] = { 'e', 'n' };
+static const symbol s_0_11[5] = { 'h', 'e', 'd', 'e', 'n' };
+static const symbol s_0_12[4] = { 'e', 'r', 'e', 'n' };
+static const symbol s_0_13[2] = { 'e', 'r' };
+static const symbol s_0_14[5] = { 'h', 'e', 'd', 'e', 'r' };
+static const symbol s_0_15[4] = { 'e', 'r', 'e', 'r' };
+static const symbol s_0_16[1] = { 's' };
+static const symbol s_0_17[4] = { 'h', 'e', 'd', 's' };
+static const symbol s_0_18[2] = { 'e', 's' };
+static const symbol s_0_19[5] = { 'e', 'n', 'd', 'e', 's' };
+static const symbol s_0_20[7] = { 'e', 'r', 'e', 'n', 'd', 'e', 's' };
+static const symbol s_0_21[4] = { 'e', 'n', 'e', 's' };
+static const symbol s_0_22[5] = { 'e', 'r', 'n', 'e', 's' };
+static const symbol s_0_23[4] = { 'e', 'r', 'e', 's' };
+static const symbol s_0_24[3] = { 'e', 'n', 's' };
+static const symbol s_0_25[6] = { 'h', 'e', 'd', 'e', 'n', 's' };
+static const symbol s_0_26[5] = { 'e', 'r', 'e', 'n', 's' };
+static const symbol s_0_27[3] = { 'e', 'r', 's' };
+static const symbol s_0_28[3] = { 'e', 't', 's' };
+static const symbol s_0_29[5] = { 'e', 'r', 'e', 't', 's' };
+static const symbol s_0_30[2] = { 'e', 't' };
+static const symbol s_0_31[4] = { 'e', 'r', 'e', 't' };
+
+static const struct among a_0[32] =
 {
 /*  0 */ { 3, s_0_0, -1, 1, 0},
 /*  1 */ { 5, s_0_1, 0, 1, 0},
@@ -82,12 +96,12 @@ static struct among a_0[32] =
 /* 31 */ { 4, s_0_31, 30, 1, 0}
 };
 
-static symbol s_1_0[2] = { 'g', 'd' };
-static symbol s_1_1[2] = { 'd', 't' };
-static symbol s_1_2[2] = { 'g', 't' };
-static symbol s_1_3[2] = { 'k', 't' };
+static const symbol s_1_0[2] = { 'g', 'd' };
+static const symbol s_1_1[2] = { 'd', 't' };
+static const symbol s_1_2[2] = { 'g', 't' };
+static const symbol s_1_3[2] = { 'k', 't' };
 
-static struct among a_1[4] =
+static const struct among a_1[4] =
 {
 /*  0 */ { 2, s_1_0, -1, -1, 0},
 /*  1 */ { 2, s_1_1, -1, -1, 0},
@@ -95,13 +109,13 @@ static struct among a_1[4] =
 /*  3 */ { 2, s_1_3, -1, -1, 0}
 };
 
-static symbol s_2_0[2] = { 'i', 'g' };
-static symbol s_2_1[3] = { 'l', 'i', 'g' };
-static symbol s_2_2[4] = { 'e', 'l', 'i', 'g' };
-static symbol s_2_3[3] = { 'e', 'l', 's' };
-static symbol s_2_4[4] = { 'l', 0xF8, 's', 't' };
+static const symbol s_2_0[2] = { 'i', 'g' };
+static const symbol s_2_1[3] = { 'l', 'i', 'g' };
+static const symbol s_2_2[4] = { 'e', 'l', 'i', 'g' };
+static const symbol s_2_3[3] = { 'e', 'l', 's' };
+static const symbol s_2_4[4] = { 'l', 0xF8, 's', 't' };
 
-static struct among a_2[5] =
+static const struct among a_2[5] =
 {
 /*  0 */ { 2, s_2_0, -1, 1, 0},
 /*  1 */ { 3, s_2_1, 0, 1, 0},
@@ -110,75 +124,63 @@ static struct among a_2[5] =
 /*  4 */ { 4, s_2_4, -1, 2, 0}
 };
 
-static unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 128 };
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 128 };
 
-static unsigned char g_s_ending[] = { 239, 254, 42, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16 };
+static const unsigned char g_s_ending[] = { 239, 254, 42, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16 };
 
-static symbol s_0[] = { 's', 't' };
-static symbol s_1[] = { 'i', 'g' };
-static symbol s_2[] = { 'l', 0xF8, 's' };
+static const symbol s_0[] = { 's', 't' };
+static const symbol s_1[] = { 'i', 'g' };
+static const symbol s_2[] = { 'l', 0xF8, 's' };
 
 static int r_mark_regions(struct SN_env * z) {
     z->I[0] = z->l;
     {   int c_test = z->c; /* test, line 33 */
-        {   int c = z->c + 3;
-            if (0 > c || c > z->l) return 0;
-            z->c = c; /* hop, line 33 */
+        {   int ret = z->c + 3;
+            if (0 > ret || ret > z->l) return 0;
+            z->c = ret; /* hop, line 33 */
         }
         z->I[1] = z->c; /* setmark x, line 33 */
         z->c = c_test;
     }
-    while(1) { /* goto, line 34 */
-        int c = z->c;
-        if (!(in_grouping(z, g_v, 97, 248))) goto lab0;
-        z->c = c;
-        break;
-    lab0:
-        z->c = c;
-        if (z->c >= z->l) return 0;
-        z->c++; /* goto, line 34 */
-    }
-    while(1) { /* gopast, line 34 */
-        if (!(out_grouping(z, g_v, 97, 248))) goto lab1;
-        break;
-    lab1:
-        if (z->c >= z->l) return 0;
-        z->c++; /* gopast, line 34 */
+    if (out_grouping(z, g_v, 97, 248, 1) < 0) return 0; /* goto */ /* grouping v, line 34 */
+    {    /* gopast */ /* non v, line 34 */
+        int ret = in_grouping(z, g_v, 97, 248, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
     }
     z->I[0] = z->c; /* setmark p1, line 34 */
      /* try, line 35 */
-    if (!(z->I[0] < z->I[1])) goto lab2;
+    if (!(z->I[0] < z->I[1])) goto lab0;
     z->I[0] = z->I[1];
-lab2:
+lab0:
     return 1;
 }
 
 static int r_main_suffix(struct SN_env * z) {
     int among_var;
-    {   int m3; /* setlimit, line 41 */
-        int m = z->l - z->c; (void) m;
+    {   int mlimit; /* setlimit, line 41 */
+        int m1 = z->l - z->c; (void)m1;
         if (z->c < z->I[0]) return 0;
         z->c = z->I[0]; /* tomark, line 41 */
-        m3 = z->lb; z->lb = z->c;
-        z->c = z->l - m;
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
         z->ket = z->c; /* [, line 41 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851440 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
         among_var = find_among_b(z, a_0, 32); /* substring, line 41 */
-        if (!(among_var)) { z->lb = m3; return 0; }
+        if (!(among_var)) { z->lb = mlimit; return 0; }
         z->bra = z->c; /* ], line 41 */
-        z->lb = m3;
+        z->lb = mlimit;
     }
     switch(among_var) {
         case 0: return 0;
         case 1:
-            {   int ret;
-                ret = slice_del(z); /* delete, line 48 */
+            {   int ret = slice_del(z); /* delete, line 48 */
                 if (ret < 0) return ret;
             }
             break;
         case 2:
-            if (!(in_grouping_b(z, g_s_ending, 97, 229))) return 0;
-            {   int ret;
-                ret = slice_del(z); /* delete, line 50 */
+            if (in_grouping_b(z, g_s_ending, 97, 229, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 50 */
                 if (ret < 0) return ret;
             }
             break;
@@ -188,24 +190,24 @@ static int r_main_suffix(struct SN_env * z) {
 
 static int r_consonant_pair(struct SN_env * z) {
     {   int m_test = z->l - z->c; /* test, line 55 */
-        {   int m3; /* setlimit, line 56 */
-            int m = z->l - z->c; (void) m;
+        {   int mlimit; /* setlimit, line 56 */
+            int m1 = z->l - z->c; (void)m1;
             if (z->c < z->I[0]) return 0;
             z->c = z->I[0]; /* tomark, line 56 */
-            m3 = z->lb; z->lb = z->c;
-            z->c = z->l - m;
+            mlimit = z->lb; z->lb = z->c;
+            z->c = z->l - m1;
             z->ket = z->c; /* [, line 56 */
-            if (!(find_among_b(z, a_1, 4))) { z->lb = m3; return 0; } /* substring, line 56 */
+            if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 116)) { z->lb = mlimit; return 0; }
+            if (!(find_among_b(z, a_1, 4))) { z->lb = mlimit; return 0; } /* substring, line 56 */
             z->bra = z->c; /* ], line 56 */
-            z->lb = m3;
+            z->lb = mlimit;
         }
         z->c = z->l - m_test;
     }
     if (z->c <= z->lb) return 0;
     z->c--; /* next, line 62 */
     z->bra = z->c; /* ], line 62 */
-    {   int ret;
-        ret = slice_del(z); /* delete, line 62 */
+    {   int ret = slice_del(z); /* delete, line 62 */
         if (ret < 0) return ret;
     }
     return 1;
@@ -213,49 +215,47 @@ static int r_consonant_pair(struct SN_env * z) {
 
 static int r_other_suffix(struct SN_env * z) {
     int among_var;
-    {   int m = z->l - z->c; (void) m; /* do, line 66 */
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 66 */
         z->ket = z->c; /* [, line 66 */
         if (!(eq_s_b(z, 2, s_0))) goto lab0;
         z->bra = z->c; /* ], line 66 */
         if (!(eq_s_b(z, 2, s_1))) goto lab0;
-        {   int ret;
-            ret = slice_del(z); /* delete, line 66 */
+        {   int ret = slice_del(z); /* delete, line 66 */
             if (ret < 0) return ret;
         }
     lab0:
-        z->c = z->l - m;
+        z->c = z->l - m1;
     }
-    {   int m3; /* setlimit, line 67 */
-        int m = z->l - z->c; (void) m;
+    {   int mlimit; /* setlimit, line 67 */
+        int m2 = z->l - z->c; (void)m2;
         if (z->c < z->I[0]) return 0;
         z->c = z->I[0]; /* tomark, line 67 */
-        m3 = z->lb; z->lb = z->c;
-        z->c = z->l - m;
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m2;
         z->ket = z->c; /* [, line 67 */
+        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 67 */
-        if (!(among_var)) { z->lb = m3; return 0; }
+        if (!(among_var)) { z->lb = mlimit; return 0; }
         z->bra = z->c; /* ], line 67 */
-        z->lb = m3;
+        z->lb = mlimit;
     }
     switch(among_var) {
         case 0: return 0;
         case 1:
-            {   int ret;
-                ret = slice_del(z); /* delete, line 70 */
+            {   int ret = slice_del(z); /* delete, line 70 */
                 if (ret < 0) return ret;
             }
-            {   int m = z->l - z->c; (void) m; /* do, line 70 */
+            {   int m3 = z->l - z->c; (void)m3; /* do, line 70 */
                 {   int ret = r_consonant_pair(z);
                     if (ret == 0) goto lab1; /* call consonant_pair, line 70 */
                     if (ret < 0) return ret;
                 }
             lab1:
-                z->c = z->l - m;
+                z->c = z->l - m3;
             }
             break;
         case 2:
-            {   int ret;
-                ret = slice_from_s(z, 3, s_2); /* <-, line 72 */
+            {   int ret = slice_from_s(z, 3, s_2); /* <-, line 72 */
                 if (ret < 0) return ret;
             }
             break;
@@ -264,69 +264,68 @@ static int r_other_suffix(struct SN_env * z) {
 }
 
 static int r_undouble(struct SN_env * z) {
-    {   int m3; /* setlimit, line 76 */
-        int m = z->l - z->c; (void) m;
+    {   int mlimit; /* setlimit, line 76 */
+        int m1 = z->l - z->c; (void)m1;
         if (z->c < z->I[0]) return 0;
         z->c = z->I[0]; /* tomark, line 76 */
-        m3 = z->lb; z->lb = z->c;
-        z->c = z->l - m;
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
         z->ket = z->c; /* [, line 76 */
-        if (!(out_grouping_b(z, g_v, 97, 248))) { z->lb = m3; return 0; }
+        if (out_grouping_b(z, g_v, 97, 248, 0)) { z->lb = mlimit; return 0; }
         z->bra = z->c; /* ], line 76 */
         z->S[0] = slice_to(z, z->S[0]); /* -> ch, line 76 */
         if (z->S[0] == 0) return -1; /* -> ch, line 76 */
-        z->lb = m3;
+        z->lb = mlimit;
     }
     if (!(eq_v_b(z, z->S[0]))) return 0; /* name ch, line 77 */
-    {   int ret;
-        ret = slice_del(z); /* delete, line 78 */
+    {   int ret = slice_del(z); /* delete, line 78 */
         if (ret < 0) return ret;
     }
     return 1;
 }
 
 extern int danish_ISO_8859_1_stem(struct SN_env * z) {
-    {   int c = z->c; /* do, line 84 */
+    {   int c1 = z->c; /* do, line 84 */
         {   int ret = r_mark_regions(z);
             if (ret == 0) goto lab0; /* call mark_regions, line 84 */
             if (ret < 0) return ret;
         }
     lab0:
-        z->c = c;
+        z->c = c1;
     }
     z->lb = z->c; z->c = z->l; /* backwards, line 85 */
 
-    {   int m = z->l - z->c; (void) m; /* do, line 86 */
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 86 */
         {   int ret = r_main_suffix(z);
             if (ret == 0) goto lab1; /* call main_suffix, line 86 */
             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 87 */
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 87 */
         {   int ret = r_consonant_pair(z);
             if (ret == 0) goto lab2; /* call consonant_pair, line 87 */
             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 88 */
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 88 */
         {   int ret = r_other_suffix(z);
             if (ret == 0) goto lab3; /* call other_suffix, line 88 */
             if (ret < 0) return ret;
         }
     lab3:
-        z->c = z->l - m;
+        z->c = z->l - m4;
     }
-    {   int m = z->l - z->c; (void) m; /* do, line 89 */
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 89 */
         {   int ret = r_undouble(z);
             if (ret == 0) goto lab4; /* call undouble, line 89 */
             if (ret < 0) return ret;
         }
     lab4:
-        z->c = z->l - m;
+        z->c = z->l - m5;
     }
     z->c = z->lb;
     return 1;
@@ -334,5 +333,5 @@ extern int danish_ISO_8859_1_stem(struct SN_env * z) {
 
 extern struct SN_env * danish_ISO_8859_1_create_env(void) { return SN_create_env(1, 2, 0); }
 
-extern void danish_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z); }
+extern void danish_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 1); }