1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

num2ll and num2ull

* ext/-test-/num2int/num2int.c (print_num2ll, print_num2ull): define
  only if long long is available, and use long long printf modifier
  checked by configure.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-18 15:21:04 +00:00
parent bd377449f0
commit f4aff7feb1
2 changed files with 8 additions and 5 deletions

View file

@ -72,13 +72,14 @@ print_num2ulong(VALUE obj, VALUE num)
return Qnil; return Qnil;
} }
#ifdef HAVE_LONG_LONG
static VALUE static VALUE
print_num2ll(VALUE obj, VALUE num) print_num2ll(VALUE obj, VALUE num)
{ {
char buf[128]; char buf[128];
VALUE str; VALUE str;
sprintf(buf, "%lld", NUM2LL(num)); sprintf(buf, "%"PRI_LL_PREFIX"d", NUM2LL(num));
str = rb_str_new_cstr(buf); str = rb_str_new_cstr(buf);
rb_io_write(rb_stdout, str); rb_io_write(rb_stdout, str);
return Qnil; return Qnil;
@ -90,12 +91,12 @@ print_num2ull(VALUE obj, VALUE num)
char buf[128]; char buf[128];
VALUE str; VALUE str;
sprintf(buf, "%llu", NUM2ULL(num)); sprintf(buf, "%"PRI_LL_PREFIX"u", NUM2ULL(num));
str = rb_str_new_cstr(buf); str = rb_str_new_cstr(buf);
rb_io_write(rb_stdout, str); rb_io_write(rb_stdout, str);
return Qnil; return Qnil;
} }
#endif
void void
Init_num2int(void) Init_num2int(void)
@ -111,7 +112,9 @@ Init_num2int(void)
rb_define_singleton_method(cNum2int, "print_num2long", print_num2long, 1); rb_define_singleton_method(cNum2int, "print_num2long", print_num2long, 1);
rb_define_singleton_method(cNum2int, "print_num2ulong", print_num2ulong, 1); rb_define_singleton_method(cNum2int, "print_num2ulong", print_num2ulong, 1);
#ifdef HAVE_LONG_LONG
rb_define_singleton_method(cNum2int, "print_num2ll", print_num2ll, 1); rb_define_singleton_method(cNum2int, "print_num2ll", print_num2ll, 1);
rb_define_singleton_method(cNum2int, "print_num2ull", print_num2ull, 1); rb_define_singleton_method(cNum2int, "print_num2ull", print_num2ull, 1);
#endif
} }

View file

@ -188,7 +188,7 @@ class TestNum2int < Test::Unit::TestCase
assert_output((FIXNUM_MAX+1).to_s) do assert_output((FIXNUM_MAX+1).to_s) do
Num2int.print_num2ll(FIXNUM_MAX+1) Num2int.print_num2ll(FIXNUM_MAX+1)
end end
end end if defined?(Num2int.print_num2ll)
def test_num2ull def test_num2ull
assert_output("0") do assert_output("0") do
@ -221,7 +221,7 @@ class TestNum2int < Test::Unit::TestCase
assert_output((FIXNUM_MAX+1).to_s) do assert_output((FIXNUM_MAX+1).to_s) do
Num2int.print_num2ull(FIXNUM_MAX+1) Num2int.print_num2ull(FIXNUM_MAX+1)
end end
end end if defined?(Num2int.print_num2ull)
end end