diff --git a/ChangeLog b/ChangeLog index 5bf1e31569..96076c1cf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,20 @@ Tue Jul 31 12:55:35 2001 Nobuyoshi.Nakada + + * marshal.c (marshal_load): ruby_verbose test should be wrapped by + RTEST(). + +Mon Jul 30 17:54:23 2001 Yukihiro Matsumoto + + * hash.c (rb_hash_index): should return nil (not the default + value) if value is not in the hash. + +Mon Jul 30 03:19:53 2001 Yukihiro Matsumoto + + * bignum.c (rb_cstr2inum): "0 ff".hex should return 0, not 255. + Fri Jul 27 18:07:27 2001 Yukihiro Matsumoto * eval.c (rb_provided): extension should be guessed using diff --git a/bignum.c b/bignum.c index 3159d143c7..226fe49e67 100644 --- a/bignum.c +++ b/bignum.c @@ -243,6 +243,10 @@ rb_cstr2inum(str, base) str += 2; } while (*str && *str == '0') str++; + if (ISSPACE(*str)) { + if (badcheck) goto bad; + return INT2FIX(0); + } if (!*str) str--; len = 4*strlen(str)*sizeof(char); } diff --git a/hash.c b/hash.c index 43c1526a14..4a829ab156 100644 --- a/hash.c +++ b/hash.c @@ -361,7 +361,7 @@ rb_hash_index(hash, value) VALUE args[2]; args[0] = value; - args[1] = RHASH(hash)->ifnone; + args[1] = Qnil; st_foreach(RHASH(hash)->tbl, index_i, args); diff --git a/marshal.c b/marshal.c index 8ef121119f..87f65b2d57 100644 --- a/marshal.c +++ b/marshal.c @@ -1067,7 +1067,7 @@ marshal_load(argc, argv) \tformat version %d.%d required; %d.%d given", MARSHAL_MAJOR, MARSHAL_MINOR, major, minor); } - if (ruby_verbose && minor != MARSHAL_MINOR) { + if (RTEST(ruby_verbose) && minor != MARSHAL_MINOR) { rb_warn("incompatible marshal file format (can be read)\n\ \tformat version %d.%d required; %d.%d given", MARSHAL_MAJOR, MARSHAL_MINOR, major, minor);