diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/array.c | 6 | ||||
| -rw-r--r-- | src/class.c | 284 | ||||
| -rw-r--r-- | src/error.h | 4 | ||||
| -rw-r--r-- | src/etc.c | 8 | ||||
| -rw-r--r-- | src/hash.c | 5 | ||||
| -rw-r--r-- | src/kernel.c | 6 | ||||
| -rw-r--r-- | src/range.c | 4 | ||||
| -rw-r--r-- | src/string.c | 10 | ||||
| -rw-r--r-- | src/variable.c | 3 |
9 files changed, 153 insertions, 177 deletions
diff --git a/src/array.c b/src/array.c index 88c15eb2c..c767283aa 100644 --- a/src/array.c +++ b/src/array.c @@ -125,7 +125,7 @@ static void ary_modify(mrb_state *mrb, struct RArray *a) { if (a->flags & MRB_ARY_SHARED) { - struct mrb_shared_array *shared = a->aux.shared; + mrb_shared_array *shared = a->aux.shared; if (shared->refcnt == 1 && a->ptr == shared->ptr) { a->ptr = shared->ptr; @@ -154,7 +154,7 @@ static void ary_make_shared(mrb_state *mrb, struct RArray *a) { if (!(a->flags & MRB_ARY_SHARED)) { - struct mrb_shared_array *shared = (struct mrb_shared_array *)mrb_malloc(mrb, sizeof(struct mrb_shared_array)); + mrb_shared_array *shared = (mrb_shared_array *)mrb_malloc(mrb, sizeof(mrb_shared_array)); shared->refcnt = 1; if (a->aux.capa > a->len) { @@ -667,7 +667,7 @@ mrb_ary_len(mrb_state *mrb, mrb_value ary) } void -mrb_ary_decref(mrb_state *mrb, struct mrb_shared_array *shared) +mrb_ary_decref(mrb_state *mrb, mrb_shared_array *shared) { shared->refcnt--; if (shared->refcnt == 0) { diff --git a/src/class.c b/src/class.c index c2def3e8c..c0e71dad7 100644 --- a/src/class.c +++ b/src/class.c @@ -18,14 +18,6 @@ KHASH_DEFINE(mt, mrb_sym, struct RProc*, 1, kh_int_hash_func, kh_int_hash_equal) -typedef struct fc_result { - mrb_sym name; - struct RClass * klass; - mrb_value path; - struct RClass * track; - struct fc_result *prev; -} fcresult_t; - void mrb_gc_mark_mt(mrb_state *mrb, struct RClass *c) { @@ -407,7 +399,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) break; default: if (argc <= i && !opt) { - mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments"); + mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments"); } } @@ -417,10 +409,10 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_value *p; p = va_arg(ap, mrb_value*); - if (i < argc) { - *p = *sp++; - i++; - } + if (i < argc) { + *p = *sp++; + i++; + } } break; case 'S': @@ -428,10 +420,10 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_value *p; p = va_arg(ap, mrb_value*); - if (i < argc) { - *p = to_str(mrb, *sp++); - i++; - } + if (i < argc) { + *p = to_str(mrb, *sp++); + i++; + } } break; case 'A': @@ -439,10 +431,10 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_value *p; p = va_arg(ap, mrb_value*); - if (i < argc) { - *p = to_ary(mrb, *sp++); - i++; - } + if (i < argc) { + *p = to_ary(mrb, *sp++); + i++; + } } break; case 'H': @@ -450,64 +442,64 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_value *p; p = va_arg(ap, mrb_value*); - if (i < argc) { - *p = to_hash(mrb, *sp++); - i++; - } + if (i < argc) { + *p = to_hash(mrb, *sp++); + i++; + } } break; case 's': { - mrb_value ss; + mrb_value ss; struct RString *s; char **ps = 0; int *pl = 0; - ps = va_arg(ap, char**); - pl = va_arg(ap, int*); - if (i < argc) { - ss = to_str(mrb, *sp++); - s = mrb_str_ptr(ss); - *ps = s->ptr; - *pl = s->len; - i++; - } + ps = va_arg(ap, char**); + pl = va_arg(ap, int*); + if (i < argc) { + ss = to_str(mrb, *sp++); + s = mrb_str_ptr(ss); + *ps = s->ptr; + *pl = s->len; + i++; + } } break; case 'z': { - mrb_value ss; + mrb_value ss; struct RString *s; char **ps; - ps = va_arg(ap, char**); - if (i < argc) { - ss = to_str(mrb, *sp++); - s = mrb_str_ptr(ss); - if (strlen(s->ptr) != s->len) { - mrb_raise(mrb, E_ARGUMENT_ERROR, "String contains NUL"); - } - *ps = s->ptr; - i++; - } + ps = va_arg(ap, char**); + if (i < argc) { + ss = to_str(mrb, *sp++); + s = mrb_str_ptr(ss); + if (strlen(s->ptr) != s->len) { + mrb_raise(mrb, E_ARGUMENT_ERROR, "String contains NUL"); + } + *ps = s->ptr; + i++; + } } break; case 'a': { - mrb_value aa; + mrb_value aa; struct RArray *a; mrb_value **pb; int *pl; - pb = va_arg(ap, mrb_value**); - pl = va_arg(ap, int*); - if (i < argc) { - aa = to_ary(mrb, *sp++); - a = mrb_ary_ptr(aa); - *pb = a->ptr; - *pl = a->len; - i++; - } + pb = va_arg(ap, mrb_value**); + pl = va_arg(ap, int*); + if (i < argc) { + aa = to_ary(mrb, *sp++); + a = mrb_ary_ptr(aa); + *pb = a->ptr; + *pl = a->len; + i++; + } } break; case 'f': @@ -515,29 +507,29 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_float *p; p = va_arg(ap, mrb_float*); - if (i < argc) { - switch (mrb_type(*sp)) { - case MRB_TT_FLOAT: - *p = mrb_float(*sp); - break; - case MRB_TT_FIXNUM: - *p = (mrb_float)mrb_fixnum(*sp); - break; - case MRB_TT_STRING: - mrb_raise(mrb, E_TYPE_ERROR, "String can't be coerced into Float"); - break; - default: - { - mrb_value tmp; - - tmp = mrb_convert_type(mrb, *sp, MRB_TT_FLOAT, "Float", "to_f"); - *p = mrb_float(tmp); - } - break; - } - sp++; - i++; - } + if (i < argc) { + switch (mrb_type(*sp)) { + case MRB_TT_FLOAT: + *p = mrb_float(*sp); + break; + case MRB_TT_FIXNUM: + *p = (mrb_float)mrb_fixnum(*sp); + break; + case MRB_TT_STRING: + mrb_raise(mrb, E_TYPE_ERROR, "String can't be coerced into Float"); + break; + default: + { + mrb_value tmp; + + tmp = mrb_convert_type(mrb, *sp, MRB_TT_FLOAT, "Float", "to_f"); + *p = mrb_float(tmp); + } + break; + } + sp++; + i++; + } } break; case 'i': @@ -545,71 +537,71 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_int *p; p = va_arg(ap, mrb_int*); - if (i < argc) { - switch (mrb_type(*sp)) { - case MRB_TT_FIXNUM: - *p = mrb_fixnum(*sp); - break; - case MRB_TT_FLOAT: - { - mrb_float f = mrb_float(*sp); - - if (!FIXABLE(f)) { - mrb_raise(mrb, E_RANGE_ERROR, "float too big for int"); - } - *p = (mrb_int)f; - } - break; - case MRB_TT_FALSE: - *p = 0; - break; - default: - { - mrb_value tmp; - - tmp = mrb_convert_type(mrb, *sp, MRB_TT_FIXNUM, "Integer", "to_int"); - *p = mrb_fixnum(tmp); - } - break; - } - sp++; - i++; - } + if (i < argc) { + switch (mrb_type(*sp)) { + case MRB_TT_FIXNUM: + *p = mrb_fixnum(*sp); + break; + case MRB_TT_FLOAT: + { + mrb_float f = mrb_float(*sp); + + if (!FIXABLE(f)) { + mrb_raise(mrb, E_RANGE_ERROR, "float too big for int"); + } + *p = (mrb_int)f; + } + break; + case MRB_TT_FALSE: + *p = 0; + break; + default: + { + mrb_value tmp; + + tmp = mrb_convert_type(mrb, *sp, MRB_TT_FIXNUM, "Integer", "to_int"); + *p = mrb_fixnum(tmp); + } + break; + } + sp++; + i++; + } } break; case 'b': { - int *boolp = va_arg(ap, int*); + int *boolp = va_arg(ap, int*); - if (i < argc) { - mrb_value b = *sp++; - *boolp = mrb_test(b); - i++; - } + if (i < argc) { + mrb_value b = *sp++; + *boolp = mrb_test(b); + i++; + } } break; case 'n': { - mrb_sym *symp; - - symp = va_arg(ap, mrb_sym*); - if (i < argc) { - mrb_value ss; - - ss = *sp++; - if (mrb_type(ss) == MRB_TT_SYMBOL) { - *symp = mrb_symbol(ss); - } - else if (mrb_string_p(ss)) { - *symp = mrb_intern_str(mrb, to_str(mrb, ss)); - } - else { - mrb_value obj = mrb_funcall(mrb, ss, "inspect", 0); - mrb_raisef(mrb, E_TYPE_ERROR, "%s is not a symbol", - mrb_string_value_ptr(mrb, obj)); - } - i++; - } + mrb_sym *symp; + + symp = va_arg(ap, mrb_sym*); + if (i < argc) { + mrb_value ss; + + ss = *sp++; + if (mrb_type(ss) == MRB_TT_SYMBOL) { + *symp = mrb_symbol(ss); + } + else if (mrb_string_p(ss)) { + *symp = mrb_intern_str(mrb, to_str(mrb, ss)); + } + else { + mrb_value obj = mrb_funcall(mrb, ss, "inspect", 0); + mrb_raisef(mrb, E_TYPE_ERROR, "%s is not a symbol", + mrb_string_value_ptr(mrb, obj)); + } + i++; + } } break; @@ -621,9 +613,9 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) if (mrb->ci->argc < 0) { bp = mrb->stack + 2; } - else { + else { bp = mrb->stack + mrb->ci->argc + 1; - } + } *p = *bp; } break; @@ -634,18 +626,18 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) case '*': { mrb_value **var; - int *pl; + int *pl; var = va_arg(ap, mrb_value**); pl = va_arg(ap, int*); if (argc > i) { *pl = argc-i; if (*pl > 0) { - *var = sp; + *var = sp; i = argc; } - i = argc; - sp += *pl; + i = argc; + sp += *pl; } else { *pl = 0; @@ -689,13 +681,13 @@ mrb_include_module(mrb_state *mrb, struct RClass *c, struct RClass *m) while(p) { if (c != p && p->tt == MRB_TT_CLASS) { - superclass_seen = 1; + superclass_seen = 1; } else if (p->mt == m->mt){ - if (p->tt == MRB_TT_ICLASS && !superclass_seen) { - ins_pos = p; - } - goto skip; + if (p->tt == MRB_TT_ICLASS && !superclass_seen) { + ins_pos = p; + } + goto skip; } p = p->super; } diff --git a/src/error.h b/src/error.h index 674d4f477..ba3fdac6c 100644 --- a/src/error.h +++ b/src/error.h @@ -7,10 +7,6 @@ #ifndef MRUBY_ERROR_H #define MRUBY_ERROR_H -struct RException { - MRB_OBJECT_HEADER; -}; - void mrb_sys_fail(mrb_state *mrb, const char *mesg); void mrb_bug_errno(const char*, int); int sysexit_status(mrb_state *mrb, mrb_value err); @@ -11,19 +11,19 @@ #include "mruby/data.h" struct RData* -mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const struct mrb_data_type *type) +mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const mrb_data_type *type) { struct RData *data; data = (struct RData*)mrb_obj_alloc(mrb, MRB_TT_DATA, klass); data->data = ptr; - data->type = (struct mrb_data_type*) type; + data->type = (mrb_data_type*) type; return data; } void * -mrb_get_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *type) +mrb_get_datatype(mrb_state *mrb, mrb_value obj, const mrb_data_type *type) { if (mrb_special_const_p(obj) || (mrb_type(obj) != MRB_TT_DATA)) { return NULL; @@ -35,7 +35,7 @@ mrb_get_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *type } void * -mrb_check_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *type) +mrb_check_datatype(mrb_state *mrb, mrb_value obj, const mrb_data_type *type) { static const char mesg[] = "wrong argument type %s (expected %s)"; diff --git a/src/hash.c b/src/hash.c index 928407f67..2439a235d 100644 --- a/src/hash.c +++ b/src/hash.c @@ -526,11 +526,6 @@ mrb_hash_delete(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "o", &key); return mrb_hash_delete_key(mrb, self, key); } -struct shift_var { - mrb_value key; - mrb_value val; -}; - /* 15.2.13.4.24 */ /* diff --git a/src/kernel.c b/src/kernel.c index c37b58684..e45953fd3 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -26,12 +26,6 @@ typedef enum { NOEX_RESPONDS = 0x80 } mrb_method_flag_t; -struct obj_ivar_tag { - mrb_value obj; - int (*func)(mrb_sym key, mrb_value val, void * arg); - void * arg; -}; - int mrb_obj_basic_to_s_p(mrb_state *mrb, mrb_value obj) { diff --git a/src/range.c b/src/range.c index 2e9ec26ed..aac1d830a 100644 --- a/src/range.c +++ b/src/range.c @@ -40,7 +40,7 @@ mrb_range_new(mrb_state *mrb, mrb_value beg, mrb_value end, int excl) r = (struct RRange*)mrb_obj_alloc(mrb, MRB_TT_RANGE, RANGE_CLASS); range_check(mrb, beg, end); - r->edges = (struct mrb_range_edges *)mrb_malloc(mrb, sizeof(struct mrb_range_edges)); + r->edges = (mrb_range_edges *)mrb_malloc(mrb, sizeof(mrb_range_edges)); r->edges->beg = beg; r->edges->end = end; r->excl = excl; @@ -103,7 +103,7 @@ range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, int ex range_check(mrb, beg, end); r->excl = exclude_end; if (!r->edges) { - r->edges = (struct mrb_range_edges *)mrb_malloc(mrb, sizeof(struct mrb_range_edges)); + r->edges = (mrb_range_edges *)mrb_malloc(mrb, sizeof(mrb_range_edges)); } r->edges->beg = beg; r->edges->end = end; diff --git a/src/string.c b/src/string.c index 7af0d1d59..28cf0ab9a 100644 --- a/src/string.c +++ b/src/string.c @@ -35,7 +35,7 @@ _obj_classname(mrb_state *mrb, mrb_value obj) } void -mrb_str_decref(mrb_state *mrb, struct mrb_shared_string *shared) +mrb_str_decref(mrb_state *mrb, mrb_shared_string *shared) { shared->refcnt--; if (shared->refcnt == 0) { @@ -48,7 +48,7 @@ static void str_modify(mrb_state *mrb, struct RString *s) { if (s->flags & MRB_STR_SHARED) { - struct mrb_shared_string *shared = s->aux.shared; + mrb_shared_string *shared = s->aux.shared; if (shared->refcnt == 1 && s->ptr == shared->ptr) { s->ptr = shared->ptr; @@ -275,7 +275,7 @@ static void str_make_shared(mrb_state *mrb, struct RString *s) { if (!(s->flags & MRB_STR_SHARED)) { - struct mrb_shared_string *shared = (struct mrb_shared_string *)mrb_malloc(mrb, sizeof(struct mrb_shared_string)); + mrb_shared_string *shared = (mrb_shared_string *)mrb_malloc(mrb, sizeof(mrb_shared_string)); shared->refcnt = 1; if (s->aux.capa > s->len) { @@ -301,7 +301,7 @@ mrb_value mrb_str_literal(mrb_state *mrb, mrb_value str) { struct RString *s, *orig; - struct mrb_shared_string *shared; + mrb_shared_string *shared; s = str_alloc(mrb, mrb->string_class); orig = mrb_str_ptr(str); @@ -1161,7 +1161,7 @@ static mrb_value mrb_str_subseq(mrb_state *mrb, mrb_value str, int beg, int len) { struct RString *orig, *s; - struct mrb_shared_string *shared; + mrb_shared_string *shared; orig = mrb_str_ptr(str); str_make_shared(mrb, orig); diff --git a/src/variable.c b/src/variable.c index a2dca3cc6..5f657e3d7 100644 --- a/src/variable.c +++ b/src/variable.c @@ -20,8 +20,7 @@ typedef int (iv_foreach_func)(mrb_state*,mrb_sym,mrb_value,void*); #define MRB_SEGMENT_SIZE 4 #endif -typedef struct segment -{ +typedef struct segment { mrb_sym key[MRB_SEGMENT_SIZE]; mrb_value val[MRB_SEGMENT_SIZE]; struct segment *next; |