ruby-dev

> LP64 なマシンで test-all が動かなくなっています。

別の理由で、test-all が手元でできないですが、こんな感じでどうでしょう。


Index: complex.c
===================================================================
--- complex.c	(revision 15817)
+++ complex.c	(working copy)
@@ -70,12 +70,12 @@
 {
    VALUE _r;
    if (FIXNUM_P(y)) {
-     if (FIX2INT(y) == 0)
+     if (FIX2LONG(y) == 0)
        _r = x;
      else
        _r = rb_funcall(x, '+', 1, y);
    } else if (FIXNUM_P(x)) {
-     if (FIX2INT(x) == 0)
+     if (FIX2LONG(x) == 0)
        _r = y;
      else
        _r = rb_funcall(x, '+', 1, y);
@@ -85,10 +85,10 @@
 }
 
 inline static VALUE
-f_div(x, y)
+f_div(VALUE x, VALUE y)
 {
   VALUE _r;
-  if (FIXNUM_P(y) && FIX2INT(y) == 1)
+  if (FIXNUM_P(y) && FIX2LONG(y) == 1)
     _r = x;
    else
      _r = rb_funcall(x, '/', 1, y);
@@ -100,7 +100,7 @@
 {
    VALUE _r;
   if (FIXNUM_P(x) && FIXNUM_P(y))
-    _r = f_boolcast(FIX2INT(x) > FIX2INT(y));
+    _r = f_boolcast(FIX2LONG(x) > FIX2LONG(y));
   else
     _r = rb_funcall(x, '>', 1, y);
   return _r;
@@ -111,7 +111,7 @@
 {
    VALUE _r;
   if (FIXNUM_P(x) && FIXNUM_P(y))
-    _r = f_boolcast(FIX2INT(x) < FIX2INT(y));
+    _r = f_boolcast(FIX2LONG(x) < FIX2LONG(y));
   else
     _r = rb_funcall(x, '<', 1, y);
   return _r;
@@ -124,7 +124,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(y)) {
-     int _iy = FIX2INT(y);
+     long _iy = FIX2LONG(y);
      if (_iy == 0) {
        if (TYPE(x) == T_FLOAT)
 	 _r = rb_float_new(0.0);
@@ -135,7 +135,7 @@
      else
        _r = rb_funcall(x, '*', 1, y);
    } else if (FIXNUM_P(x)) {
-     int _ix = FIX2INT(x);
+     long _ix = FIX2LONG(x);
      if (_ix == 0) {
        if (TYPE(y) == T_FLOAT)
 	 _r = rb_float_new(0.0);
@@ -155,7 +155,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(y)) {
-     if (FIX2INT(y) == 0)
+     if (FIX2LONG(y) == 0)
        _r = x;
      else
        _r = rb_funcall(x, '-', 1, y);
@@ -189,7 +189,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(x) && FIXNUM_P(y)) {
-     int c = FIX2INT(x) - FIX2INT(y);
+     long c = FIX2LONG(x) - FIX2LONG(y);
      if (c > 0)
        c = 1;
      else if (c < 0)
@@ -208,7 +208,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(x) && FIXNUM_P(y))
-     _r = f_boolcast(FIX2INT(x) == FIX2INT(y));
+     _r = f_boolcast(FIX2LONG(x) == FIX2LONG(y));
    else
      _r = rb_funcall(x, id_equal_p, 1, y);
    return _r;
@@ -223,7 +223,7 @@
 {
    VALUE _r;
   if (FIXNUM_P(x))
-    _r = f_boolcast(FIX2INT(x) < 0);
+    _r = f_boolcast(FIX2LONG(x) < 0);
   else
     _r = rb_funcall(x, '<', 1, ZERO);
   return _r;
@@ -234,7 +234,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(x))
-     _r = f_boolcast(FIX2INT(x) == 0);
+     _r = f_boolcast(FIX2LONG(x) == 0);
    else
      _r = rb_funcall(x, id_equal_p, 1, ZERO);
    return _r;
@@ -245,7 +245,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(x))
-     _r = f_boolcast(FIX2INT(x) == 1);
+     _r = f_boolcast(FIX2LONG(x) == 1);
    else
      _r = rb_funcall(x, id_equal_p, 1, ONE);
    return _r;
Index: rational.c
===================================================================
--- rational.c	(revision 15818)
+++ rational.c	(working copy)
@@ -53,12 +53,12 @@
 {
    VALUE _r;
    if (FIXNUM_P(y)) {
-     if (FIX2INT(y) == 0)
+     if (FIX2LONG(y) == 0)
        _r = x;
      else
        _r = rb_funcall(x, '+', 1, y);
    } else if (FIXNUM_P(x)) {
-     if (FIX2INT(x) == 0)
+     if (FIX2LONG(x) == 0)
        _r = y;
      else
        _r = rb_funcall(x, '+', 1, y);
@@ -68,10 +68,10 @@
 }
 
 inline static VALUE
-f_div(x, y)
+f_div(VALUE x, VALUE y)
 {
   VALUE _r;
-  if (FIXNUM_P(y) && FIX2INT(y) == 1)
+  if (FIXNUM_P(y) && FIX2LONG(y) == 1)
     _r = x;
    else
      _r = rb_funcall(x, '/', 1, y);
@@ -83,7 +83,7 @@
 {
    VALUE _r;
   if (FIXNUM_P(x) && FIXNUM_P(y))
-    _r = f_boolcast(FIX2INT(x) > FIX2INT(y));
+    _r = f_boolcast(FIX2LONG(x) > FIX2LONG(y));
   else
     _r = rb_funcall(x, '>', 1, y);
   return _r;
@@ -94,7 +94,7 @@
 {
    VALUE _r;
   if (FIXNUM_P(x) && FIXNUM_P(y))
-    _r = f_boolcast(FIX2INT(x) < FIX2INT(y));
+    _r = f_boolcast(FIX2LONG(x) < FIX2LONG(y));
   else
     _r = rb_funcall(x, '<', 1, y);
   return _r;
@@ -107,7 +107,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(y)) {
-     int _iy = FIX2INT(y);
+     long _iy = FIX2LONG(y);
      if (_iy == 0) {
        if (TYPE(x) == T_FLOAT)
 	 _r = rb_float_new(0.0);
@@ -118,7 +118,7 @@
      else
        _r = rb_funcall(x, '*', 1, y);
    } else if (FIXNUM_P(x)) {
-     int _ix = FIX2INT(x);
+     long _ix = FIX2LONG(x);
      if (_ix == 0) {
        if (TYPE(y) == T_FLOAT)
 	 _r = rb_float_new(0.0);
@@ -138,7 +138,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(y)) {
-     if (FIX2INT(y) == 0)
+     if (FIX2LONG(y) == 0)
        _r = x;
      else
        _r = rb_funcall(x, '-', 1, y);
@@ -162,7 +162,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(x) && FIXNUM_P(y)) {
-     int c = FIX2INT(x) - FIX2INT(y);
+     long c = FIX2LONG(x) - FIX2LONG(y);
      if (c > 0)
        c = 1;
      else if (c < 0)
@@ -180,7 +180,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(x) && FIXNUM_P(y))
-     _r = f_boolcast(FIX2INT(x) == FIX2INT(y));
+     _r = f_boolcast(FIX2LONG(x) == FIX2LONG(y));
    else
      _r = rb_funcall(x, id_equal_p, 1, y);
    return _r;
@@ -194,7 +194,7 @@
 {
    VALUE _r;
   if (FIXNUM_P(x))
-    _r = f_boolcast(FIX2INT(x) < 0);
+    _r = f_boolcast(FIX2LONG(x) < 0);
   else
     _r = rb_funcall(x, '<', 1, ZERO);
   return _r;
@@ -205,7 +205,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(x))
-     _r = f_boolcast(FIX2INT(x) == 0);
+     _r = f_boolcast(FIX2LONG(x) == 0);
    else
      _r = rb_funcall(x, id_equal_p, 1, ZERO);
    return _r;
@@ -216,7 +216,7 @@
 {
    VALUE _r;
    if (FIXNUM_P(x))
-     _r = f_boolcast(FIX2INT(x) == 1);
+     _r = f_boolcast(FIX2LONG(x) == 1);
    else
      _r = rb_funcall(x, id_equal_p, 1, ONE);
    return _r;
@@ -319,7 +319,7 @@
 
   for (;;) {
     if (FIXNUM_P(x)) {
-      if (FIX2INT(x) == 0)
+      if (FIX2LONG(x) == 0)
 	return y;
       if (FIXNUM_P(y))
 	return LONG2NUM(i_gcd(FIX2LONG(x), FIX2LONG(y)));
@@ -897,7 +897,7 @@
     {
       get_dat1(self);
 
-      if (FIXNUM_P(dat->den) && FIX2INT(dat->den) == 1)
+      if (FIXNUM_P(dat->den) && FIX2LONG(dat->den) == 1)
 	return f_cmp(dat->num, other);
       else
 	return f_cmp(self, f_rational_new_bang1(CLASS_OF(self), other));
@@ -912,8 +912,8 @@
 
       if (FIXNUM_P(adat->num) && FIXNUM_P(adat->den) &&
 	  FIXNUM_P(bdat->num) && FIXNUM_P(bdat->den)) {
-	num1 = f_imul(FIX2INT(adat->num), FIX2INT(bdat->den));
-	num2 = f_imul(FIX2INT(bdat->num), FIX2INT(adat->den));
+	num1 = f_imul(FIX2LONG(adat->num), FIX2LONG(bdat->den));
+	num2 = f_imul(FIX2LONG(bdat->num), FIX2LONG(adat->den));
       } else {
 	num1 = f_mul(adat->num, bdat->den);
 	num2 = f_mul(bdat->num, adat->den);
@@ -939,7 +939,7 @@
 
       if (!FIXNUM_P(dat->den))
 	return Qfalse;
-      if (FIX2INT(dat->den) != 1)
+      if (FIX2LONG(dat->den) != 1)
 	return Qfalse;
       if (f_equal_p(dat->num, other))
 	return Qtrue;

Thread

Prev Next

In This Thread

Prev Next

[#33946] Symbol#inspect should use rb_str_inspect — sheepman <sheepman@...>

[#33947] Ruby 1.9.0-1 snapshot released — Yukihiro Matsumoto <matz@...>

[#33948] Schedule for the 1.8.7 release — "Akinori MUSHA" <knu@...>

[#33950] Ruby 1.9.0-1 build failure: error: `r15660' undeclared — "Hiroshi Ichikawa" <gimite@...>

[#33952] Float('1__1') — Tadayoshi Funaba <tadf@...>

[#33954] Mac OS X 10.5.2でruby-1.9.0-1のmake testが失敗 — 高尾 宏治 <kouji@...>

[#33955] --encoding affects script encoding — sheepman <sheepman@...>

[#33962] Ruby1.9.0でのインタプリタ組み込みについての質問 — Masayuki Yamaguchi <Yamaguchi.Masayuki@...>

[#33966] Re: [ruby-cvs:22881] Ruby:r15644 (trunk): * test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_chomp): test — Tanaka Akira <akr@...>

[#33967] $SAFE=1でLoadErrorではなくInsecure operationになる — "Ken Date" <itacchi@...>

[#33972] なぜ transcode.c の transcode_loop で from_utf8 が特別扱い — Martin Duerst <duerst@...>

[#33974] Test::Unit::Collector::Dirがtest_*.rb以外集めてくれない — "Ken Date" <itacchi@...>

[#33983] Re: [ruby-cvs:22913] Re: Ruby:r15674 (trunk): * gc.c (add_heap): sort heaps array in ascending order to use — Yukihiro Matsumoto <matz@...>

[#33989] Hash#compare_by_identity breaks commutativity of Hash#== — Tanaka Akira <akr@...>

[#33991] Maybe IRB bug!! by 09 — Tanaka Akira <akr@...>

[#33992] debug.rb:221:in `debug_command': undefined method `callcc' for #<DEBUGGER__::Context:0xb7a85914> (NoMethodError) — Tanaka Akira <akr@...>

[#33993] Re: [ruby-cvs:22935] Ruby:r15695 (trunk): * string.c (is_utf8_lead_byte, count_utf8_lead_bytes_with_ulong): — Tanaka Akira <akr@...>

[#33994] printf "[%08f]\n", 0.0/0.0 — Tanaka Akira <akr@...>

[#33996] No definition for sym_succ など — Martin Duerst <duerst@...>

[#34000] --program-suffix option of configure.bat(mswin32) — KIMURA Koichi <kimura.koichi@...>

[#34002] sprintf("% e", Inf) — Tanaka Akira <akr@...>

[#34005] Array#slice! may be too slow and allocate memory too much — "Yusuke ENDOH" <mame@...>

[#34006] 11.divmod(3.5) — Tanaka Akira <akr@...>

[#34008] local_variables contains strings — Tanaka Akira <akr@...>

[#34010] RUBY_*定数のencoding — Kazuhiro NISHIYAMA <zn@...>

[#34011] Should --verbose be equal to -v ? — Yugui <yugui@...>

[#34019] DelegateClassのバックトレース — "GO Noguchi" <gonoguti@...>

[#34020] MurmurHash problem — Nobuyoshi Nakada <nobu@...>

[#34021] singleton class extended by a module with module_function — Tanaka Akira <akr@...>

[#34022] patch of lazy sweep gc — authorNari <authornari@...>

[#34030] uint32_t — KIMURA Koichi <kimura.koichi@...>

[#34033] ruby coding guideline — "NARUSE, Yui" <naruse@...>

[#34037] Ruby performance gains on SPARC — Yukihiro Matsumoto <matz@...>

[#34042] IOはこれからもEnumerableなのか — rubikitch@...

[#34048] CGI::Cookie.new を高速化するバッチ — "Makoto Kuwata" <kwa@...>

[#34052] IO should provide #each_char and #chars — Yugui <yugui@...>

[#34059] putsでSEGV — rubikitch@...

[#34066] Bignum#div — Tadayoshi Funaba <tadf@...>

[#34067] Array#take,take_while,drop,drop_whlie — "Yusuke ENDOH" <mame@...>

[#34068] lgamma_r requires _REENTRANT on Solaris — "Yusuke ENDOH" <mame@...>

[#34071] procを組み合わせた再帰呼び出しで例外が投げられない — wanabe <s.wanabe@...>

[#34072] rb_memsearch optimization — "NARUSE, Yui" <naruse@...>

[#34077] 異なるエンコーディングだと同じバイト列でも==にならない件 — rubikitch@...

[#34086] extend spawn to change attributes of child process. — Tanaka Akira <akr@...>

[#34093] 拡張ライブラリ初期化中でのmodule_eval — Kouhei Sutou <kou@...>

[#34094] tempfile.unlink 後に tempfile.close — SATOH Fumiyasu <fumiyas@...>

[#34095] (再送) Cygwin で Resolv.getaddress が失敗する — Kouhei Yanagita <yanagi@...>

[#34100] delegate Kernel#{gets,readline,readlines} to ARGF — Nobuyoshi Nakada <nobu@...>

[#34105] rational.rb, complex.rb and mathn.rb — Tadayoshi Funaba <tadf@...>

[#34109] LP64: date.rb:321:in `convert': integer 86400000000000 too big to convert to `int' (RangeError) — Tanaka Akira <akr@...>

[#34112] Module#define_methodがprivateなわけ — rubikitch@...

[#34114] Is 'Class.new(Class)' valid? — rucila <rucila@...>

[#34116] Improving Fixnum#gcd(Fixnum) — "Akinori MUSHA" <knu@...>

[#34117] backporting features from 1.9 to 1.8 — "Akinori MUSHA" <knu@...>

[#34119] Process.daemon kills other threads — Tanaka Akira <akr@...>

[#34122] --disable=all --enable=gems — Kazuhiro NISHIYAMA <zn@...>

[#34128] enumerator with certain built-in methods dumps core — "Yusuke ENDOH" <mame@...>

[#34136] thread.c (fastthread)の状況 — Daigo Moriwaki <techml@...>

[#34144] [質問２点] C からの定数参照 & thread switching コストの低減 — Hidetoshi NAGAI <nagai@...>

[#34150] sigsetjmp significantly slower on OSX. — Yukihiro Matsumoto <matz@...>

[#34158] Complex組み込み — Masahiro TANAKA <masa16.tanaka@...>

[#34159] ruby-trunk Marshal.dump bug — nagachika <rucila@...>

[#34162] GC heap size less patch — authorNari <authornari@...>

[#34163] Array#shift/unshift の高速化 — wanabe <s.wanabe@...>

[#34180] メソッドにクラスを定義させるとprivateになる？ — rubikitch@...

[#34184] Re: [ruby-cvs:23097] Ruby:r15858 (trunk): * io.c: IO.copy_stream implemented. — "U.Nakamura" <usa@...>

[#34189] Re: [ruby-cvs:23106] Re: Ruby:r15866 (trunk): * numeric.c (num_quo): should convert its operand to Rational. — Tadayoshi Funaba <tadf@...>

[#34191] Object#singleton_class — rubikitch@...

[ruby-dev:34110] Re: LP64: date.rb:321:in `convert': integer 86400000000000 too big to convert to `int' (RangeError)

Thread

In This Thread

[#33954] Mac OS X 10.5.2でruby-1.9.0-1のmake testが失敗 — 高尾宏治 <kouji@...>

[#34072] rb_memsearch　optimization — "NARUSE, Yui" <naruse@...>