Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ac2c7c6

Browse files
mehmeh
committedJan 12, 2014
WIP
1 parent bf01576 commit ac2c7c6

File tree

8 files changed

+786
-448
lines changed

8 files changed

+786
-448
lines changed
 

‎opal/corelib/complex.rb

+33
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
require 'corelib/numeric'
2+
13
class Complex < Numeric
4+
attr_reader :real, :imag
5+
6+
def initialize(real, imag)
7+
@real = real
8+
@imag = imag
9+
end
10+
11+
def denominator
12+
@real.denominator.lcm(@imag.denominator)
13+
end
14+
15+
alias imaginary imag
16+
17+
def numerator
18+
19+
end
20+
21+
def real?
22+
false
23+
end
24+
end
225

26+
module Kernel
27+
def Complex(real, imag = nil)
28+
if imag
29+
Complex.new(real, imag)
30+
elsif Integer === real
31+
Complex.new(real, 0)
32+
else
33+
raise NotImplementedError
34+
end
35+
end
336
end

‎opal/corelib/number.rb

+505
Large diffs are not rendered by default.

‎opal/corelib/numeric.rb

+35-445
Large diffs are not rendered by default.

‎opal/corelib/rational.rb

+205
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,208 @@
1+
require 'corelib/numeric'
2+
13
class Rational < Numeric
4+
attr_reader :numerator, :denominator
5+
6+
def initialize(numerator, denominator)
7+
@numerator = numerator
8+
@denominator = denominator
9+
end
10+
11+
def ==(other)
12+
case other
13+
when Rational
14+
@numerator == other.numerator && @denominator == other.denominator
15+
16+
when Integer
17+
@numerator == other && @denominator == 1
18+
19+
when Float
20+
to_f == other
21+
22+
else
23+
other == self
24+
end
25+
end
26+
27+
def +(other)
28+
case other
29+
when Rational
30+
num = @numerator * other.denominator + @denominator * other.numerator
31+
den = @denominator * other.denominator
32+
33+
Rational(num, den)
34+
35+
when Integer
36+
Rational(@numerator + other * @denominator, @denominator)
37+
38+
when Float
39+
to_f + other
40+
41+
else
42+
a, b = other.coerce(self)
43+
a + b
44+
end
45+
end
46+
47+
def -(other)
48+
case other
49+
when Rational
50+
num = @numerator * other.denominator - @denominator * other.numerator
51+
den = @denominator * other.denominator
52+
53+
Rational(num, den)
54+
55+
when Integer
56+
Rational(@numerator - other * @denominator, @denominator)
57+
58+
when Float
59+
to_f - other
60+
61+
else
62+
a, b = other.coerce(self)
63+
a - b
64+
end
65+
end
66+
67+
def *(other)
68+
case other
69+
when Rational
70+
num = @numerator * other.numerator
71+
den = @denominator * other.denominator
72+
73+
Rational(num, den)
74+
when Integer
75+
Rational(@numerator * other, @denominator)
76+
77+
when Float
78+
to_f * other
79+
80+
else
81+
a, b = other.coerce(self)
82+
a * b
83+
end
84+
end
85+
86+
def /(other)
87+
case other
88+
when Rational
89+
num = @numerator * other.denominator
90+
den = @denominator * other.numerator
91+
92+
Rational(num, den)
93+
94+
when Integer
95+
raise ZeroDivisionError, "divided by 0" if other == 0
96+
97+
Rational(@numerator, @denominator * other)
98+
99+
when Float
100+
to_f / other
101+
102+
else
103+
a, b = other.coerce(self)
104+
a / b
105+
end
106+
end
107+
108+
def **(other)
109+
raise NotImplementedError
110+
end
111+
112+
def abs
113+
if @numerator < 0
114+
Rational.new(-@numerator, @denominator)
115+
else
116+
self
117+
end
118+
end
119+
120+
def ceil(precision = 0)
121+
if precision == 0
122+
to_f.ceil
123+
else
124+
raise NotImplementedError
125+
end
126+
end
127+
128+
def coerce(other)
129+
case other
130+
when Integer
131+
[Rational.new(other, 1), self]
132+
133+
when Float
134+
[other, to_f]
135+
136+
else
137+
super
138+
end
139+
end
140+
141+
alias divide /
142+
143+
def floor(precision = 0)
144+
if precision == 0
145+
to_f.floor
146+
else
147+
raise NotImplementedError
148+
end
149+
end
150+
151+
def inspect
152+
"(#{to_s})"
153+
end
154+
155+
alias quo /
156+
157+
def rationalize(eps = undefined)
158+
raise NotImplementedError
159+
end
160+
161+
def round(precision = 0)
162+
return 0 if @numerator == 0
163+
164+
if precision == 0
165+
return @numerator if @denominator == 1
166+
167+
to_f.round
168+
else
169+
raise NotImplementedError
170+
end
171+
end
172+
173+
def to_f
174+
@numerator / @denominator
175+
end
176+
177+
def to_i
178+
truncate
179+
end
180+
181+
def to_r
182+
self
183+
end
184+
185+
def to_s
186+
"#@numerator/#@denominator"
187+
end
188+
189+
def truncate(precision = 0)
190+
if precision == 0
191+
@numerator < 0 ? ceil : floor
192+
else
193+
raise NotImplementedError
194+
end
195+
end
196+
end
2197

198+
module Kernel
199+
def Rational(numerator, denominator = nil)
200+
if denominator
201+
Rational.new(numerator, denominator)
202+
elsif Integer === numerator
203+
Rational.new(numerator, 1)
204+
else
205+
raise NotImplementedError
206+
end
207+
end
3208
end

‎opal/corelib/runtime.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@
876876

877877
bridge_class('Array', Array);
878878
bridge_class('Boolean', Boolean);
879-
bridge_class('Numeric', Number);
879+
bridge_class('Number', Number);
880880
bridge_class('String', String);
881881
bridge_class('Proc', Function);
882882
bridge_class('Exception', Error);

‎opal/corelib/string.rb

+4
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,10 @@ def to_proc
848848
}
849849
end
850850

851+
def to_r
852+
Rational(self)
853+
end
854+
851855
def to_s
852856
`self.toString()`
853857
end

‎opal/opal.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
require 'corelib/string'
1717
require 'corelib/match_data'
1818
require 'corelib/encoding'
19-
require 'corelib/numeric'
19+
require 'corelib/number'
2020
require 'corelib/complex'
2121
require 'corelib/rational'
2222
require 'corelib/math'

‎stdlib/json.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ def to_json
146146
end
147147
end
148148

149-
class Numeric
149+
# FIXME: temporary hack
150+
class Number # Numeric
150151
def to_json
151152
`self.toString()`
152153
end

0 commit comments

Comments
 (0)
Please sign in to comment.