mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
Integrate Fixnum class into Integer class
* The `Fixnum` constant is now an alias for the `Integer` class. * Remove `struct mrb_state::fixnum_class` member. If necessary, use `struct mrb_state::integer_class` instead.
This commit is contained in:
dearblue
committed by
Yukihiro "Matz" Matsumoto
Yukihiro "Matz" Matsumoto
parent
40d0d8fe0e
commit
80fe9838d2
+3
-3
@@ -638,8 +638,8 @@ void mrb_hash_check_kdict(mrb_state *mrb, mrb_value self);
|
||||
z: String [const char*] NUL terminated string; z! gives NULL for nil
|
||||
a: Array [mrb_value*,mrb_int] Receive two arguments; a! gives (NULL,0) for nil
|
||||
c: Class/Module [strcut RClass*]
|
||||
f: Fixnum/Float [mrb_float]
|
||||
i: Fixnum/Float [mrb_int]
|
||||
f: Integer/Float [mrb_float]
|
||||
i: Integer/Float [mrb_int]
|
||||
b: boolean [mrb_bool]
|
||||
n: String/Symbol [mrb_sym]
|
||||
d: data [void*,mrb_data_type const] 2nd argument will be used to check data type so it won't be modified; when ! follows, the value may be nil
|
||||
@@ -1874,7 +1874,7 @@ mrb_module_new(mrb_state *mrb)
|
||||
* called with an explicit receiver, as <code>class</code> is also a
|
||||
* reserved word in Ruby.
|
||||
*
|
||||
* 1.class #=> Fixnum
|
||||
* 1.class #=> Integer
|
||||
* self.class #=> Object
|
||||
*/
|
||||
|
||||
|
||||
@@ -932,7 +932,7 @@ root_scan_phase(mrb_state *mrb, mrb_gc *gc)
|
||||
#ifndef MRB_NO_FLOAT
|
||||
mrb_gc_mark(mrb, (struct RBasic*)mrb->float_class);
|
||||
#endif
|
||||
mrb_gc_mark(mrb, (struct RBasic*)mrb->fixnum_class);
|
||||
mrb_gc_mark(mrb, (struct RBasic*)mrb->integer_class);
|
||||
mrb_gc_mark(mrb, (struct RBasic*)mrb->true_class);
|
||||
mrb_gc_mark(mrb, (struct RBasic*)mrb->false_class);
|
||||
mrb_gc_mark(mrb, (struct RBasic*)mrb->nil_class);
|
||||
|
||||
+4
-4
@@ -209,7 +209,7 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
|
||||
* called with an explicit receiver, as <code>class</code> is also a
|
||||
* reserved word in Ruby.
|
||||
*
|
||||
* 1.class #=> Fixnum
|
||||
* 1.class #=> Integer
|
||||
* self.class #=> Object
|
||||
*/
|
||||
static mrb_value
|
||||
@@ -341,7 +341,7 @@ init_copy(mrb_state *mrb, mrb_value dest, mrb_value obj)
|
||||
* behavior will be documented under the #+initialize_copy+ method of
|
||||
* the class.
|
||||
*
|
||||
* Some Class(True False Nil Symbol Fixnum Float) Object cannot clone.
|
||||
* Some Class(True False Nil Symbol Integer Float) Object cannot clone.
|
||||
*/
|
||||
MRB_API mrb_value
|
||||
mrb_obj_clone(mrb_state *mrb, mrb_value self)
|
||||
@@ -480,11 +480,11 @@ mrb_obj_frozen(mrb_state *mrb, mrb_value self)
|
||||
* call-seq:
|
||||
* obj.hash -> fixnum
|
||||
*
|
||||
* Generates a <code>Fixnum</code> hash value for this object. This
|
||||
* Generates a <code>Integer</code> hash value for this object. This
|
||||
* function must have the property that <code>a.eql?(b)</code> implies
|
||||
* <code>a.hash == b.hash</code>. The hash value is used by class
|
||||
* <code>Hash</code>. Any hash value that exceeds the capacity of a
|
||||
* <code>Fixnum</code> will be truncated before being used.
|
||||
* <code>Integer</code> will be truncated before being used.
|
||||
*/
|
||||
static mrb_value
|
||||
mrb_obj_hash(mrb_state *mrb, mrb_value self)
|
||||
|
||||
+39
-39
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
** numeric.c - Numeric, Integer, Float, Fixnum class
|
||||
** numeric.c - Numeric, Integer, Float class
|
||||
**
|
||||
** See Copyright Notice in mruby.h
|
||||
*/
|
||||
@@ -378,7 +378,7 @@ flo_mod(mrb_state *mrb, mrb_value x)
|
||||
* (1.0).eql?(1.0) #=> true
|
||||
*/
|
||||
static mrb_value
|
||||
fix_eql(mrb_state *mrb, mrb_value x)
|
||||
int_eql(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_value y = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -771,8 +771,7 @@ flo_nan_p(mrb_state *mrb, mrb_value num)
|
||||
/*
|
||||
* Document-class: Integer
|
||||
*
|
||||
* <code>Integer</code> is the basis for the two concrete classes that
|
||||
* hold whole numbers, <code>Bignum</code> and <code>Fixnum</code>.
|
||||
* <code>Integer</code> is hold whole numbers.
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -842,7 +841,7 @@ mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value y)
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_mul(mrb_state *mrb, mrb_value x)
|
||||
int_mul(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_value y = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -888,7 +887,7 @@ fixdivmod(mrb_state *mrb, mrb_int x, mrb_int y, mrb_int *divp, mrb_int *modp)
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_mod(mrb_state *mrb, mrb_value x)
|
||||
int_mod(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_value y = mrb_get_arg1(mrb);
|
||||
mrb_int a, b;
|
||||
@@ -929,7 +928,7 @@ fix_mod(mrb_state *mrb, mrb_value x)
|
||||
* See <code>Numeric#divmod</code>.
|
||||
*/
|
||||
static mrb_value
|
||||
fix_divmod(mrb_state *mrb, mrb_value x)
|
||||
int_divmod(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_value y = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -992,7 +991,7 @@ flo_divmod(mrb_state *mrb, mrb_value x)
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_equal(mrb_state *mrb, mrb_value x)
|
||||
int_equal(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_value y = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -1020,7 +1019,7 @@ fix_equal(mrb_state *mrb, mrb_value x)
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_rev(mrb_state *mrb, mrb_value num)
|
||||
int_rev(mrb_state *mrb, mrb_value num)
|
||||
{
|
||||
mrb_int val = mrb_fixnum(num);
|
||||
|
||||
@@ -1050,7 +1049,7 @@ static mrb_value flo_xor(mrb_state *mrb, mrb_value x);
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_and(mrb_state *mrb, mrb_value x)
|
||||
int_and(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_value y = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -1066,7 +1065,7 @@ fix_and(mrb_state *mrb, mrb_value x)
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_or(mrb_state *mrb, mrb_value x)
|
||||
int_or(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_value y = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -1082,7 +1081,7 @@ fix_or(mrb_state *mrb, mrb_value x)
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_xor(mrb_state *mrb, mrb_value x)
|
||||
int_xor(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_value y = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -1160,7 +1159,7 @@ rshift(mrb_int val, mrb_int width)
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_lshift(mrb_state *mrb, mrb_value x)
|
||||
int_lshift(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_int width, val;
|
||||
|
||||
@@ -1185,7 +1184,7 @@ fix_lshift(mrb_state *mrb, mrb_value x)
|
||||
*/
|
||||
|
||||
static mrb_value
|
||||
fix_rshift(mrb_state *mrb, mrb_value x)
|
||||
int_rshift(mrb_state *mrb, mrb_value x)
|
||||
{
|
||||
mrb_int width, val;
|
||||
|
||||
@@ -1212,7 +1211,7 @@ fix_rshift(mrb_state *mrb, mrb_value x)
|
||||
|
||||
#ifndef MRB_NO_FLOAT
|
||||
static mrb_value
|
||||
fix_to_f(mrb_state *mrb, mrb_value num)
|
||||
int_to_f(mrb_state *mrb, mrb_value num)
|
||||
{
|
||||
return mrb_float_value(mrb, (mrb_float)mrb_fixnum(num));
|
||||
}
|
||||
@@ -1305,7 +1304,7 @@ mrb_num_plus(mrb_state *mrb, mrb_value x, mrb_value y)
|
||||
* result.
|
||||
*/
|
||||
static mrb_value
|
||||
fix_plus(mrb_state *mrb, mrb_value self)
|
||||
int_plus(mrb_state *mrb, mrb_value self)
|
||||
{
|
||||
mrb_value other = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -1362,7 +1361,7 @@ mrb_num_minus(mrb_state *mrb, mrb_value x, mrb_value y)
|
||||
* result.
|
||||
*/
|
||||
static mrb_value
|
||||
fix_minus(mrb_state *mrb, mrb_value self)
|
||||
int_minus(mrb_state *mrb, mrb_value self)
|
||||
{
|
||||
mrb_value other = mrb_get_arg1(mrb);
|
||||
|
||||
@@ -1419,7 +1418,7 @@ mrb_fixnum_to_str(mrb_state *mrb, mrb_value x, mrb_int base)
|
||||
*
|
||||
*/
|
||||
static mrb_value
|
||||
fix_to_s(mrb_state *mrb, mrb_value self)
|
||||
int_to_s(mrb_state *mrb, mrb_value self)
|
||||
{
|
||||
mrb_int base = 10;
|
||||
|
||||
@@ -1599,7 +1598,7 @@ flo_plus(mrb_state *mrb, mrb_value x)
|
||||
void
|
||||
mrb_init_numeric(mrb_state *mrb)
|
||||
{
|
||||
struct RClass *numeric, *integer, *fixnum, *integral;
|
||||
struct RClass *numeric, *integer, *integral;
|
||||
#ifndef MRB_NO_FLOAT
|
||||
struct RClass *fl;
|
||||
#endif
|
||||
@@ -1622,7 +1621,7 @@ mrb_init_numeric(mrb_state *mrb)
|
||||
mrb_define_method(mrb, numeric, "infinite?",num_infinite_p, MRB_ARGS_NONE());
|
||||
|
||||
/* Integer Class */
|
||||
integer = mrb_define_class(mrb, "Integer", numeric); /* 15.2.8 */
|
||||
mrb->integer_class = integer = mrb_define_class(mrb, "Integer", numeric); /* 15.2.8 */
|
||||
MRB_SET_INSTANCE_TT(integer, MRB_TT_FIXNUM);
|
||||
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 */
|
||||
@@ -1634,26 +1633,27 @@ mrb_init_numeric(mrb_state *mrb)
|
||||
mrb_define_method(mrb, integer, "truncate", int_to_i, MRB_ARGS_NONE()); /* 15.2.8.3.15 (x) */
|
||||
#endif
|
||||
|
||||
/* Fixnum Class */
|
||||
mrb->fixnum_class = fixnum = mrb_define_class(mrb, "Fixnum", integer);
|
||||
mrb_define_method(mrb, fixnum, "+", fix_plus, MRB_ARGS_REQ(1)); /* 15.2.8.3.1 */
|
||||
mrb_define_method(mrb, fixnum, "-", fix_minus, MRB_ARGS_REQ(1)); /* 15.2.8.3.2 */
|
||||
mrb_define_method(mrb, fixnum, "*", fix_mul, MRB_ARGS_REQ(1)); /* 15.2.8.3.3 */
|
||||
mrb_define_method(mrb, fixnum, "%", fix_mod, MRB_ARGS_REQ(1)); /* 15.2.8.3.5 */
|
||||
mrb_define_method(mrb, fixnum, "==", fix_equal, MRB_ARGS_REQ(1)); /* 15.2.8.3.7 */
|
||||
mrb_define_method(mrb, fixnum, "~", fix_rev, MRB_ARGS_NONE()); /* 15.2.8.3.8 */
|
||||
mrb_define_method(mrb, fixnum, "&", fix_and, MRB_ARGS_REQ(1)); /* 15.2.8.3.9 */
|
||||
mrb_define_method(mrb, fixnum, "|", fix_or, MRB_ARGS_REQ(1)); /* 15.2.8.3.10 */
|
||||
mrb_define_method(mrb, fixnum, "^", fix_xor, MRB_ARGS_REQ(1)); /* 15.2.8.3.11 */
|
||||
mrb_define_method(mrb, fixnum, "<<", fix_lshift, MRB_ARGS_REQ(1)); /* 15.2.8.3.12 */
|
||||
mrb_define_method(mrb, fixnum, ">>", fix_rshift, MRB_ARGS_REQ(1)); /* 15.2.8.3.13 */
|
||||
mrb_define_method(mrb, fixnum, "eql?", fix_eql, MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
|
||||
#ifndef MRB_NO_FLOAT
|
||||
mrb_define_method(mrb, fixnum, "to_f", fix_to_f, MRB_ARGS_NONE()); /* 15.2.8.3.23 */
|
||||
mrb_define_method(mrb, integer, "+", int_plus, MRB_ARGS_REQ(1)); /* 15.2.8.3.1 */
|
||||
mrb_define_method(mrb, integer, "-", int_minus, MRB_ARGS_REQ(1)); /* 15.2.8.3.2 */
|
||||
mrb_define_method(mrb, integer, "*", int_mul, MRB_ARGS_REQ(1)); /* 15.2.8.3.3 */
|
||||
mrb_define_method(mrb, integer, "%", int_mod, MRB_ARGS_REQ(1)); /* 15.2.8.3.5 */
|
||||
mrb_define_method(mrb, integer, "==", int_equal, MRB_ARGS_REQ(1)); /* 15.2.8.3.7 */
|
||||
mrb_define_method(mrb, integer, "~", int_rev, MRB_ARGS_NONE()); /* 15.2.8.3.8 */
|
||||
mrb_define_method(mrb, integer, "&", int_and, MRB_ARGS_REQ(1)); /* 15.2.8.3.9 */
|
||||
mrb_define_method(mrb, integer, "|", int_or, MRB_ARGS_REQ(1)); /* 15.2.8.3.10 */
|
||||
mrb_define_method(mrb, integer, "^", int_xor, MRB_ARGS_REQ(1)); /* 15.2.8.3.11 */
|
||||
mrb_define_method(mrb, integer, "<<", int_lshift, MRB_ARGS_REQ(1)); /* 15.2.8.3.12 */
|
||||
mrb_define_method(mrb, integer, ">>", int_rshift, MRB_ARGS_REQ(1)); /* 15.2.8.3.13 */
|
||||
mrb_define_method(mrb, integer, "eql?", int_eql, MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
|
||||
#ifndef MRB_WITHOUT_FLOAT
|
||||
mrb_define_method(mrb, integer, "to_f", int_to_f, MRB_ARGS_NONE()); /* 15.2.8.3.23 */
|
||||
#endif
|
||||
mrb_define_method(mrb, fixnum, "to_s", fix_to_s, MRB_ARGS_OPT(1)); /* 15.2.8.3.25 */
|
||||
mrb_define_method(mrb, fixnum, "inspect", fix_to_s, MRB_ARGS_OPT(1));
|
||||
mrb_define_method(mrb, fixnum, "divmod", fix_divmod, MRB_ARGS_REQ(1)); /* 15.2.8.3.30 (x) */
|
||||
mrb_define_method(mrb, integer, "to_s", int_to_s, MRB_ARGS_OPT(1)); /* 15.2.8.3.25 */
|
||||
mrb_define_method(mrb, integer, "inspect", int_to_s, MRB_ARGS_OPT(1));
|
||||
mrb_define_method(mrb, integer, "divmod", int_divmod, MRB_ARGS_REQ(1)); /* 15.2.8.3.30 (x) */
|
||||
|
||||
/* Fixnum Class for compatibility */
|
||||
mrb_define_const(mrb, mrb->object_class, "Fixnum", mrb_obj_value(integer));
|
||||
|
||||
#ifndef MRB_NO_FLOAT
|
||||
/* Float Class */
|
||||
|
||||
+3
-3
@@ -1186,7 +1186,7 @@ range_arg:
|
||||
break;
|
||||
}
|
||||
|
||||
mrb_raise(mrb, E_TYPE_ERROR, "can't convert to Fixnum");
|
||||
mrb_raise(mrb, E_TYPE_ERROR, "can't convert to Integer");
|
||||
}
|
||||
}
|
||||
return STR_OUT_OF_RANGE;
|
||||
@@ -1230,8 +1230,8 @@ mrb_str_aref(mrb_state *mrb, mrb_value str, mrb_value indx, mrb_value alen)
|
||||
* str.slice(range) => new_str or nil
|
||||
* str.slice(other_str) => new_str or nil
|
||||
*
|
||||
* Element Reference---If passed a single <code>Fixnum</code>, returns the code
|
||||
* of the character at that position. If passed two <code>Fixnum</code>
|
||||
* Element Reference---If passed a single <code>Integer</code>, returns the code
|
||||
* of the character at that position. If passed two <code>Integer</code>
|
||||
* objects, returns a substring starting at the offset given by the first, and
|
||||
* a length given by the second. If given a range, a substring containing
|
||||
* characters at offsets given by the range is returned. In all three cases, if
|
||||
|
||||
Reference in New Issue
Block a user