diff options
| -rw-r--r-- | include/mruby.h | 1 | ||||
| -rw-r--r-- | src/cdump.c | 1 | ||||
| -rw-r--r-- | src/compar.c | 35 | ||||
| -rw-r--r-- | src/error.h | 2 | ||||
| -rw-r--r-- | src/parse.y | 2 | ||||
| -rw-r--r-- | src/range.c | 14 |
6 files changed, 1 insertions, 54 deletions
diff --git a/include/mruby.h b/include/mruby.h index 167808b14..25fc96b53 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -481,7 +481,6 @@ mrb_value mrb_class_new_instance_m(mrb_state *mrb, mrb_value klass); #define xfree free #endif -void mrb_garbage_collect(mrb_state *mrb); void mrb_gc_protect(mrb_state *mrb, mrb_value obj); mrb_value mrb_to_int(mrb_state *mrb, mrb_value val); void mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t); diff --git a/src/cdump.c b/src/cdump.c index f9525d042..4f680d4f3 100644 --- a/src/cdump.c +++ b/src/cdump.c @@ -195,7 +195,6 @@ mrb_cdump_irep(mrb_state *mrb, int n, FILE *f,const char *initname) SOURCE_CODE0(" mrb->irep_len = idx;"); SOURCE_CODE0(""); - SOURCE_CODE0(" extern mrb_value mrb_top_self(mrb_state *mrb);"); SOURCE_CODE0(" mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb));"); SOURCE_CODE0("}"); diff --git a/src/compar.c b/src/compar.c index 1502d450b..1614d2393 100644 --- a/src/compar.c +++ b/src/compar.c @@ -5,41 +5,6 @@ */ #include "mruby.h" -#include "mruby/string.h" -#include "mruby/numeric.h" - -void -mrb_cmperr(mrb_state *mrb, mrb_value x, mrb_value y) -{ - const char *classname; - - if (SPECIAL_CONST_P(y)) { - y = mrb_inspect(mrb, y); - classname = mrb_string_value_ptr(mrb, y); - } - else { - classname = mrb_obj_classname(mrb, y); - } - mrb_raise(mrb, E_ARGUMENT_ERROR, "comparison of %s with %s failed", - mrb_obj_classname(mrb, x), classname); -} - -int -mrb_cmpint(mrb_state *mrb, mrb_value val, mrb_value a, mrb_value b) -{ - if (mrb_nil_p(val)) { - mrb_cmperr(mrb, a, b); - } - if (FIXNUM_P(val)) { - long l = mrb_fixnum(val); - if (l > 0) return 1; - if (l < 0) return -1; - return 0; - } - if (mrb_test(mrb_funcall(mrb, val, ">", 1, mrb_fixnum_value(0)))) return 1; - if (mrb_test(mrb_funcall(mrb, val, "<", 1, mrb_fixnum_value(0)))) return -1; - return 0; -} void mrb_init_comparable(mrb_state *mrb) diff --git a/src/error.h b/src/error.h index babf93a7d..8a86e7d3d 100644 --- a/src/error.h +++ b/src/error.h @@ -12,13 +12,11 @@ struct RException { }; void mrb_sys_fail(mrb_state *mrb, const char *mesg); -void mrb_exc_raise(mrb_state *mrb, mrb_value mesg); void mrb_bug_errno(const char*, int); int sysexit_status(mrb_state *mrb, mrb_value err); void error_pos(void); 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); -mrb_value mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, long len); mrb_value mrb_make_exception(mrb_state *mrb, int argc, mrb_value *argv); mrb_value mrb_sprintf(mrb_state *mrb, const char *fmt, ...); void mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...); diff --git a/src/parse.y b/src/parse.y index 7b788e3d0..7ca0cda80 100644 --- a/src/parse.y +++ b/src/parse.y @@ -1512,7 +1512,7 @@ op : '|' { $$ = intern("|"); } | '>' { $$ = intern(">"); } | tGEQ { $$ = intern(">="); } | '<' { $$ = intern("<"); } - | tLEQ { $$ = intern(">="); } + | tLEQ { $$ = intern("<="); } | tNEQ { $$ = intern("!="); } | tLSHFT { $$ = intern("<<"); } | tRSHFT { $$ = intern(">>"); } diff --git a/src/range.c b/src/range.c index b8b1d3926..acec1514e 100644 --- a/src/range.c +++ b/src/range.c @@ -201,11 +201,6 @@ r_le(mrb_state *mrb, mrb_value a, mrb_value b) if (mrb_nil_p(r)) return FALSE; - /* mrb_value -> int */ - //c = mrb_cmpint(mrb, r, a, b); - //if (c == 0) return TRUE; - //if (c < 0) return TRUE; - //return FALSE; if (mrb_obj_equal(mrb, r, mrb_fixnum_value(0))) return TRUE; if (mrb_obj_equal(mrb, r, mrb_fixnum_value(-1))) return TRUE; return FALSE; @@ -220,10 +215,6 @@ r_gt(mrb_state *mrb, mrb_value a, mrb_value b) if (mrb_nil_p(r)) return FALSE; - /* mrb_value -> int */ - //c = mrb_cmpint(mrb, r); - //if (c > 0) return TRUE; - //return FALSE; if (mrb_obj_equal(mrb, r, mrb_fixnum_value(1))) return TRUE; return FALSE; } @@ -237,11 +228,6 @@ r_ge(mrb_state *mrb, mrb_value a, mrb_value b) if (mrb_nil_p(r)) return FALSE; - /* mrb_value -> int */ - //c = mrb_cmpint(mrb, r); - //if (c == 0) return TRUE; - //if (c > 0) return TRUE; - //return FALSE; if (mrb_obj_equal(mrb, r, mrb_fixnum_value(0))) return TRUE; if (mrb_obj_equal(mrb, r, mrb_fixnum_value(1))) return TRUE; return FALSE; |