From 5821c7514836104b44892c046590b09d42d444b9 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 21 Nov 2012 05:09:19 +0000 Subject: [PATCH] revert r37710, requested by Tadayoshi Funaba [ruby-dev:46575] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ----- bignum.c | 3 +-- test/ruby/test_string.rb | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc2d7ac7f0..4d225ee050 100644 --- a/ChangeLog +++ b/ChangeLog @@ -308,11 +308,6 @@ Mon Nov 19 01:11:59 2012 Naohisa Goto * common.mk (vm.$(OBJEXT)): add dependency to probes_helper.h. * vm.c, vm_insnhelper.c: include probes_helper.h. -Sun Nov 18 20:46:08 2012 Tadayoshi Funaba - - * bignum.c (rb_cstr_to_inum): should accept underscores of - sequence of two or more when unchecked mode. - Sun Nov 18 16:33:00 2012 Naohisa Goto * configure.in, Makefile.in, common.mk: support DTrace on Solaris 10, diff --git a/bignum.c b/bignum.c index b6e551b837..97be53faf1 100644 --- a/bignum.c +++ b/bignum.c @@ -733,8 +733,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck) if (badcheck) goto bad; break; } - if (badcheck) - nondigit = (char) c; + nondigit = (char) c; continue; } else if ((c = conv_digit(c)) < 0) { diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 9f63847da3..2beaef3504 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1513,7 +1513,7 @@ class TestString < Test::Unit::TestCase assert_equal(12, "1_2".to_i(10)) assert_equal(0x40000000, "1073741824".to_i(10)) assert_equal(0x4000000000000000, "4611686018427387904".to_i(10)) - assert_equal(12, "1__2".to_i(10)) + assert_equal(1, "1__2".to_i(10)) assert_equal(1, "1_z".to_i(10)) bug6192 = '[ruby-core:43566]'