|
7 | 7 |
|
8 | 8 | import org.jruby.Ruby; |
9 | 9 | import org.jruby.RubyArray; |
10 | | -import org.jruby.RubyBignum; |
11 | 10 | import org.jruby.RubyBoolean; |
12 | 11 | import org.jruby.RubyClass; |
13 | | -import org.jruby.RubyFixnum; |
14 | 12 | import org.jruby.RubyFloat; |
15 | 13 | import org.jruby.RubyHash; |
| 14 | +import org.jruby.RubyInteger; |
16 | 15 | import org.jruby.RubyNumeric; |
17 | 16 | import org.jruby.RubyString; |
18 | 17 | import org.jruby.runtime.ThreadContext; |
@@ -67,14 +66,14 @@ private Generator() { |
67 | 66 | Handler<? super T> getHandlerFor(Ruby runtime, T object) { |
68 | 67 | RubyClass metaClass = object.getMetaClass(); |
69 | 68 | if (metaClass == runtime.getString()) return (Handler)STRING_HANDLER; |
70 | | - if (metaClass == runtime.getFixnum()) return (Handler)FIXNUM_HANDLER; |
| 69 | + if (metaClass == runtime.getFixnum()) return (Handler)INTEGER_HANDLER; |
71 | 70 | if (metaClass == runtime.getHash()) return (Handler)HASH_HANDLER; |
72 | 71 | if (metaClass == runtime.getArray()) return (Handler)ARRAY_HANDLER; |
73 | 72 | if (object.isNil()) return (Handler)NIL_HANDLER; |
74 | 73 | if (object == runtime.getTrue()) return (Handler)TRUE_HANDLER; |
75 | 74 | if (object == runtime.getFalse()) return (Handler)FALSE_HANDLER; |
76 | 75 | if (metaClass == runtime.getFloat()) return (Handler)FLOAT_HANDLER; |
77 | | - if (metaClass == runtime.getBignum()) return (Handler)BIGNUM_HANDLER; |
| 76 | + if (metaClass == runtime.getBignum()) return (Handler)INTEGER_HANDLER; |
78 | 77 | return GENERIC_HANDLER; |
79 | 78 | } |
80 | 79 |
|
@@ -208,22 +207,11 @@ void generate(Session session, T object, ByteList buffer) { |
208 | 207 |
|
209 | 208 |
|
210 | 209 | /* Handlers */ |
211 | | - |
212 | | - static final Handler<RubyBignum> BIGNUM_HANDLER = |
213 | | - new Handler<RubyBignum>() { |
214 | | - @Override |
215 | | - void generate(Session session, RubyBignum object, ByteList buffer) { |
216 | | - // JRUBY-4751: RubyBignum.to_s() returns generic object |
217 | | - // representation (fixed in 1.5, but we maintain backwards |
218 | | - // compatibility; call to_s(IRubyObject[]) then |
219 | | - buffer.append(((RubyString)object.to_s(IRubyObject.NULL_ARRAY)).getByteList()); |
220 | | - } |
221 | | - }; |
222 | | - |
223 | | - static final Handler<RubyFixnum> FIXNUM_HANDLER = |
224 | | - new Handler<RubyFixnum>() { |
| 210 | + static final Handler<RubyInteger> INTEGER_HANDLER = |
| 211 | + new Handler<RubyInteger>() { |
225 | 212 | @Override |
226 | | - void generate(Session session, RubyFixnum object, ByteList buffer) { |
| 213 | + void generate(Session session, RubyInteger object, ByteList buffer) { |
| 214 | + RubyInteger integer = (RubyInteger)object; |
227 | 215 | buffer.append(object.to_s().getByteList()); |
228 | 216 | } |
229 | 217 | }; |
|
0 commit comments