summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mruby/khash.h57
-rw-r--r--include/mruby/proc.h3
-rw-r--r--include/mruby/variable.h7
-rw-r--r--src/class.c9
-rw-r--r--src/hash.c3
-rw-r--r--src/kernel.c40
-rw-r--r--src/symbol.c3
-rw-r--r--src/variable.c49
8 files changed, 99 insertions, 72 deletions
diff --git a/include/mruby/khash.h b/include/mruby/khash.h
index 22df48ebb..e236f0bea 100644
--- a/include/mruby/khash.h
+++ b/include/mruby/khash.h
@@ -32,16 +32,14 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
#define __ac_iseither(e_flag, d_flag, i) (__ac_isempty(e_flag,d_flag,i)||__ac_isdel(e_flag,d_flag,i))
-/* struct kh_xxx
+/* declare struct kh_xxx and kh_xxx_funcs
name: ash name
khkey_t: key data type
khval_t: value data type
kh_is_map: (not implemented / not used in RiteVM )
- __hash_func: hash function
- __hash_equal: hash comparation function
*/
-#define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+#define KHASH_DECLARE(name, khkey_t, khval_t, kh_is_map) \
typedef struct kh_##name { \
khint_t n_buckets; \
khint_t size; \
@@ -55,7 +53,26 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
khint_t inc; \
mrb_state *mrb; \
} kh_##name##_t; \
- static void kh_alloc_##name(kh_##name##_t *h) \
+ void kh_alloc_##name(kh_##name##_t *h); \
+ kh_##name##_t *kh_init_##name(mrb_state *mrb); \
+ void kh_destroy_##name(kh_##name##_t *h); \
+ void kh_clear_##name(kh_##name##_t *h); \
+ khint_t kh_get_##name(kh_##name##_t *h, khkey_t key); \
+ khint_t kh_put_##name(kh_##name##_t *h, khkey_t key); \
+ void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+ void kh_del_##name(kh_##name##_t *h, khint_t x); \
+
+/* define kh_xxx_funcs
+
+ name: ash name
+ khkey_t: key data type
+ khval_t: value data type
+ kh_is_map: (not implemented / not used in RiteVM )
+ __hash_func: hash function
+ __hash_equal: hash comparation function
+*/
+#define KHASH_DEFINE(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
+ void kh_alloc_##name(kh_##name##_t *h) \
{ \
khint_t sz = h->n_buckets; \
h->size = h->n_occupied = 0; \
@@ -69,14 +86,14 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
h->mask = sz-1; \
h->inc = sz/2-1; \
} \
- static inline kh_##name##_t *kh_init_##name(mrb_state *mrb){ \
+ kh_##name##_t *kh_init_##name(mrb_state *mrb){ \
kh_##name##_t *h = (kh_##name##_t*)mrb_calloc(mrb, 1, sizeof(kh_##name##_t)); \
h->n_buckets = INITIAL_HASH_SIZE; \
h->mrb = mrb; \
kh_alloc_##name(h); \
return h; \
} \
- static inline void kh_destroy_##name(kh_##name##_t *h) \
+ void kh_destroy_##name(kh_##name##_t *h) \
{ \
if( h ){ \
mrb_free(h->mrb, h->keys); \
@@ -85,7 +102,7 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
mrb_free(h->mrb, h); \
} \
} \
- static inline void kh_clear_##name(kh_##name##_t *h) \
+ void kh_clear_##name(kh_##name##_t *h) \
{ \
if( h && h->e_flags ){ \
memset(h->e_flags, 0xff, h->n_buckets/8*sizeof(uint8_t)); \
@@ -93,7 +110,7 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
h->size = h->n_occupied = 0; \
} \
} \
- static inline khint_t kh_get_##name(kh_##name##_t *h, khkey_t key) \
+ khint_t kh_get_##name(kh_##name##_t *h, khkey_t key) \
{ \
khint_t k = __hash_func(h->mrb,key) & (h->mask); \
while( !__ac_isempty(h->e_flags, h->d_flags, k) ){ \
@@ -104,8 +121,7 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
} \
return h->n_buckets; \
} \
- static inline khint_t kh_put_##name(kh_##name##_t *h, khkey_t key); \
- static void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+ void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
{ \
if( new_n_buckets<INITIAL_HASH_SIZE ){ \
new_n_buckets = INITIAL_HASH_SIZE; \
@@ -114,7 +130,7 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
new_n_buckets = INITIAL_HASH_SIZE; \
while( new_n_buckets < limit ) new_n_buckets *= 2; \
} \
- { \
+ { \
uint8_t *old_e_flags = h->e_flags; \
khkey_t *old_keys = h->keys; \
khval_t *old_vals = h->vals; \
@@ -124,17 +140,17 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
kh_alloc_##name(h); \
/* relocate */ \
for( i=0 ; i<old_n_buckets ; i++ ){ \
- if( !__ac_isempty(old_e_flags, old_d_flags, i) ){ \
- khint_t k = kh_put_##name(h, old_keys[i]); \
- kh_value(h,k) = old_vals[i]; \
- } \
+ if( !__ac_isempty(old_e_flags, old_d_flags, i) ){ \
+ khint_t k = kh_put_##name(h, old_keys[i]); \
+ kh_value(h,k) = old_vals[i]; \
+ } \
} \
mrb_free(h->mrb, old_e_flags); \
mrb_free(h->mrb, old_keys); \
mrb_free(h->mrb, old_vals); \
} \
} \
- static inline khint_t kh_put_##name(kh_##name##_t *h, khkey_t key) \
+ khint_t kh_put_##name(kh_##name##_t *h, khkey_t key) \
{ \
khint_t k; \
if( h->n_occupied >= h->upper_bound ){ \
@@ -159,12 +175,13 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
} \
return k; \
} \
- static inline void kh_del_##name(kh_##name##_t *h, khint_t x) \
+ void kh_del_##name(kh_##name##_t *h, khint_t x) \
{ \
h->d_flags[x/8] |= __m[x%8]; \
h->size--; \
}
+
#define khash_t(name) kh_##name##_t
#define kh_init(name,mrb) kh_init_##name(mrb)
@@ -197,11 +214,7 @@ static inline khint_t __ac_X31_hash_string(const char *s)
#define kh_str_hash_func(mrb,key) __ac_X31_hash_string(key)
#define kh_str_hash_equal(mrb,a, b) (strcmp(a, b) == 0)
-#define KHASH_MAP_INIT_INT(name, khval_t) \
- KHASH_INIT(name, uint32_t, khval_t, 1, kh_int_hash_func, kh_int_hash_equal)
typedef const char *kh_cstr_t;
-#define KHASH_MAP_INIT_STR(name, khval_t) \
- KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal)
#if defined(__cplusplus)
} /* extern "C" { */
diff --git a/include/mruby/proc.h b/include/mruby/proc.h
index 52dc5a98e..8f178790e 100644
--- a/include/mruby/proc.h
+++ b/include/mruby/proc.h
@@ -50,6 +50,9 @@ struct RProc *mrb_proc_new(mrb_state*, mrb_irep*);
struct RProc *mrb_proc_new_cfunc(mrb_state*, mrb_func_t);
struct RProc *mrb_closure_new(mrb_state*, mrb_irep*);
+#include "mruby/khash.h"
+KHASH_DECLARE(mt, mrb_sym, struct RProc*, 1);
+
#if defined(__cplusplus)
} /* extern "C" { */
#endif
diff --git a/include/mruby/variable.h b/include/mruby/variable.h
index fb686fd47..440c4cc8b 100644
--- a/include/mruby/variable.h
+++ b/include/mruby/variable.h
@@ -20,6 +20,7 @@ typedef struct global_variable {
//int block_trace;
//struct trace_var *trace;
} global_variable;
+
struct global_entry {
global_variable *var;
mrb_sym id;
@@ -41,7 +42,8 @@ mrb_value mrb_obj_iv_get(mrb_state*, struct RObject*, mrb_sym);
void mrb_obj_iv_set(mrb_state*, struct RObject*, mrb_sym, mrb_value);
const char * mrb_class2name(mrb_state *mrb, struct RClass* klass);
mrb_value mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym);
-void mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v); /* mrb_iv_set */
+void mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v);
+mrb_value mrb_iv_remove(mrb_state *mrb, mrb_value obj, mrb_sym sym);
void mrb_copy_generic_ivar(mrb_value clone, mrb_value obj);
int mrb_const_defined_at(mrb_state *mrb, struct RClass *klass, mrb_sym id);
mrb_value mrb_f_global_variables(mrb_state *mrb, mrb_value self);
@@ -55,6 +57,9 @@ void mrb_gc_mark_iv(mrb_state*, struct RObject*);
size_t mrb_gc_mark_iv_size(mrb_state*, struct RObject*);
void mrb_gc_free_iv(mrb_state*, struct RObject*);
+#include "mruby/khash.h"
+KHASH_DECLARE(iv, mrb_sym, mrb_value, 1)
+
#if defined(__cplusplus)
} /* extern "C" { */
#endif
diff --git a/src/class.c b/src/class.c
index 3445b1692..56ab8c06f 100644
--- a/src/class.c
+++ b/src/class.c
@@ -15,10 +15,8 @@
#include "mruby/array.h"
#include "error.h"
-#include "mruby/khash.h"
-
-KHASH_INIT(mt, mrb_sym, struct RProc*, 1, kh_int_hash_func, kh_int_hash_equal)
-KHASH_INIT(iv, mrb_sym, mrb_value, 1, kh_int_hash_func, kh_int_hash_equal)
+KHASH_DEFINE(iv, mrb_sym, mrb_value, 1, kh_int_hash_func, kh_int_hash_equal);
+KHASH_DEFINE(mt, mrb_sym, struct RProc*, 1, kh_int_hash_func, kh_int_hash_equal);
typedef struct fc_result {
mrb_sym name;
@@ -28,9 +26,6 @@ typedef struct fc_result {
struct fc_result *prev;
} fcresult_t;
-int kiv_lookup(khash_t(iv) *table, mrb_sym key, mrb_value *value);
-extern struct kh_iv *mrb_class_tbl;
-
void
mrb_gc_mark_mt(mrb_state *mrb, struct RClass *c)
{
diff --git a/src/hash.c b/src/hash.c
index fe5336dc1..08f906800 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -31,7 +31,8 @@ mrb_hash_ht_hash_equal(mrb_state *mrb, mrb_value a, mrb_value b)
return mrb_eql(mrb, a, b);
}
-KHASH_INIT(ht, mrb_value, mrb_value, 1, mrb_hash_ht_hash_func, mrb_hash_ht_hash_equal);
+KHASH_DECLARE(ht, mrb_value, mrb_value, 1);
+KHASH_DEFINE (ht, mrb_value, mrb_value, 1, mrb_hash_ht_hash_func, mrb_hash_ht_hash_equal);
static void mrb_hash_modify(mrb_state *mrb, mrb_value hash);
diff --git a/src/kernel.c b/src/kernel.c
index 209eaa91d..fd0440e05 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -10,14 +10,12 @@
#include <stdio.h>
#include <stdlib.h>
#include "mruby/proc.h"
-
#include "mruby/range.h"
#include "mruby/array.h"
#include "mruby/hash.h"
#include "mruby/class.h"
#include "mruby/struct.h"
#include "mruby/variable.h"
-#include "mruby/khash.h"
#include "error.h"
typedef enum {
@@ -34,9 +32,6 @@ typedef enum {
NOEX_RESPONDS = 0x80
} mrb_method_flag_t;
-KHASH_INIT(mt, mrb_sym, struct RProc*, 1, kh_int_hash_func, kh_int_hash_equal)
-KHASH_INIT(iv, mrb_sym, mrb_value, 1, kh_int_hash_func, kh_int_hash_equal)
-
struct obj_ivar_tag {
mrb_value obj;
int (*func)(mrb_sym key, mrb_value val, void * arg);
@@ -1060,39 +1055,14 @@ mrb_value
mrb_obj_remove_instance_variable(mrb_state *mrb, mrb_value self)
{
mrb_sym sym;
- mrb_value name;
- khash_t(iv) *h;
- khiter_t k;
mrb_value val;
- mrb_value Qundef = mrb_undef_value();
- mrb_get_args(mrb, "o", &name);
- sym = mrb_to_id(mrb, name);
- //if (OBJ_FROZEN(obj)) mrb_error_frozen("object");
- //if (!mrb_is_instance_id(id)) {
- // mrb_name_error(mrb, id, "`%s' is not allowed as an instance variable name", mrb_sym2name(mrb, id));
- //}
- switch (mrb_type(self)) {
- case MRB_TT_OBJECT:
- case MRB_TT_CLASS:
- case MRB_TT_MODULE:
- if (!mrb_obj_ptr(self)->iv) break;
- h = mrb_obj_ptr(self)->iv;
- if (!h) break;
- k = kh_get(iv, h, sym);
- if (k != kh_end(h)) {
- val = kh_value(h, k);
- if (!mrb_obj_equal(mrb, val, Qundef)) {
- kh_value(h, k) = Qundef;
- return val;
- }
- }
- break;
- default:
- break;
+ mrb_get_args(mrb, "n", &sym);
+ val = mrb_iv_remove(mrb, self, sym);
+ if (UNDEF_P(val)) {
+ mrb_name_error(mrb, sym, "instance variable %s not defined", mrb_sym2name(mrb, sym));
}
- mrb_name_error(mrb, sym, "instance variable %s not defined", mrb_sym2name(mrb, sym));
- return mrb_nil_value(); /* not reached */
+ return val;
}
static inline int
diff --git a/src/symbol.c b/src/symbol.c
index b80174e7b..d2ae09655 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -36,7 +36,8 @@ sym_hash_func(mrb_state *mrb, const symbol_name s)
}
#define sym_hash_equal(mrb,a, b) (a.len == b.len && memcmp(a.name, b.name, a.len) == 0)
-KHASH_INIT(n2s, symbol_name, mrb_sym, 1, sym_hash_func, sym_hash_equal)
+KHASH_DECLARE(n2s, symbol_name, mrb_sym, 1)
+KHASH_DEFINE (n2s, symbol_name, mrb_sym, 1, sym_hash_func, sym_hash_equal)
/* ------------------------------------------------------ */
mrb_sym
mrb_intern2(mrb_state *mrb, const char *name, int len)
diff --git a/src/variable.c b/src/variable.c
index b11143b02..051c971d6 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -19,8 +19,6 @@
#include "st.h"
#endif
-KHASH_INIT(iv, mrb_sym, mrb_value, 1, kh_int_hash_func, kh_int_hash_equal)
-
static void
mark_tbl(mrb_state *mrb, struct kh_iv *h)
{
@@ -96,10 +94,28 @@ mrb_obj_iv_get(mrb_state *mrb, struct RObject *obj, mrb_sym sym)
return ivget(mrb, obj->iv, sym);
}
+static int
+obj_iv_p(mrb_value obj)
+{
+ switch (mrb_type(obj)) {
+ case MRB_TT_OBJECT:
+ case MRB_TT_CLASS:
+ case MRB_TT_MODULE:
+ case MRB_TT_HASH:
+ case MRB_TT_DATA:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
mrb_value
mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym)
{
- return mrb_obj_iv_get(mrb, mrb_obj_ptr(obj), sym);
+ if (obj_iv_p(obj)) {
+ return mrb_obj_iv_get(mrb, mrb_obj_ptr(obj), sym);
+ }
+ return mrb_nil_value();
}
static void
@@ -129,7 +145,30 @@ mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v)
void
mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v) /* mrb_ivar_set */
{
- mrb_obj_iv_set(mrb, mrb_obj_ptr(obj), sym, v);
+ if (obj_iv_p(obj)) {
+ mrb_obj_iv_set(mrb, mrb_obj_ptr(obj), sym, v);
+ }
+}
+
+mrb_value
+mrb_iv_remove(mrb_state *mrb, mrb_value obj, mrb_sym sym)
+{
+ mrb_value val;
+
+ if (obj_iv_p(obj)) {
+ khash_t(iv) *h = mrb_obj_ptr(obj)->iv;
+ khiter_t k;
+
+ if (h) {
+ k = kh_get(iv, h, sym);
+ if (k != kh_end(h)) {
+ val = kh_value(h, k);
+ kh_del(iv, h, k);
+ return val;
+ }
+ }
+ }
+ return mrb_undef_value();
}
mrb_value
@@ -368,7 +407,7 @@ mrb_st_lookup(struct kh_iv *table, mrb_sym id, khiter_t *value)
}
}
-int
+static int
kiv_lookup(khash_t(iv)* table, mrb_sym key, mrb_value *value)
{
khash_t(iv) *h=table;
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-18 20:11:35 +0000