Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
9d058342
Unverified
Commit
9d058342
authored
Mar 24, 2021
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rational.c: implement `Rational#-` in C.
parent
7a35b642
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
12 deletions
+52
-12
mrbgems/mruby-rational/mrblib/rational.rb
mrbgems/mruby-rational/mrblib/rational.rb
+0
-10
mrbgems/mruby-rational/src/rational.c
mrbgems/mruby-rational/src/rational.c
+52
-2
No files found.
mrbgems/mruby-rational/mrblib/rational.rb
View file @
9d058342
...
...
@@ -17,16 +17,6 @@ class Rational < Numeric
end
end
def
-
(
rhs
)
if
rhs
.
is_a?
Rational
Rational
(
numerator
*
rhs
.
denominator
-
rhs
.
numerator
*
denominator
,
denominator
*
rhs
.
denominator
)
elsif
rhs
.
is_a?
Integer
Rational
(
numerator
-
rhs
*
denominator
,
denominator
)
elsif
rhs
.
is_a?
Numeric
(
numerator
-
rhs
*
denominator
)
/
denominator
end
end
def
/
(
rhs
)
if
rhs
.
is_a?
Rational
Rational
(
numerator
*
rhs
.
denominator
,
denominator
*
rhs
.
numerator
)
...
...
mrbgems/mruby-rational/src/rational.c
View file @
9d058342
...
...
@@ -457,8 +457,57 @@ rational_add(mrb_state *mrb, mrb_value x)
}
}
mrb_int
mrb_num_div_int
(
mrb_state
*
,
mrb_int
,
mrb_int
);
mrb_value
mrb_complex_new
(
mrb_state
*
,
mrb_float
,
mrb_float
);
#ifndef MRB_NO_FLOAT
mrb_value
mrb_complex_new
(
mrb_state
*
,
mrb_float
,
mrb_float
);
#endif
static
mrb_value
rational_sub
(
mrb_state
*
mrb
,
mrb_value
x
)
{
struct
mrb_rational
*
p1
=
rational_ptr
(
mrb
,
x
);
mrb_value
y
=
mrb_get_arg1
(
mrb
);
switch
(
mrb_type
(
y
))
{
case
MRB_TT_INTEGER
:
{
mrb_int
z
=
mrb_integer
(
y
);
if
(
mrb_int_mul_overflow
(
z
,
p1
->
denominator
,
&
z
))
rat_overflow
(
mrb
);
if
(
mrb_int_sub_overflow
(
p1
->
numerator
,
z
,
&
z
))
rat_overflow
(
mrb
);
return
rational_new_i
(
mrb
,
z
,
p1
->
denominator
);
}
case
MRB_TT_RATIONAL
:
{
struct
mrb_rational
*
p2
=
rational_ptr
(
mrb
,
y
);
mrb_int
a
,
b
;
if
(
mrb_int_mul_overflow
(
p1
->
numerator
,
p2
->
denominator
,
&
a
))
rat_overflow
(
mrb
);
if
(
mrb_int_mul_overflow
(
p2
->
numerator
,
p1
->
denominator
,
&
b
))
rat_overflow
(
mrb
);
if
(
mrb_int_sub_overflow
(
a
,
b
,
&
a
))
rat_overflow
(
mrb
);
if
(
mrb_int_mul_overflow
(
p1
->
denominator
,
p2
->
denominator
,
&
b
))
rat_overflow
(
mrb
);
return
rational_new_i
(
mrb
,
a
,
b
);
}
#if defined(MRB_USE_COMPLEX)
case
MRB_TT_COMPLEX
:
x
=
mrb_complex_new
(
mrb
,
rat_to_flo
(
p1
),
0
);
return
mrb_funcall_id
(
mrb
,
x
,
MRB_OPSYM
(
sub
),
1
,
y
);
#endif
#ifndef MRB_NO_FLOAT
case
MRB_TT_FLOAT
:
default:
{
mrb_float
z
=
p1
->
numerator
-
mrb_to_flo
(
mrb
,
y
)
*
p1
->
denominator
;
return
mrb_float_value
(
mrb
,
mrb_num_div_flo
(
mrb
,
z
,
(
mrb_float
)
p1
->
denominator
));
}
#else
default:
mrb_raise
(
mrb
,
E_TYPE_ERROR
,
"non integer subtraction"
);
#endif
}
}
mrb_int
mrb_num_div_int
(
mrb_state
*
,
mrb_int
,
mrb_int
);
/* 15.2.8.3.4 */
/*
...
...
@@ -544,6 +593,7 @@ void mrb_mruby_rational_gem_init(mrb_state *mrb)
mrb_define_method
(
mrb
,
rat
,
"=="
,
rational_eq
,
MRB_ARGS_REQ
(
1
));
mrb_define_method
(
mrb
,
rat
,
"-@"
,
rational_minus
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
rat
,
"+"
,
rational_add
,
MRB_ARGS_REQ
(
1
));
mrb_define_method
(
mrb
,
rat
,
"-"
,
rational_sub
,
MRB_ARGS_REQ
(
1
));
mrb_define_method
(
mrb
,
mrb
->
integer_class
,
"to_r"
,
fix_to_r
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
mrb
->
integer_class
,
"/"
,
int_div
,
MRB_ARGS_REQ
(
1
));
/* overrride */
mrb_define_method
(
mrb
,
mrb
->
integer_class
,
"quo"
,
int_quo
,
MRB_ARGS_REQ
(
1
));
/* overrride */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment