shithub: femtolisp

Info  •  Files  •  Log  •  Branches

fix table relocation

--- a/htable.h

+++ b/htable.h

@@ -3,11 +3,11 @@

 #define HT_N_INLINE 32

 typedef struct {

+	void **table;

 	uint32_t size;

 	// this is to skip over non-items in for-each

 	// FIXME(sigrid): in a multithreaded environment this isn't enough

 	uint32_t i;

-	void **table;

 	void *_space[HT_N_INLINE];

 }htable_t;

--- a/table.c

+++ b/table.c

@@ -50,13 +50,11 @@

 {

 	htable_t *oldh = cvalue_data(oldv);

 	htable_t *h = cvalue_data(newv);

-	if(oldh->table == &oldh->_space[0])

-		h->table = &h->_space[0];

-	size_t i;

+	h->table = oldh->table == &oldh->_space[0] ? &h->_space[0] : oldh->table;

 	h->i = oldh->i;

-	for(i = 0; i < h->size; i++){

-		if(h->table[i] != HT_NOTFOUND)

-			h->table[i] = (void*)relocate((value_t)h->table[i]);

+	for(size_t i = 0; i < h->size; i++){

+		if(oldh->table[i] != HT_NOTFOUND)

+			h->table[i] = (void*)relocate((value_t)oldh->table[i]);

 	}

 }