diff options
| -rw-r--r-- | src/array.c | 4 | ||||
| -rw-r--r-- | src/class.c | 7 | ||||
| -rw-r--r-- | src/error.c | 25 | ||||
| -rw-r--r-- | src/error.h | 1 | ||||
| -rw-r--r-- | src/parse.y | 14 | ||||
| -rw-r--r-- | src/string.c | 5 |
6 files changed, 6 insertions, 50 deletions
diff --git a/src/array.c b/src/array.c index 5f588e195..f9cc9119c 100644 --- a/src/array.c +++ b/src/array.c @@ -952,11 +952,7 @@ static mrb_value mrb_ary_inspect(mrb_state *mrb, mrb_value ary) { if (RARRAY_LEN(ary) == 0) return mrb_str_new(mrb, "[]", 2); - #if 0 /* THREAD */ - return mrb_exec_recursive(inspect_ary_r, ary, 0); - #else return inspect_ary(mrb, ary, mrb_ary_new(mrb)); - #endif } static mrb_value diff --git a/src/class.c b/src/class.c index 11f68340c..84132c38a 100644 --- a/src/class.c +++ b/src/class.c @@ -1369,9 +1369,12 @@ mrb_mod_to_s(mrb_state *mrb, mrb_value klass) mrb_str_cat(mrb, str, ">", 1); } else { + struct RClass *c; + mrb_value path; + str = mrb_str_buf_new(mrb, 32); - struct RClass *c = mrb_class_ptr(klass); - mrb_value path = mrb_class_path(mrb, c); + c = mrb_class_ptr(klass); + path = mrb_class_path(mrb, c); if (mrb_nil_p(path)) { switch (mrb_type(klass)) { diff --git a/src/error.c b/src/error.c index 6cf160801..ab5480e97 100644 --- a/src/error.c +++ b/src/error.c @@ -291,31 +291,6 @@ mrb_bug(const char *fmt, ...) exit(EXIT_FAILURE); } -static const char * -mrb_strerrno(int err) -{ -#define defined_error(name, num) if (err == num) return name; -#define undefined_error(name) -//#include "known_errors.inc" -#undef defined_error -#undef undefined_error - return NULL; -} - -void -mrb_bug_errno(const char *mesg, int errno_arg) -{ - if (errno_arg == 0) - mrb_bug("%s: errno == 0 (NOERROR)", mesg); - else { - const char *errno_str = mrb_strerrno(errno_arg); - if (errno_str) - mrb_bug("%s: %s (%s)", mesg, strerror(errno_arg), errno_str); - else - mrb_bug("%s: %s (%d)", mesg, strerror(errno_arg), errno_arg); - } -} - int sysexit_status(mrb_state *mrb, mrb_value err) { diff --git a/src/error.h b/src/error.h index 91d6595ff..53ee2b206 100644 --- a/src/error.h +++ b/src/error.h @@ -8,7 +8,6 @@ #define MRUBY_ERROR_H 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); mrb_value mrb_exc_new3(mrb_state *mrb, struct RClass* c, mrb_value str); mrb_value make_exception(mrb_state *mrb, int argc, mrb_value *argv, int isstr); diff --git a/src/parse.y b/src/parse.y index bdb646799..4826f4336 100644 --- a/src/parse.y +++ b/src/parse.y @@ -395,15 +395,6 @@ new_fcall(parser_state *p, mrb_sym b, node *c) return list4((node*)NODE_FCALL, new_self(p), nsym(b), c); } -#if 0 -// (:vcall self mid) -static node* -new_vcall(parser_state *p, mrb_sym b) -{ - return list3((node*)NODE_VCALL, new_self(p), (node*)b); -} -#endif - // (:super . c) static node* new_super(parser_state *p, node *c) @@ -1790,11 +1781,6 @@ arg : lhs '=' arg | arg tMATCH arg { $$ = call_bin_op(p, $1, "=~", $3); -#if 0 - if (nd_type($1) == NODE_LIT && TYPE($1->nd_lit) == T_REGEXP) { - $$ = reg_named_capture_assign($1->nd_lit, $$); - } -#endif } | arg tNMATCH arg { diff --git a/src/string.c b/src/string.c index 79c40e9cc..65f21a091 100644 --- a/src/string.c +++ b/src/string.c @@ -2068,9 +2068,6 @@ mrb_str_sub(mrb_state *mrb, mrb_value self) mrb_value mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck) { - #define BDIGIT unsigned int - #define BDIGIT_DBL unsigned long - char *end; char sign = 1; int c; @@ -2278,7 +2275,7 @@ mrb_cstr_to_dbl(mrb_state *mrb, const char * p, int badcheck) char *end; double d; #if !defined(DBL_DIG) - #define DBL_DIG 16 +# define DBL_DIG 16 #endif enum {max_width = 20}; |