diff --git a/extlib/benz/codegen.c b/extlib/benz/codegen.c index 721505a8..ae3688d8 100644 --- a/extlib/benz/codegen.c +++ b/extlib/benz/codegen.c @@ -363,7 +363,7 @@ new_analyze_state(pic_state *pic) { analyze_state *state; pic_sym *sym; - xh_entry *it; + khiter_t it; state = pic_malloc(pic, sizeof(analyze_state)); state->pic = pic; diff --git a/extlib/benz/dict.c b/extlib/benz/dict.c index 41a4fea9..2e019f87 100644 --- a/extlib/benz/dict.c +++ b/extlib/benz/dict.c @@ -4,13 +4,15 @@ #include "picrin.h" +KHASH_DEFINE(dict, pic_sym *, pic_value, kh_ptr_hash_func, kh_ptr_hash_equal) + struct pic_dict * pic_make_dict(pic_state *pic) { struct pic_dict *dict; dict = (struct pic_dict *)pic_obj_alloc(pic, sizeof(struct pic_dict), PIC_TT_DICT); - xh_init_ptr(&dict->hash, sizeof(pic_value)); + kh_init(dict, &dict->hash); return dict; } @@ -18,41 +20,50 @@ pic_make_dict(pic_state *pic) pic_value pic_dict_ref(pic_state *pic, struct pic_dict *dict, pic_sym *key) { - xh_entry *e; + khash_t(dict) *h = &dict->hash; + khiter_t it; - e = xh_get_ptr(&dict->hash, key); - if (! e) { + it = kh_get(dict, h, key); + if (it == kh_end(h)) { pic_errorf(pic, "element not found for a key: ~s", pic_obj_value(key)); } - return xh_val(e, pic_value); + return kh_val(h, it); } void pic_dict_set(pic_state PIC_UNUSED(*pic), struct pic_dict *dict, pic_sym *key, pic_value val) { - xh_put_ptr(&dict->hash, key, &val); + khash_t(dict) *h = &dict->hash; + int ret; + khiter_t it; + + it = kh_put(dict, h, key, &ret); + kh_val(h, it) = val; } size_t pic_dict_size(pic_state PIC_UNUSED(*pic), struct pic_dict *dict) { - return dict->hash.count; + return kh_size(&dict->hash); } bool pic_dict_has(pic_state PIC_UNUSED(*pic), struct pic_dict *dict, pic_sym *key) { - return xh_get_ptr(&dict->hash, key) != NULL; + return kh_get(dict, &dict->hash, key) != kh_end(&dict->hash); } void pic_dict_del(pic_state *pic, struct pic_dict *dict, pic_sym *key) { - if (xh_get_ptr(&dict->hash, key) == NULL) { + khash_t(dict) *h = &dict->hash; + khiter_t it; + + it = kh_get(dict, h, key); + if (it == kh_end(h)) { pic_errorf(pic, "no slot named ~s found in dictionary", pic_obj_value(key)); } - - xh_del_ptr(&dict->hash, key); + kh_del(dict, h, it); } static pic_value @@ -146,43 +157,41 @@ pic_dict_dictionary_map(pic_state *pic) struct pic_proc *proc; size_t argc, i; pic_value *args; - pic_value arg, ret; - xh_entry **it; + pic_value arg_list, ret = pic_nil_value(); pic_get_args(pic, "l*", &proc, &argc, &args); - it = pic_malloc(pic, argc * sizeof(xh_entry)); - for (i = 0; i < argc; ++i) { - if (! pic_dict_p(args[i])) { - pic_free(pic, it); - pic_errorf(pic, "expected dict, but got %s", pic_type_repr(pic_type(args[i]))); - } - it[i] = xh_begin(&pic_dict_ptr(args[i])->hash); - } + if (argc != 0) { + khiter_t it[argc]; + khash_t(dict) *kh[argc]; + + for (i = 0; i < argc; ++i) { + if (! pic_dict_p(args[i])) { + pic_errorf(pic, "expected dict, but got %s", pic_type_repr(pic_type(args[i]))); + } + kh[i] = &pic_dict_ptr(args[i])->hash; + it[i] = kh_begin(kh[i]); + } - pic_try { - ret = pic_nil_value(); do { - arg = pic_nil_value(); + arg_list = pic_nil_value(); for (i = 0; i < argc; ++i) { - if (it[i] == NULL) { + while (it[i] != kh_end(kh[i])) { /* find next available */ + if (kh_exist(kh[i], it[i])) + break; + it[i]++; + } + if (it[i] == kh_end(kh[i])) { break; } - pic_push(pic, pic_obj_value(xh_key(it[i], pic_sym *)), arg); - it[i] = xh_next(it[i]); + pic_push(pic, pic_obj_value(kh_key(kh[i], it[i]++)), arg_list); } if (i != argc) { break; } - pic_push(pic, pic_apply(pic, proc, pic_reverse(pic, arg)), ret); + pic_push(pic, pic_apply(pic, proc, pic_reverse(pic, arg_list)), ret); } while (1); } - pic_catch { - pic_free(pic, it); - pic_raise(pic, pic->err); - } - - pic_free(pic, it); return pic_reverse(pic, ret); } @@ -193,42 +202,41 @@ pic_dict_dictionary_for_each(pic_state *pic) struct pic_proc *proc; size_t argc, i; pic_value *args; - pic_value arg; - xh_entry **it; + pic_value arg_list; pic_get_args(pic, "l*", &proc, &argc, &args); - it = pic_malloc(pic, argc * sizeof(xh_entry)); - for (i = 0; i < argc; ++i) { - if (! pic_dict_p(args[i])) { - pic_free(pic, it); - pic_errorf(pic, "expected dict, but got %s", pic_type_repr(pic_type(args[i]))); - } - it[i] = xh_begin(&pic_dict_ptr(args[i])->hash); - } + if (argc != 0) { + khiter_t it[argc]; + khash_t(dict) *kh[argc]; + + for (i = 0; i < argc; ++i) { + if (! pic_dict_p(args[i])) { + pic_errorf(pic, "expected dict, but got %s", pic_type_repr(pic_type(args[i]))); + } + kh[i] = &pic_dict_ptr(args[i])->hash; + it[i] = kh_begin(kh[i]); + } - pic_try { do { - arg = pic_nil_value(); + arg_list = pic_nil_value(); for (i = 0; i < argc; ++i) { - if (it[i] == NULL) { + while (it[i] != kh_end(kh[i])) { /* find next available */ + if (kh_exist(kh[i], it[i])) + break; + it[i]++; + } + if (it[i] == kh_end(kh[i])) { break; } - pic_push(pic, pic_obj_value(xh_key(it[i], pic_sym *)), arg); - it[i] = xh_next(it[i]); + pic_push(pic, pic_obj_value(kh_key(kh[i], it[i]++)), arg_list); } if (i != argc) { break; } - pic_void(pic_apply(pic, proc, pic_reverse(pic, arg))); + pic_void(pic_apply(pic, proc, pic_reverse(pic, arg_list))); } while (1); } - pic_catch { - pic_free(pic, it); - pic_raise(pic, pic->err); - } - - pic_free(pic, it); return pic_undef_value(); } @@ -239,7 +247,7 @@ pic_dict_dictionary_to_alist(pic_state *pic) struct pic_dict *dict; pic_value item, alist = pic_nil_value(); pic_sym *sym; - xh_entry *it; + khiter_t it; pic_get_args(pic, "d", &dict); @@ -275,7 +283,7 @@ pic_dict_dictionary_to_plist(pic_state *pic) struct pic_dict *dict; pic_value plist = pic_nil_value(); pic_sym *sym; - xh_entry *it; + khiter_t it; pic_get_args(pic, "d", &dict); diff --git a/extlib/benz/gc.c b/extlib/benz/gc.c index adf449ec..db86c873 100644 --- a/extlib/benz/gc.c +++ b/extlib/benz/gc.c @@ -452,7 +452,7 @@ gc_mark_object(pic_state *pic, struct pic_object *obj) case PIC_TT_DICT: { struct pic_dict *dict = (struct pic_dict *)obj; pic_sym *sym; - xh_entry *it; + khiter_t it; pic_dict_for_each (sym, dict, it) { gc_mark_object(pic, (struct pic_object *)sym); @@ -707,7 +707,7 @@ gc_finalize_object(pic_state *pic, struct pic_object *obj) } case PIC_TT_DICT: { struct pic_dict *dict = (struct pic_dict *)obj; - xh_destroy(&dict->hash); + kh_destroy(dict, &dict->hash); break; } case PIC_TT_RECORD: { diff --git a/extlib/benz/include/picrin.h b/extlib/benz/include/picrin.h index 54c8bf14..ef164f3a 100644 --- a/extlib/benz/include/picrin.h +++ b/extlib/benz/include/picrin.h @@ -36,6 +36,7 @@ extern "C" { #include "picrin/compat.h" #include "picrin/kvec.h" +#include "picrin/khash.h" #include "picrin/xhash.h" #include "picrin/value.h" diff --git a/extlib/benz/include/picrin/dict.h b/extlib/benz/include/picrin/dict.h index 4a3bd7ce..8b53dba4 100644 --- a/extlib/benz/include/picrin/dict.h +++ b/extlib/benz/include/picrin/dict.h @@ -9,9 +9,11 @@ extern "C" { #endif +KHASH_DECLARE(dict, pic_sym *, pic_value) + struct pic_dict { PIC_OBJECT_HEADER - xhash hash; + khash_t(dict) hash; }; #define pic_dict_p(v) (pic_type(v) == PIC_TT_DICT) @@ -19,9 +21,11 @@ struct pic_dict { struct pic_dict *pic_make_dict(pic_state *); -#define pic_dict_for_each(sym, dict, it) \ - for (it = xh_begin(&(dict)->hash); it != NULL; it = xh_next(it)) \ - if ((sym = xh_key(it, pic_sym *)), true) +#define pic_dict_for_each(sym, dict, it) \ + pic_dict_for_each_help(sym, (&dict->hash), it) +#define pic_dict_for_each_help(sym, h, it) \ + for (it = kh_begin(h); it != kh_end(h); ++it) \ + if ((sym = kh_key(h, it)), kh_exist(h, it)) pic_value pic_dict_ref(pic_state *, struct pic_dict *, pic_sym *); void pic_dict_set(pic_state *, struct pic_dict *, pic_sym *, pic_value); diff --git a/extlib/benz/include/picrin/khash.h b/extlib/benz/include/picrin/khash.h new file mode 100644 index 00000000..b5416f1d --- /dev/null +++ b/extlib/benz/include/picrin/khash.h @@ -0,0 +1,304 @@ +/* The MIT License + + Copyright (c) 2015 by Yuichi Nishiwaki + Copyright (c) 2008, 2009, 2011 by Attractive Chaos + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef AC_KHASH_H +#define AC_KHASH_H + +#include +#include + +/* compiler specific configuration */ + +#if UINT_MAX == 0xffffffffu +typedef unsigned int khint32_t; +#elif ULONG_MAX == 0xffffffffu +typedef unsigned long khint32_t; +#endif + +#if ULONG_MAX == ULLONG_MAX +typedef unsigned long khint64_t; +#else +typedef unsigned long long khint64_t; +#endif + +typedef khint32_t khint_t; +typedef khint_t khiter_t; + +#define __ac_isempty(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&2) +#define __ac_isdel(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&1) +#define __ac_iseither(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&3) +#define __ac_set_isdel_false(flag, i) (flag[i>>4]&=~(1ul<<((i&0xfU)<<1))) +#define __ac_set_isempty_false(flag, i) (flag[i>>4]&=~(2ul<<((i&0xfU)<<1))) +#define __ac_set_isboth_false(flag, i) (flag[i>>4]&=~(3ul<<((i&0xfU)<<1))) +#define __ac_set_isdel_true(flag, i) (flag[i>>4]|=1ul<<((i&0xfU)<<1)) + +#define __ac_fsize(m) ((m) < 16? 1 : (m)>>4) + +#ifndef kroundup32 +#define kroundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x)) +#endif + +#ifndef kcalloc +#define kcalloc(N,Z) calloc(N,Z) +#endif +#ifndef kmalloc +#define kmalloc(Z) malloc(Z) +#endif +#ifndef krealloc +#define krealloc(P,Z) realloc(P,Z) +#endif +#ifndef kfree +#define kfree(P) free(P) +#endif + +static const double __ac_HASH_UPPER = 0.77; + +#define KHASH_DECLARE(name, khkey_t, khval_t) \ + typedef struct { \ + khint_t n_buckets, size, n_occupied, upper_bound; \ + khint32_t *flags; \ + khkey_t *keys; \ + khval_t *vals; \ + } kh_##name##_t; \ + void kh_init_##name(kh_##name##_t *h); \ + void kh_destroy_##name(kh_##name##_t *h); \ + void kh_clear_##name(kh_##name##_t *h); \ + khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \ + int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \ + khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \ + void kh_del_##name(kh_##name##_t *h, khint_t x); + +#define KHASH_DEFINE(name, khkey_t, khval_t, __hash_func, __hash_equal) \ + KHASH_DEFINE2(name, khkey_t, khval_t, 1, __hash_func, __hash_equal) +#define KHASH_DEFINE2(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \ + void kh_init_##name(kh_##name##_t *h) { \ + memset(h, 0, sizeof(kh_##name##_t)); \ + } \ + void kh_destroy_##name(kh_##name##_t *h) \ + { \ + kfree((void *)h->keys); kfree(h->flags); \ + kfree((void *)h->vals); \ + } \ + void kh_clear_##name(kh_##name##_t *h) \ + { \ + if (h->flags) { \ + memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \ + h->size = h->n_occupied = 0; \ + } \ + } \ + khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) \ + { \ + if (h->n_buckets) { \ + khint_t k, i, last, mask, step = 0; \ + mask = h->n_buckets - 1; \ + k = __hash_func(key); i = k & mask; \ + last = i; \ + while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \ + i = (i + (++step)) & mask; \ + if (i == last) return h->n_buckets; \ + } \ + return __ac_iseither(h->flags, i)? h->n_buckets : i; \ + } else return 0; \ + } \ + int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \ + { /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \ + khint32_t *new_flags = 0; \ + khint_t j = 1; \ + { \ + kroundup32(new_n_buckets); \ + if (new_n_buckets < 4) new_n_buckets = 4; \ + if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0; /* requested size is too small */ \ + else { /* hash table size to be changed (shrink or expand); rehash */ \ + new_flags = (khint32_t*)kmalloc(__ac_fsize(new_n_buckets) * sizeof(khint32_t)); \ + if (!new_flags) return -1; \ + memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \ + if (h->n_buckets < new_n_buckets) { /* expand */ \ + khkey_t *new_keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \ + if (!new_keys) { kfree(new_flags); return -1; } \ + h->keys = new_keys; \ + if (kh_is_map) { \ + khval_t *new_vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \ + if (!new_vals) { kfree(new_flags); return -1; } \ + h->vals = new_vals; \ + } \ + } /* otherwise shrink */ \ + } \ + } \ + if (j) { /* rehashing is needed */ \ + for (j = 0; j != h->n_buckets; ++j) { \ + if (__ac_iseither(h->flags, j) == 0) { \ + khkey_t key = h->keys[j]; \ + khval_t val; \ + khint_t new_mask; \ + new_mask = new_n_buckets - 1; \ + if (kh_is_map) val = h->vals[j]; \ + __ac_set_isdel_true(h->flags, j); \ + while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \ + khint_t k, i, step = 0; \ + k = __hash_func(key); \ + i = k & new_mask; \ + while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \ + __ac_set_isempty_false(new_flags, i); \ + if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \ + { khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \ + if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \ + __ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \ + } else { /* write the element and jump out of the loop */ \ + h->keys[i] = key; \ + if (kh_is_map) h->vals[i] = val; \ + break; \ + } \ + } \ + } \ + } \ + if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \ + h->keys = (khkey_t*)krealloc((void *)h->keys, new_n_buckets * sizeof(khkey_t)); \ + if (kh_is_map) h->vals = (khval_t*)krealloc((void *)h->vals, new_n_buckets * sizeof(khval_t)); \ + } \ + kfree(h->flags); /* free the working space */ \ + h->flags = new_flags; \ + h->n_buckets = new_n_buckets; \ + h->n_occupied = h->size; \ + h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \ + } \ + return 0; \ + } \ + khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \ + { \ + khint_t x; \ + if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \ + if (h->n_buckets > (h->size<<1)) { \ + if (kh_resize_##name(h, h->n_buckets - 1) < 0) { /* clear "deleted" elements */ \ + *ret = -1; return h->n_buckets; \ + } \ + } else if (kh_resize_##name(h, h->n_buckets + 1) < 0) { /* expand the hash table */ \ + *ret = -1; return h->n_buckets; \ + } \ + } /* TODO: to implement automatically shrinking; resize() already support shrinking */ \ + { \ + khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \ + x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \ + if (__ac_isempty(h->flags, i)) x = i; /* for speed up */ \ + else { \ + last = i; \ + while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \ + if (__ac_isdel(h->flags, i)) site = i; \ + i = (i + (++step)) & mask; \ + if (i == last) { x = site; break; } \ + } \ + if (x == h->n_buckets) { \ + if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \ + else x = i; \ + } \ + } \ + } \ + if (__ac_isempty(h->flags, x)) { /* not present at all */ \ + h->keys[x] = key; \ + __ac_set_isboth_false(h->flags, x); \ + ++h->size; ++h->n_occupied; \ + *ret = 1; \ + } else if (__ac_isdel(h->flags, x)) { /* deleted */ \ + h->keys[x] = key; \ + __ac_set_isboth_false(h->flags, x); \ + ++h->size; \ + *ret = 2; \ + } else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \ + return x; \ + } \ + void kh_del_##name(kh_##name##_t *h, khint_t x) \ + { \ + if (x != h->n_buckets && !__ac_iseither(h->flags, x)) { \ + __ac_set_isdel_true(h->flags, x); \ + --h->size; \ + } \ + } + +/* --- BEGIN OF HASH FUNCTIONS --- */ + +#define kh_ptr_hash_func(key) (khint32_t)(long)(key) +#define kh_ptr_hash_equal(a, b) ((a) == (b)) +#define kh_int_hash_func(key) (khint32_t)(key) +#define kh_int_hash_equal(a, b) ((a) == (b)) +#define kh_int64_hash_func(key) (khint32_t)((key)>>33^(key)^(key)<<11) +#define kh_int64_hash_equal(a, b) ((a) == (b)) +PIC_INLINE khint_t __ac_X31_hash_string(const char *s) +{ + khint_t h = (khint_t)*s; + if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)*s; + return h; +} +#define kh_str_hash_func(key) __ac_X31_hash_string(key) +#define kh_str_hash_equal(a, b) (strcmp(a, b) == 0) + +PIC_INLINE khint_t __ac_Wang_hash(khint_t key) +{ + key += ~(key << 15); + key ^= (key >> 10); + key += (key << 3); + key ^= (key >> 6); + key += ~(key << 11); + key ^= (key >> 16); + return key; +} +#define kh_int_hash_func2(k) __ac_Wang_hash((khint_t)key) + +/* --- END OF HASH FUNCTIONS --- */ + +/* Other convenient macros... */ + +#define khash_t(name) kh_##name##_t +#define kh_init(name, h) kh_init_##name(h) +#define kh_destroy(name, h) kh_destroy_##name(h) +#define kh_clear(name, h) kh_clear_##name(h) +#define kh_resize(name, h, s) kh_resize_##name(h, s) +#define kh_put(name, h, k, r) kh_put_##name(h, k, r) +#define kh_get(name, h, k) kh_get_##name(h, k) +#define kh_del(name, h, k) kh_del_##name(h, k) + +#define kh_exist(h, x) (!__ac_iseither((h)->flags, (x))) +#define kh_key(h, x) ((h)->keys[x]) +#define kh_val(h, x) ((h)->vals[x]) +#define kh_value(h, x) ((h)->vals[x]) +#define kh_begin(h) (khint_t)(0) +#define kh_end(h) ((h)->n_buckets) +#define kh_size(h) ((h)->size) +#define kh_n_buckets(h) ((h)->n_buckets) + +#define kh_foreach(h, kvar, vvar, code) { khint_t __i; \ + for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \ + if (!kh_exist(h,__i)) continue; \ + (kvar) = kh_key(h,__i); \ + (vvar) = kh_val(h,__i); \ + code; \ + } } +#define kh_foreach_value(h, vvar, code) { khint_t __i; \ + for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \ + if (!kh_exist(h,__i)) continue; \ + (vvar) = kh_val(h,__i); \ + code; \ + } } + +#endif /* AC_KHASH_H */ diff --git a/extlib/benz/lib.c b/extlib/benz/lib.c index 227eea7f..53cf51d6 100644 --- a/extlib/benz/lib.c +++ b/extlib/benz/lib.c @@ -58,7 +58,7 @@ void pic_import(pic_state *pic, struct pic_lib *lib) { pic_sym *name, *realname, *uid; - xh_entry *it; + khiter_t it; pic_dict_for_each (name, lib->exports, it) { realname = pic_sym_ptr(pic_dict_ref(pic, lib->exports, name)); @@ -173,7 +173,7 @@ pic_lib_library_exports(pic_state *pic) { pic_value lib, exports = pic_nil_value(); pic_sym *sym; - xh_entry *it; + khiter_t it; pic_get_args(pic, "o", &lib); diff --git a/extlib/benz/write.c b/extlib/benz/write.c index c5ba08bb..39bc4058 100644 --- a/extlib/benz/write.c +++ b/extlib/benz/write.c @@ -170,7 +170,8 @@ write_core(struct writer_control *p, pic_value obj) xFILE *file = p->file; size_t i; pic_sym *sym; - xh_entry *e, *it; + xh_entry *e; + khiter_t it; int c; #if PIC_ENABLE_FLOAT double f;