From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Tue, 18 Apr 2006 06:53:23 +0000 (+0200)
Subject: corrections in substr analyser
X-Git-Tag: holmes-import~650^2~8
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=b14bee3f1f5584801eb188ba13e77812fa5ca572;p=libucw.git

corrections in substr analyser
---

diff --git a/lib/kmp-new.h b/lib/kmp-new.h
index 2d677aa5..5966b8a5 100644
--- a/lib/kmp-new.h
+++ b/lib/kmp-new.h
@@ -44,7 +44,7 @@
  * 	KMP_NO_DUPS		no support for duplicates
  *
  *    Parameters to build():
- *      KMP_BUILD_STATE(ctx,s)	called for all states (except null) in order of non-decreasing tree depth
+ *      KMP_BUILD_STATE(ctx,s)	called for all states (including null) in order of non-decreasing tree depth
  *
  *	KMP_WANT_CLEANUP	cleanup()
  *	KMP_WANT_SEARCH		includes lib/kmp-search.h with the same prefix;
@@ -291,10 +291,13 @@ P(build) (struct P(context) *ctx)
   if (P(empty)(ctx))
     return;
   uns read = 0, write = 0;
-  struct P(state) *fifo[ctx->hash.hash_count];
-  for (struct P(state) *s = ctx->null.back; s; s = s->next)
+  struct P(state) *fifo[ctx->hash.hash_count], *null = &ctx->null;
+  for (struct P(state) *s = null->back; s; s = s->next)
     fifo[write++] = s;
-  ctx->null.back = NULL;
+  null->back = NULL;
+# ifdef KMP_BUILD_STATE
+  { KMP_BUILD_STATE(ctx, null); }
+# endif  
   while (read != write)
     {
       struct P(state) *s = fifo[read++], *t;
@@ -304,7 +307,7 @@ P(build) (struct P(context) *ctx)
         {
 	  if (!t)
 	    {
-	      s->back = &ctx->null;
+	      s->back = null;
 	      s->next = NULL;
 	      break;
 	    }
@@ -315,9 +318,9 @@ P(build) (struct P(context) *ctx)
 	      break;
 	    }
 	}
-#ifdef KMP_BUILD_STATE
+#     ifdef KMP_BUILD_STATE
       { KMP_BUILD_STATE(ctx, s); }
-#endif      
+#     endif      
     }
 }