diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby.h | 14 | ||||
| -rw-r--r-- | include/mruby/class.h | 4 | ||||
| -rw-r--r-- | include/mruby/data.h | 1 | ||||
| -rw-r--r-- | include/mruby/hash.h | 11 | ||||
| -rw-r--r-- | include/mruby/object.h | 4 | ||||
| -rw-r--r-- | include/mruby/range.h | 2 | ||||
| -rw-r--r-- | include/mruby/string.h | 5 |
7 files changed, 15 insertions, 26 deletions
diff --git a/include/mruby.h b/include/mruby.h index 6efa54858..6ed8e4878 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -68,7 +68,7 @@ typedef struct mrb_value { mrb_int i; mrb_sym sym; } value; - enum mrb_vtype tt; + enum mrb_vtype tt:8; } mrb_value; #define mrb_type(o) (o).tt @@ -342,6 +342,7 @@ void *mrb_realloc(mrb_state*, void*, size_t); void *mrb_obj_alloc(mrb_state*, enum mrb_vtype, struct RClass*); void *mrb_free(mrb_state*, void*); +mrb_value mrb_str_new(mrb_state *mrb, const char *p, size_t len); /* mrb_str_new */ mrb_value mrb_str_new_cstr(mrb_state*, const char*); mrb_state* mrb_open(void); @@ -371,17 +372,6 @@ void mrb_gc_mark(mrb_state*,struct RBasic*); #define mrb_gc_mark_value(mrb,val) do {\ if ((val).tt >= MRB_TT_OBJECT) mrb_gc_mark((mrb), mrb_object(val));\ } while (0); -void mrb_gc_mark_gv(mrb_state*); -void mrb_gc_free_gv(mrb_state*); -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*); -void mrb_gc_mark_mt(mrb_state*, struct RClass*); -size_t mrb_gc_mark_mt_size(mrb_state*, struct RClass*); -void mrb_gc_free_mt(mrb_state*, struct RClass*); -void mrb_gc_mark_ht(mrb_state*, struct RClass*); -size_t mrb_gc_mark_ht_size(mrb_state*, struct RClass*); -void mrb_gc_free_ht(mrb_state*, struct RClass*); void mrb_field_write_barrier(mrb_state *, struct RBasic*, struct RBasic*); #define mrb_field_write_barrier_value(mrb, obj, val) do{\ if ((val.tt >= MRB_TT_OBJECT)) mrb_field_write_barrier((mrb), (obj), mrb_object(val));\ diff --git a/include/mruby/class.h b/include/mruby/class.h index 0713f9b36..62829bd68 100644 --- a/include/mruby/class.h +++ b/include/mruby/class.h @@ -64,13 +64,15 @@ struct RClass *mrb_vm_define_class(mrb_state*, mrb_value, mrb_value, mrb_sym); struct RClass *mrb_vm_define_module(mrb_state*, mrb_value, mrb_sym); void mrb_define_method_vm(mrb_state*, struct RClass*, mrb_sym, mrb_value); void mrb_define_method_raw(mrb_state*, struct RClass*, mrb_sym, struct RProc *); +void mrb_define_method_id(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_func_t func, int aspec); struct RClass *mrb_class_outer_module(mrb_state*, struct RClass *); struct RProc *mrb_method_search_vm(mrb_state*, struct RClass**, mrb_sym); struct RProc *mrb_method_search(mrb_state*, struct RClass*, mrb_sym); int mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid); -void mrb_define_method_id(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_func_t func, int aspec); +int mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c); +struct RClass* mrb_class_real(struct RClass* cl); void mrb_obj_call_init(mrb_state *mrb, mrb_value obj, int argc, mrb_value *argv); diff --git a/include/mruby/data.h b/include/mruby/data.h index f839389f9..d4ce82e40 100644 --- a/include/mruby/data.h +++ b/include/mruby/data.h @@ -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); \ diff --git a/include/mruby/hash.h b/include/mruby/hash.h index 94f6a693f..3a15ecd1d 100644 --- a/include/mruby/hash.h +++ b/include/mruby/hash.h @@ -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 diff --git a/include/mruby/object.h b/include/mruby/object.h index a4d2d2dac..0c3f3a6dd 100644 --- a/include/mruby/object.h +++ b/include/mruby/object.h @@ -7,8 +7,8 @@ #ifndef MRUBY_OBJECT_H #define MRUBY_OBJECT_H -#define MRUBY_OBJECT_HEADER \ - enum mrb_vtype tt:8;\ +#define MRUBY_OBJECT_HEADER \ + enum mrb_vtype tt:8; \ int color:3;\ unsigned int flags:21;\ struct RClass *c;\ diff --git a/include/mruby/range.h b/include/mruby/range.h index 9a59f645a..1b07ca197 100644 --- a/include/mruby/range.h +++ b/include/mruby/range.h @@ -21,7 +21,5 @@ struct RRange { mrb_value mrb_range_new(mrb_state*, mrb_value, mrb_value, int); mrb_int mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len, mrb_int err); -int mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c); -struct RClass* mrb_class_real(struct RClass* cl); #endif /* MRUBY_RANGE_H */ diff --git a/include/mruby/string.h b/include/mruby/string.h index 5a2c46a99..7ac84bcaf 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -70,7 +70,6 @@ void mrb_str_concat(mrb_state*, mrb_value, mrb_value); mrb_value mrb_obj_to_str(mrb_state*, mrb_value); mrb_value mrb_str_plus(mrb_state*, mrb_value, mrb_value); mrb_value mrb_obj_as_string(mrb_state *mrb, mrb_value obj); -mrb_value mrb_str_new(mrb_state *mrb, const char *p, size_t len); /* mrb_str_new */ mrb_value mrb_str_resize(mrb_state *mrb, mrb_value str, size_t len); /* mrb_str_resize */ mrb_value mrb_string_value(mrb_state *mrb, mrb_value *ptr); /* StringValue */ mrb_value mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, int len); @@ -79,8 +78,8 @@ mrb_value mrb_str_buf_new(mrb_state *mrb, size_t capa); mrb_value mrb_str_buf_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len); mrb_value str_buf_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len); -char * mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr); -char * mrb_string_value_ptr(mrb_state *mrb, mrb_value ptr); +char *mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr); +char *mrb_string_value_ptr(mrb_state *mrb, mrb_value ptr); mrb_value mrb_str_subseq(mrb_state *mrb, mrb_value str, long beg, long len); size_t mrb_str_sublen(mrb_state *mrb, mrb_value str, long pos); mrb_value mrb_str_size(mrb_state *mrb, mrb_value self); |