X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dfa%2Fset.c;h=bcbcf9e079ea012a1dc40cc55576d03de7dee2d5;hp=3c3f83288a9aab60466212e29046b83b7d8dec92;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89

diff --git a/dfa/set.c b/dfa/set.c
index 3c3f832..bcbcf9e 100644
--- a/dfa/set.c
+++ b/dfa/set.c
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: set.c,v $
- * 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.
- *
- */
+/* $Id: set.c,v 1.11 2006-05-10 08:13:18 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 #include <stdio.h>
 #include <assert.h>
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <alexutil.h>
-#include <set.h>
+#include <dfaset.h>
 #include "imalloc.h"
 
+static DFASet mk_DFASetElement (DFASetType st, int n);
 
-static Set mk_SetElement (SetType st, int n);
-
-SetType mk_SetType (int chunk)
+DFASetType mk_DFASetType (int chunk)
 {
-    SetType st;
+    DFASetType st;
 
     assert (chunk > 8 && chunk < 8000);
 
-    st = (SetType) imalloc (sizeof(*st));
+    st = (DFASetType) imalloc (sizeof(*st));
     assert (st);
 
     st->alloclist = st->freelist = NULL;
@@ -47,20 +47,20 @@ SetType mk_SetType (int chunk)
     return st;
 }
 
-int inf_SetType (SetType st, long *used, long *allocated)
+int inf_DFASetType (DFASetType st, long *used, long *allocated)
 {
-    Set s;
+    DFASet s;
     assert (st);
     *used = st->used;
     *allocated = 0;
     for (s = st->alloclist; s; s = s->next)
          *allocated += st->chunk;
-    return sizeof (SetElement);
+    return sizeof (DFASetElement);
 }
 
-SetType rm_SetType (SetType st)
+DFASetType rm_DFASetType (DFASetType st)
 {
-    Set s, s1;
+    DFASet s, s1;
     for (s = st->alloclist; (s1 = s);)
     {
         s = s->next;
@@ -70,22 +70,22 @@ SetType rm_SetType (SetType st)
     return NULL;
 }
 
-Set mk_Set (SetType st)
+DFASet mk_DFASet (DFASetType st)
 {
     assert (st);
     return NULL;
 }
 
-static Set mk_SetElement (SetType st, int n)
+static DFASet mk_DFASetElement (DFASetType st, int n)
 {
-    Set s;
+    DFASet s;
     int i;
     assert (st);
 
     assert (st->chunk > 8);
     if (! st->freelist)
     {
-        s = (Set) imalloc (sizeof(*s) * (1+st->chunk));
+        s = (DFASet) imalloc (sizeof(*s) * (1+st->chunk));
         assert (s);
         s->next = st->alloclist;
         st->alloclist = s;
@@ -102,7 +102,7 @@ static Set mk_SetElement (SetType st, int n)
 }
 
 #if 0
-static void rm_SetElement (SetType st, SetElement *p)
+static void rm_DFASetElement (DFASetType st, DFASetElement *p)
 {
     assert (st);
     assert (st->used > 0);
@@ -112,9 +112,9 @@ static void rm_SetElement (SetType st, SetElement *p)
 }
 #endif
 
-Set rm_Set (SetType st, Set s)
+DFASet rm_DFASet (DFASetType st, DFASet s)
 {
-    Set s1 = s;
+    DFASet s1 = s;
     int i = 1;
 
     if (s)
@@ -132,27 +132,27 @@ Set rm_Set (SetType st, Set s)
     return NULL;
 }
 
-Set add_Set (SetType st, Set s, int n)
+DFASet add_DFASet (DFASetType st, DFASet s, int n)
 {
-    SetElement dummy;
-    Set p = &dummy, new;
+    DFASetElement dummy;
+    DFASet p = &dummy, snew;
     p->next = s;
     while (p->next && p->next->value < n)
         p = p->next;
     assert (p);
     if (!(p->next && p->next->value == n))
     {
-        new = mk_SetElement (st, n);
-        new->next = p->next;
-        p->next = new;
+        snew = mk_DFASetElement (st, n);
+        snew->next = p->next;
+        p->next = snew;
     }
     return dummy.next;
 }
 
-Set union_Set (SetType st, Set s1, Set s2)
+DFASet union_DFASet (DFASetType st, DFASet s1, DFASet s2)
 {
-    SetElement dummy;
-    Set p;
+    DFASetElement dummy;
+    DFASet p;
     assert (st);
 
     for (p = &dummy; s1 && s2;)
@@ -163,7 +163,7 @@ Set union_Set (SetType st, Set s1, Set s2)
         }
         else if (s1->value > s2->value)
         {
-            p = p->next = mk_SetElement (st, s2->value);
+            p = p->next = mk_DFASetElement (st, s2->value);
             s2 = s2->next;
         }
         else
@@ -178,7 +178,7 @@ Set union_Set (SetType st, Set s1, Set s2)
     {
         while (s2)
         {
-            p = p->next = mk_SetElement (st, s2->value);
+            p = p->next = mk_DFASetElement (st, s2->value);
             s2 = s2->next;
         }
         p->next = NULL;
@@ -186,30 +186,30 @@ Set union_Set (SetType st, Set s1, Set s2)
     return dummy.next;
 }
 
-Set cp_Set (SetType st, Set s)
+DFASet cp_DFASet (DFASetType st, DFASet s)
 {
-    return merge_Set (st, s, NULL);
+    return merge_DFASet (st, s, NULL);
 }
 
-Set merge_Set (SetType st, Set s1, Set s2)
+DFASet merge_DFASet (DFASetType st, DFASet s1, DFASet s2)
 {
-    SetElement dummy;
-    Set p;
+    DFASetElement dummy;
+    DFASet p;
     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_DFASetElement (st, s1->value);
             s1 = s1->next;
         }
         else if (s1->value > s2->value)
         {
-            p->next = mk_SetElement (st, s2->value);
+            p->next = mk_DFASetElement (st, s2->value);
             s2 = s2->next;
         }
         else
         {
-            p->next = mk_SetElement (st, s1->value);
+            p->next = mk_DFASetElement (st, s1->value);
             s1 = s1->next;
             s2 = s2->next;
         }
@@ -217,14 +217,14 @@ Set merge_Set (SetType st, Set s1, Set s2)
         s1 = s2;
     while (s1)
     {
-        p = p->next = mk_SetElement (st, s1->value);
+        p = p->next = mk_DFASetElement (st, s1->value);
         s1 = s1->next;
     }
     p->next = NULL;
     return dummy.next;
 }
 
-void pr_Set (SetType st, Set s)
+void pr_DFASet (DFASetType st, DFASet s)
 {
     assert (st);
     while (s)
@@ -235,7 +235,7 @@ void pr_Set (SetType st, Set s)
     putchar ('\n');
 }
 
-unsigned hash_Set (SetType st, Set s)
+unsigned hash_DFASet (DFASetType st, DFASet s)
 {
     unsigned n = 0;
     while (s)
@@ -246,10 +246,18 @@ unsigned hash_Set (SetType st, Set s)
     return n;
 }
 
-int eq_Set (SetType st, Set s1, Set s2)
+int eq_DFASet (DFASetType st, DFASet s1, DFASet s2)
 {
     for (; s1 && s2; s1=s1->next, s2=s2->next)
         if (s1->value != s2->value)
             return 0;
     return s1 == s2;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+