multiline comment and stuff

1 files changed, 23 insertions, 17 deletions

diff --git a/src/set.hff b/src/set.hff
index 28e67be..396d63c 100644
--- a/src/set.hff
+++ b/src/set.hff
@@ -1,32 +1,34 @@
 import "vec.hff";
 import "all.hff";
 
-// KTraits:
-//        :hash(K) u32
-//        :eq(T, T) bool
-//        :dup(T) T
+
+
+#!{ KTraits:
+       :hash(K) u32
+       :eq(T, T) bool
+       :dup(T) T }
 struct Set<T, Traits> {
    buf Vec<T>,
-   set **const T,
+   set *int,
    N int,
    count int,
 
    fn intern(self *Set, x T) *const T {
       if self.set == #null {
-         self.set = xcalloc(self.N = 16, sizeof *T);
+         self.set = xcalloc(self.N = 16, sizeof int);
       }
 
       if self.count == self.N / 2 {
          free(self.set);
-         self.set = xcalloc(self.N *= 2, sizeof *T);
+         self.set = xcalloc(self.N *= 2, sizeof int);
          vec_each(p, i, self.buf,
-            let i = Traits:hash(p) & (self.N - 1);
+            let j = Traits:hash(p) & (self.N - 1);
             for ;; {
-               if self.set[i] == #null {
-                  self.set[i] = &self.buf.dat[i];
+               if self.set[j] == 0 {
+                  self.set[j] = i + 1;
                   break;
                }
-               i = (i + 1) & (self.N - 1);
+               j = (j + 1) & (self.N - 1);
             }
          )
       }
@@ -34,12 +36,16 @@ struct Set<T, Traits> {
       let i0 u32 = Traits:hash(x) & (self.N - 1);
       let i int = i0;
       do {
-         if self.set[i] == #null {
+         if self.set[i] == 0 {
             ++self.count;
             self.buf->push(Traits:dup(x));
-            return self.set[i] = &self.buf.dat[self.buf.len - 1];
-         } else if Traits:eq(*self.set[i], x) {
-            return self.set[i];
+            self.set[i] = self.buf.len;
+            return self.buf->lastp();
+         } else {
+            let x2 = &self.buf.dat[self.set[i] - 1];
+            if Traits:eq(*x2, x) {
+               return x2;
+            }
          }
          i = (i + 1) & (self.N - 1);
       } while i != i0;
@@ -50,9 +56,9 @@ struct Set<T, Traits> {
       let i0 u32 = Traits:hash(x) & (self.N - 1);
       let i int = i0;
       do {
-         if self.set[i] == #null {
+         if self.set[i] == 0 {
             return #f;
-         } else if Traits:eq(*self.set[i], x) {
+         } else if Traits:eq(self.buf.dat[self.set[i] - 1], x) {
             return #t;
          }
          i = (i + 1) & (self.N - 1);