admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

hash refactored

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-05-05 08:55:58 +09:00
parent c9a51c43bc
commit e0460c1157
7 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/data.h
+1
View File
@@ -38,6 +38,7 @@ struct RData *mrb_data_object_alloc(mrb_state *mrb, struct RClass* klass, void *
#define RDATA(obj) ((struct RData *)((obj).value.p))
#define DATA_PTR(d) (RDATA(d)->data)
#define DATA_TYPE(d) (RDATA(d)->type)
void *mrb_get_datatype(mrb_state *mrb, mrb_value, const struct mrb_data_type*);
void *mrb_check_datatype(mrb_state *mrb, mrb_value, const struct mrb_data_type*);
#define Data_Get_Struct(mrb,obj,type,sval) do {\
sval = mrb_check_datatype(mrb, obj, type); \
include/mruby/hash.h
+5 -6
View File
@@ -9,8 +9,8 @@
struct RHash {
MRUBY_OBJECT_HEADER;
struct kh_iv *iv;
struct kh_ht *ht;
mrb_value ifnone;
};
#define N 624
@@ -47,12 +47,11 @@ void ruby_setenv(mrb_state *mrb, const char *name, const char *value);
/* RHASH_TBL allocates st_table if not available. */
#define RHASH(obj) ((struct RHash*)((obj).value.p))
#define RHASH_TBL(h) mrb_hash_tbl(h)
#define RHASH_H_TBL(h) (RHASH(h)->ht)
#define RHASH_SIZE(h) (RHASH_H_TBL(h)->size)
#define RHASH_TBL(h) (RHASH(h)->ht)
#define RHASH_SIZE(h) (RHASH_TBL(h)->size)
#define RHASH_EMPTY_P(h) (RHASH_SIZE(h) == 0)
#define RHASH_IFNONE(h) (RHASH(h)->ifnone)
#define RHASH_PROCDEFAULT(h) (RHASH(h)->ifnone)
#define RHASH_IFNONE(h) mrb_iv_get(mrb, (h), mrb_intern(mrb, "ifnone"))
#define RHASH_PROCDEFAULT(h) RHASH_IFNONE(h)
struct kh_ht * mrb_hash_tbl(mrb_state *mrb, mrb_value hash);
#define MRB_HASH_PROC_DEFAULT 256