mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
2000-03-15
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0d3f4a92cf
commit
d8f981b972
5 changed files with 17 additions and 28 deletions
|
@ -1,5 +1,12 @@
|
||||||
|
Wed Mar 15 17:26:05 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
|
||||||
|
|
||||||
|
* hash.c (rb_hash_s_create): unexpected recursive call removed.
|
||||||
|
this bug was found by Satoshi Nojo <nojo@t-samukawa.or.jp>.
|
||||||
|
|
||||||
Wed Mar 15 13:12:39 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
|
Wed Mar 15 13:12:39 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
|
||||||
|
|
||||||
|
* eval.c (Init_Thread): Thread.join removed finally.
|
||||||
|
|
||||||
* string.c (rb_str_chomp_bang): forgot to call rb_str_modify().
|
* string.c (rb_str_chomp_bang): forgot to call rb_str_modify().
|
||||||
|
|
||||||
Mon Mar 13 16:12:13 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
|
Mon Mar 13 16:12:13 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
|
||||||
|
|
3
configure
vendored
3
configure
vendored
|
@ -4941,10 +4941,9 @@ case "$target_os" in
|
||||||
# the main point is the '-v' flag of 'cc'.
|
# the main point is the '-v' flag of 'cc'.
|
||||||
case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
|
case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
|
||||||
*/gemc_cc*) # we have the new DEC GEM CC
|
*/gemc_cc*) # we have the new DEC GEM CC
|
||||||
CFLAGS="$CFLAGS -frpm d -ieee"
|
CFLAGS="$CFLAGS -oldc"
|
||||||
;;
|
;;
|
||||||
*) # we have the old MIPS CC
|
*) # we have the old MIPS CC
|
||||||
CFLAGS="$CFLAGS -oldc"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
# cleanup
|
# cleanup
|
||||||
|
|
|
@ -782,10 +782,9 @@ case "$target_os" in
|
||||||
# the main point is the '-v' flag of 'cc'.
|
# the main point is the '-v' flag of 'cc'.
|
||||||
case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
|
case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
|
||||||
*/gemc_cc*) # we have the new DEC GEM CC
|
*/gemc_cc*) # we have the new DEC GEM CC
|
||||||
CFLAGS="$CFLAGS -frpm d -ieee"
|
CFLAGS="$CFLAGS -oldc"
|
||||||
;;
|
;;
|
||||||
*) # we have the old MIPS CC
|
*) # we have the old MIPS CC
|
||||||
CFLAGS="$CFLAGS -oldc"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
# cleanup
|
# cleanup
|
||||||
|
|
10
eval.c
10
eval.c
|
@ -6940,15 +6940,6 @@ rb_thread_join(thread)
|
||||||
return thread;
|
return thread;
|
||||||
}
|
}
|
||||||
|
|
||||||
static VALUE
|
|
||||||
rb_thread_s_join(dmy, thread) /* will be removed in 1.4 */
|
|
||||||
VALUE dmy;
|
|
||||||
VALUE thread;
|
|
||||||
{
|
|
||||||
rb_warn("Thread::join is obsolete; use Thread#join instead");
|
|
||||||
return rb_thread_join(thread);
|
|
||||||
}
|
|
||||||
|
|
||||||
VALUE
|
VALUE
|
||||||
rb_thread_current()
|
rb_thread_current()
|
||||||
{
|
{
|
||||||
|
@ -7810,7 +7801,6 @@ Init_Thread()
|
||||||
rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1);
|
rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1);
|
||||||
rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0);
|
rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0);
|
||||||
rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0);
|
rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0);
|
||||||
rb_define_singleton_method(rb_cThread, "join", rb_thread_s_join, 1);
|
|
||||||
rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0);
|
rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0);
|
||||||
rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0);
|
rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0);
|
||||||
rb_define_singleton_method(rb_cThread, "list", rb_thread_list, 0);
|
rb_define_singleton_method(rb_cThread, "list", rb_thread_list, 0);
|
||||||
|
|
8
hash.c
8
hash.c
|
@ -223,8 +223,7 @@ rb_hash_s_create(argc, argv, klass)
|
||||||
VALUE hash;
|
VALUE hash;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (argc == 1) {
|
if (argc == 1 && TYPE(argv[0]) == T_HASH) {
|
||||||
if (TYPE(argv[0]) == T_HASH) {
|
|
||||||
NEWOBJ(hash, struct RHash);
|
NEWOBJ(hash, struct RHash);
|
||||||
OBJSETUP(hash, klass, T_HASH);
|
OBJSETUP(hash, klass, T_HASH);
|
||||||
|
|
||||||
|
@ -235,11 +234,6 @@ rb_hash_s_create(argc, argv, klass)
|
||||||
|
|
||||||
return (VALUE)hash;
|
return (VALUE)hash;
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
VALUE a = rb_Array(argv[0]);
|
|
||||||
return rb_hash_s_create(RARRAY(a)->len, RARRAY(a)->ptr, klass);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (argc % 2 != 0) {
|
if (argc % 2 != 0) {
|
||||||
rb_raise(rb_eArgError, "odd number args for Hash");
|
rb_raise(rb_eArgError, "odd number args for Hash");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue