X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fset.c;h=aaf93136bee611a485d18a521b6aaa854df78c82;hb=d960df9d3f91d209797047fca679027e365e8d02;hp=f567f29309aa87194e2718f7e49c231b78b28887;hpb=ead74d0c3b9d76204494553c61854812eb69bbc7;p=idzebra-moved-to-github.git

diff --git a/dfa/set.c b/dfa/set.c
index f567f29..aaf9313 100644
--- a/dfa/set.c
+++ b/dfa/set.c
@@ -1,10 +1,29 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: set.c,v $
- * Revision 1.1  1994-09-26 10:16:57  adam
+ * Revision 1.7  1999-05-26 07:49:12  adam
+ * C++ compilation.
+ *
+ * Revision 1.6  1999/02/02 14:50:13  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.5  1996/10/29 13:57:29  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.4  1995/09/04 12:33:27  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.3  1995/02/06  10:12:55  adam
+ * Unused static function rm_SetElement was removed.
+ *
+ * Revision 1.2  1995/01/24  16:00:22  adam
+ * Added -ansi to CFLAGS.
+ * Some changes to the dfa module.
+ *
+ * Revision 1.1  1994/09/26  10:16:57  adam
  * First version of dfa module in alex. This version uses yacc to parse
  * regular expressions. This should be hand-made instead.
  *
@@ -15,22 +34,20 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <util.h>
 #include <set.h>
 #include "imalloc.h"
 
 
-static void rm_SetElement (SetType st, SetElement *p);
 static Set mk_SetElement (SetType st, int n);
 
 SetType mk_SetType (int chunk)
 {
     SetType st;
 
-    assert( chunk > 8 && chunk < 8000 );
+    assert (chunk > 8 && chunk < 8000);
 
-    st = (SetType) imalloc( sizeof(*st) );
-    assert( st );
+    st = (SetType) imalloc (sizeof(*st));
+    assert (st);
 
     st->alloclist = st->freelist = NULL;
     st->used = 0;
@@ -41,29 +58,29 @@ SetType mk_SetType (int chunk)
 int inf_SetType (SetType st, long *used, long *allocated)
 {
     Set s;
-    assert( st );
+    assert (st);
     *used = st->used;
     *allocated = 0;
-    for( s = st->alloclist; s; s = s->next )
+    for (s = st->alloclist; s; s = s->next)
          *allocated += st->chunk;
-    return sizeof( SetElement );
+    return sizeof (SetElement);
 }
 
 SetType rm_SetType (SetType st)
 {
     Set s, s1;
-    for( s = st->alloclist; (s1 = s); )
+    for (s = st->alloclist; (s1 = s);)
     {
         s = s->next;
-        ifree( s1 );
+        ifree (s1);
     }
-    ifree( st );
+    ifree (st);
     return NULL;
 }
 
 Set mk_Set (SetType st)
 {
-    assert( st );
+    assert (st);
     return NULL;
 }
 
@@ -71,17 +88,17 @@ static Set mk_SetElement (SetType st, int n)
 {
     Set s;
     int i;
-    assert( st );
+    assert (st);
 
-    assert( st->chunk > 8 );
-    if( ! st->freelist )
+    assert (st->chunk > 8);
+    if (! st->freelist)
     {
-        s = (Set) imalloc( sizeof(*s) * (1+st->chunk) );
-        assert( s );
+        s = (Set) imalloc (sizeof(*s) * (1+st->chunk));
+        assert (s);
         s->next = st->alloclist;
         st->alloclist = s;
         st->freelist = ++s;
-        for( i=st->chunk; --i > 0; s++ )
+        for (i=st->chunk; --i > 0; s++)
             s->next = s+1;
         s->next = NULL;
     }
@@ -92,23 +109,25 @@ static Set mk_SetElement (SetType st, int n)
     return s;
 }
 
+#if 0
 static void rm_SetElement (SetType st, SetElement *p)
 {
-    assert( st );
-    assert( st->used > 0 );
+    assert (st);
+    assert (st->used > 0);
     p->next = st->freelist;
     st->freelist = p;
     st->used--;
 }
+#endif
 
 Set rm_Set (SetType st, Set s)
 {
     Set s1 = s;
     int i = 1;
 
-    if( s )
+    if (s)
     {
-        while( s->next )
+        while (s->next)
         {
             s = s->next;
             ++i;
@@ -116,7 +135,7 @@ Set rm_Set (SetType st, Set s)
         s->next = st->freelist;
         st->freelist = s1;
         st->used -= i;
-        assert( st->used >= 0 );
+        assert (st->used >= 0);
     }
     return NULL;
 }
@@ -124,16 +143,16 @@ Set rm_Set (SetType st, Set s)
 Set add_Set (SetType st, Set s, int n)
 {
     SetElement dummy;
-    Set p = &dummy, new;
+    Set p = &dummy, snew;
     p->next = s;
-    while( p->next && p->next->value < n )
+    while (p->next && p->next->value < n)
         p = p->next;
-    assert( p );
-    if( !(p->next && p->next->value == n ) )
+    assert (p);
+    if (!(p->next && p->next->value == n))
     {
-        new = mk_SetElement( st, n );
-        new->next = p->next;
-        p->next = new;
+        snew = mk_SetElement (st, n);
+        snew->next = p->next;
+        p->next = snew;
     }
     return dummy.next;
 }
@@ -142,17 +161,17 @@ Set union_Set (SetType st, Set s1, Set s2)
 {
     SetElement dummy;
     Set p;
-    assert( st );
+    assert (st);
 
-    for( p = &dummy; s1 && s2; )
-        if( s1->value < s2->value )
+    for (p = &dummy; s1 && s2;)
+        if (s1->value < s2->value)
         {
             p = p->next = s1;
             s1 = s1->next;
         }
-        else if( s1->value > s2->value )
+        else if (s1->value > s2->value)
         {
-            p = p->next = mk_SetElement( st, s2->value );
+            p = p->next = mk_SetElement (st, s2->value);
             s2 = s2->next;
         }
         else
@@ -161,13 +180,13 @@ Set union_Set (SetType st, Set s1, Set s2)
             s1 = s1->next;
             s2 = s2->next;
         }
-    if( s1 )
+    if (s1)
         p->next = s1;
     else
     {
-        while( s2 )
+        while (s2)
         {
-            p = p->next = mk_SetElement( st, s2->value );
+            p = p->next = mk_SetElement (st, s2->value);
             s2 = s2->next;
         }
         p->next = NULL;
@@ -177,36 +196,36 @@ Set union_Set (SetType st, Set s1, Set s2)
 
 Set cp_Set (SetType st, Set s)
 {
-    return merge_Set( st, s, NULL );
+    return merge_Set (st, s, NULL);
 }
 
 Set merge_Set (SetType st, Set s1, Set s2)
 {
     SetElement dummy;
     Set p;
-    assert( st );
-    for( p = &dummy; s1 && s2; p = p->next )
-        if( s1->value < s2->value )
+    assert (st);
+    for (p = &dummy; s1 && s2; p = p->next)
+        if (s1->value < s2->value)
         {
-            p->next = mk_SetElement( st, s1->value );
+            p->next = mk_SetElement (st, s1->value);
             s1 = s1->next;
         }
-        else if( s1->value > s2->value )
+        else if (s1->value > s2->value)
         {
-            p->next = mk_SetElement( st, s2->value );
+            p->next = mk_SetElement (st, s2->value);
             s2 = s2->next;
         }
         else
         {
-            p->next = mk_SetElement( st, s1->value );
+            p->next = mk_SetElement (st, s1->value);
             s1 = s1->next;
             s2 = s2->next;
         }
-    if( !s1 )
+    if (!s1)
         s1 = s2;
-    while( s1 )
+    while (s1)
     {
-        p = p->next = mk_SetElement( st, s1->value );
+        p = p->next = mk_SetElement (st, s1->value);
         s1 = s1->next;
     }
     p->next = NULL;
@@ -215,19 +234,19 @@ Set merge_Set (SetType st, Set s1, Set s2)
 
 void pr_Set (SetType st, Set s)
 {
-    assert( st );
-    while( s )
+    assert (st);
+    while (s)
     {
-        printf( " %d", s->value );
+        printf (" %d", s->value);
         s = s->next;
     }
-    putchar( '\n' );
+    putchar ('\n');
 }
 
 unsigned hash_Set (SetType st, Set s)
 {
     unsigned n = 0;
-    while( s )
+    while (s)
     {
         n += 11*s->value;
         s = s->next;
@@ -237,8 +256,8 @@ unsigned hash_Set (SetType st, Set s)
 
 int eq_Set (SetType st, Set s1, Set s2)
 {
-    for( ; s1 && s2; s1=s1->next, s2=s2->next )
-        if( s1->value != s2->value )
+    for (; s1 && s2; s1=s1->next, s2=s2->next)
+        if (s1->value != s2->value)
             return 0;
     return s1 == s2;
 }