diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-15 10:55:46 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-15 10:55:46 +0900 |
| commit | 5138f62d6ba666dc0cb43618f407701b0414040e (patch) | |
| tree | 6847b42135cba62a7ef7f4e359647122d1be173a /src/numeric.c | |
| parent | 6e0c48d7584d27883d8fb7e5c6fe8eb6f1db0a91 (diff) | |
| parent | f3f99fa2cde9b05fde3fa5e4317ed7dc5e81aea8 (diff) | |
| download | mruby-5138f62d6ba666dc0cb43618f407701b0414040e.tar.gz mruby-5138f62d6ba666dc0cb43618f407701b0414040e.zip | |
resolve conflict
Diffstat (limited to 'src/numeric.c')
| -rw-r--r-- | src/numeric.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/numeric.c b/src/numeric.c index 6d2ea7a3c..ef9308aea 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -1315,7 +1315,7 @@ mrb_init_numeric(mrb_state *mrb) struct RClass *numeric, *integer, *fixnum, *fl; /* Numeric Class */ - numeric = mrb_define_class(mrb, "Numeric", mrb->object_class); + numeric = mrb_define_class(mrb, "Numeric", mrb->object_class); /* 15.2.7 */ mrb_define_method(mrb, numeric, "**", num_pow, MRB_ARGS_REQ(1)); mrb_define_method(mrb, numeric, "/", num_div, MRB_ARGS_REQ(1)); /* 15.2.8.3.4 */ @@ -1323,9 +1323,9 @@ mrb_init_numeric(mrb_state *mrb) mrb_define_method(mrb, numeric, "<=>", num_cmp, MRB_ARGS_REQ(1)); /* 15.2.9.3.6 */ /* Integer Class */ - integer = mrb_define_class(mrb, "Integer", numeric); + integer = mrb_define_class(mrb, "Integer", numeric); /* 15.2.8 */ mrb_undef_class_method(mrb, integer, "new"); - mrb_define_method(mrb, integer, "to_i", int_to_i, MRB_ARGS_NONE()); /* 15.2.8.3.24 */ + mrb_define_method(mrb, integer, "to_i", int_to_i, MRB_ARGS_NONE()); /* 15.2.8.3.24 */ mrb_define_method(mrb, integer, "to_int", int_to_i, MRB_ARGS_NONE()); fixnum = mrb->fixnum_class = mrb_define_class(mrb, "Fixnum", integer); @@ -1348,7 +1348,7 @@ mrb_init_numeric(mrb_state *mrb) mrb_define_method(mrb, fixnum, "divmod", fix_divmod, MRB_ARGS_REQ(1)); /* 15.2.8.3.30 (x) */ /* Float Class */ - fl = mrb->float_class = mrb_define_class(mrb, "Float", numeric); + fl = mrb->float_class = mrb_define_class(mrb, "Float", numeric); /* 15.2.9 */ mrb_undef_class_method(mrb, fl, "new"); mrb_define_method(mrb, fl, "+", flo_plus, MRB_ARGS_REQ(1)); /* 15.2.9.3.1 */ mrb_define_method(mrb, fl, "-", flo_minus, MRB_ARGS_REQ(1)); /* 15.2.9.3.2 */ |