From 173976c97c9426aa8d96e53aef6c0e570c5fdfda Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Fri, 14 Oct 1994 13:22:18 +0900 Subject: version 0.52 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://cache.ruby-lang.org/pub/ruby/1.0/ruby-0.51-0.52.diff.gz Fri Oct 14 13:22:18 1994 Yukihiro Matsumoto (matz@ix-02) * version 0.52: ……なんてこったい. * eval.c(rb_call): returnの処理が間違っていたので, マシンによって はreturnで関数を終了するだけでなくtoplevelまでつき抜けていた. * object.c: Builtinクラスを新設. 組み込み関数をKernelから移した. nilが組み込み関数を理解するとトラブルの元である. * dbm.c: Dictと同様にeachが[key,value]を返すように. --- ChangeLog | 20 +++++++++++++++++--- Makefile.in | 2 +- ToDo | 1 + array.c | 2 +- bignum.c | 2 +- class.c | 2 +- compar.c | 2 +- dbm.c | 8 ++++---- dict.c | 8 ++++---- dir.c | 2 +- dln.c | 2 +- env.h | 4 ++-- error.c | 2 +- etc.c | 2 +- eval.c | 28 ++++++++++++++++------------ file.c | 2 +- gc.c | 2 +- inits.c | 2 +- io.c | 26 +++++++++++++------------- math.c | 2 +- newver.rb | 19 +++++++++++++++++++ node.h | 2 +- numeric.c | 2 +- object.c | 42 ++++++++++++++++++++++-------------------- pack.c | 2 +- parse.y | 2 +- process.c | 22 +++++++++++----------- random.c | 8 ++++---- range.c | 2 +- re.c | 2 +- ruby.1 | 2 +- ruby.c | 2 +- ruby.h | 2 +- socket.c | 2 +- spec | 29 ++++++++++++++++++++--------- sprintf.c | 2 +- string.c | 8 ++++---- version.h | 4 ++-- 38 files changed, 163 insertions(+), 112 deletions(-) create mode 100644 newver.rb diff --git a/ChangeLog b/ChangeLog index c688643..11f5773 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Fri Oct 14 13:22:18 1994 Yukihiro Matsumoto (matz@ix-02) + + * version 0.52: ġĤʤƤä. + + * eval.c(rb_call): returnνְäƤΤ, ޥˤä + returnǴؿλǤʤtoplevelޤǤĤȴƤ. + + * object.c: Builtin饹. Ȥ߹ߴؿKernelܤ. + nilȤ߹ߴؿ򤹤ȥȥ֥θǤ. + + * dbm.c: DictƱͤeach[key,value]֤褦. + + * version 0.51 + Thu Oct 13 12:13:48 1994 Yukihiro Matsumoto (matz@ix-02) * eval.c(SETUP_ARGS): ղñ黻ҤǤʤˤѴ. @@ -26,9 +40,9 @@ Tue Oct 11 17:10:46 1994 Yukihiro Matsumoto (matz@ix-02) * io.c(to_i): IO饹Υ󥹥󥹤ѴȤΥե һҤ֤褦. - * numeric.c(num2int): to_i᥽åɤȤä, Ǥ¤Ѵ - . num2fixƤΥ֥ȤФto_i᥽åɤ - ŬѤƤ. + * numeric.c(num2int): to_i᥽åɤȤäƤǤ¤Ѵ. + num2fixƤΥ֥ȤФto_i᥽åɤŬ + Ƥ. * sprintf.c(Fsprintf): ɽκ, ֥ȤǤ¤ Ѵ褦(to_i᥽åɤȤ). diff --git a/Makefile.in b/Makefile.in index 7cb2829..4c8b457 100644 --- a/Makefile.in +++ b/Makefile.in @@ -142,7 +142,7 @@ install: $(bindir)/$(PROGRAM) clean:; @rm -f $(OBJS) realclean:; @rm -f $(OBJS) - @rm -f core ruby *~ + @rm -f core ruby *~ config.status Makefile dbm.o:dbm.c $(CC) -c $(DBM) $(CFLAGS) $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/lib dbm.c diff --git a/ToDo b/ToDo index 001675c..cd572cf 100644 --- a/ToDo +++ b/ToDo @@ -1,3 +1,4 @@ +* trBSDɤ * Ŭڤsignal handling * dlnCOFFб * rubyѿhookμ¸ diff --git a/array.c b/array.c index 6193db0..581e028 100644 --- a/array.c +++ b/array.c @@ -3,7 +3,7 @@ array.c - $Author: matz $ - $Date: 1994/08/12 11:06:34 $ + $Date: 1994/10/14 06:19:01 $ created at: Fri Aug 6 09:46:12 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/bignum.c b/bignum.c index 623a6a8..f83c5ec 100644 --- a/bignum.c +++ b/bignum.c @@ -3,7 +3,7 @@ bignum.c - $Author: matz $ - $Date: 1994/08/12 04:47:06 $ + $Date: 1994/10/14 06:19:03 $ created at: Fri Jun 10 00:48:55 JST 1994 ************************************************/ diff --git a/class.c b/class.c index ddadfbf..075c847 100644 --- a/class.c +++ b/class.c @@ -3,7 +3,7 @@ class.c - $Author: matz $ - $Date: 1994/08/12 11:06:35 $ + $Date: 1994/10/14 06:19:04 $ created at: Tue Aug 10 15:05:44 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/compar.c b/compar.c index f2d773e..e3861b7 100644 --- a/compar.c +++ b/compar.c @@ -3,7 +3,7 @@ compar.c - $Author: matz $ - $Date: 1994/08/12 04:47:09 $ + $Date: 1994/10/14 06:19:05 $ created at: Thu Aug 26 14:39:48 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/dbm.c b/dbm.c index 4640d48..0e310f6 100644 --- a/dbm.c +++ b/dbm.c @@ -3,7 +3,7 @@ dbm.c - $Author: matz $ - $Date: 1994/08/12 11:06:37 $ + $Date: 1994/10/14 10:00:51 $ created at: Mon Jan 24 15:59:52 JST 1994 Copyright (C) 1994 Yukihiro Matsumoto @@ -243,7 +243,7 @@ Fdbm_length(obj) } static VALUE -Fdbm_each(obj) +Fdbm_each_value(obj) VALUE obj; { datum key, val; @@ -396,8 +396,8 @@ Init_DBM() rb_define_method(C_DBM, "indexes", Fdbm_indexes, -2); rb_define_method(C_DBM, "length", Fdbm_length, 0); rb_define_alias(C_DBM, "size", "length"); - rb_define_method(C_DBM, "each", Fdbm_each, 0); - rb_define_method(C_DBM, "each_value", Fdbm_each, 0); + rb_define_method(C_DBM, "each", Fdbm_each_pair, 0); + rb_define_method(C_DBM, "each_value", Fdbm_each_value, 0); rb_define_method(C_DBM, "each_key", Fdbm_each_key, 0); rb_define_method(C_DBM, "each_pair", Fdbm_each_pair, 0); rb_define_method(C_DBM, "keys", Fdbm_keys, 0); diff --git a/dict.c b/dict.c index 19df65b..419918f 100644 --- a/dict.c +++ b/dict.c @@ -3,7 +3,7 @@ dict.c - $Author: matz $ - $Date: 1994/08/12 04:47:13 $ + $Date: 1994/10/14 10:00:52 $ created at: Mon Nov 22 18:51:18 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto @@ -523,7 +523,7 @@ Fsetenv(obj, name, value) Init_Dict() { - extern VALUE C_Kernel; + extern VALUE C_Builtin; extern VALUE M_Enumerable; static VALUE envtbl; @@ -578,6 +578,6 @@ Init_Dict() envtbl = obj_alloc(C_EnvDict); rb_define_variable("$ENV", &envtbl, Qnil, rb_readonly_hook); - rb_define_method(C_Kernel, "getenv", Fgetenv, 1); - rb_define_method(C_Kernel, "setenv", Fsetenv, 2); + rb_define_method(C_Builtin, "getenv", Fgetenv, 1); + rb_define_method(C_Builtin, "setenv", Fsetenv, 2); } diff --git a/dir.c b/dir.c index c621f85..0e9b3b4 100644 --- a/dir.c +++ b/dir.c @@ -3,7 +3,7 @@ dir.c - $Author: matz $ - $Date: 1994/08/12 11:06:38 $ + $Date: 1994/10/14 06:19:12 $ created at: Wed Jan 5 09:51:01 JST 1994 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/dln.c b/dln.c index 6df511c..0b4ea6b 100644 --- a/dln.c +++ b/dln.c @@ -3,7 +3,7 @@ dln.c - $Author: matz $ - $Date: 1994/08/12 04:47:16 $ + $Date: 1994/10/14 06:19:13 $ created at: Tue Jan 18 17:05:06 JST 1994 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/env.h b/env.h index 66a873d..fbb7ebd 100644 --- a/env.h +++ b/env.h @@ -3,8 +3,8 @@ env.h - $Author: matz $ - $Revision: 1.3 $ - $Date: 1994/08/12 11:06:39 $ + $Revision: 1.4 $ + $Date: 1994/10/14 06:19:14 $ created at: Mon Jul 11 11:53:03 JST 1994 ************************************************/ diff --git a/error.c b/error.c index 1596f57..33309af 100644 --- a/error.c +++ b/error.c @@ -3,7 +3,7 @@ error.c - $Author: matz $ - $Date: 1994/08/12 04:47:21 $ + $Date: 1994/10/14 06:19:16 $ created at: Mon Aug 9 16:11:34 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/etc.c b/etc.c index 7c88a64..854d000 100644 --- a/etc.c +++ b/etc.c @@ -3,7 +3,7 @@ etc.c - $Author: matz $ - $Date: 1994/08/24 09:25:27 $ + $Date: 1994/10/14 06:19:17 $ created at: Tue Mar 22 18:39:19 JST 1994 ************************************************/ diff --git a/eval.c b/eval.c index 4a7241e..21f7ecd 100644 --- a/eval.c +++ b/eval.c @@ -3,7 +3,7 @@ eval.c - $Author: matz $ - $Date: 1994/08/24 09:25:28 $ + $Date: 1994/10/14 10:00:53 $ created at: Thu Jun 10 14:22:17 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto @@ -1139,7 +1139,9 @@ rb_exit(status) int status; { last_val = INT2FIX(status); - JUMP_TAG(TAG_EXIT); + if (prot_tag) + JUMP_TAG(TAG_EXIT); + exit(FIX2UINT(last_val)); } VALUE @@ -1519,7 +1521,6 @@ rb_call(class, recv, mid, argc, argv) int argc; ID mid; { - int state, go_out; NODE *body; VALUE result; VALUE saved_self = Qself; @@ -1655,6 +1656,8 @@ rb_call(class, recv, mid, argc, argv) } } else { + int state; + PUSH_ENV(); the_env->local_vars = Qnil; @@ -1670,10 +1673,13 @@ rb_call(class, recv, mid, argc, argv) #endif PUSH_TAG(); - switch (state = EXEC_TAG()) { - case 0: + state = EXEC_TAG(); + if (state == 0) { result = rb_eval(body); - go_out=0; + } + POP_TAG(); + switch (state) { + case 0: break; case TAG_CONTINUE: Fatal("unexpected continue"); @@ -1691,11 +1697,9 @@ rb_call(class, recv, mid, argc, argv) result = last_val; break; default: - go_out=1; + JUMP_TAG(state); } - POP_TAG(); POP_ENV(); - if (go_out) JUMP_TAG(state); } Qself = saved_self; the_env->iterator = saved_ilevel; @@ -2004,7 +2008,7 @@ addpath(path) Init_load() { - extern VALUE C_Kernel; + extern VALUE C_Builtin; extern VALUE rb_check_str(); char *path; @@ -2015,6 +2019,6 @@ Init_load() addpath(getenv("RUBYLIB")); addpath(RUBY_LIB); - rb_define_method(C_Kernel, "load", Fload, 1); - rb_define_method(C_Kernel, "require", Frequire, 1); + rb_define_method(C_Builtin, "load", Fload, 1); + rb_define_method(C_Builtin, "require", Frequire, 1); } diff --git a/file.c b/file.c index d9a303e..ebb9251 100644 --- a/file.c +++ b/file.c @@ -4,7 +4,7 @@ file.c - $Author: matz $ - $Date: 1994/08/18 07:06:21 $ + $Date: 1994/10/14 06:19:20 $ created at: Mon Nov 15 12:24:34 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/gc.c b/gc.c index 1eebe39..ea9ceeb 100644 --- a/gc.c +++ b/gc.c @@ -3,7 +3,7 @@ gc.c - $Author: matz $ - $Date: 1994/08/12 04:47:27 $ + $Date: 1994/10/14 06:19:22 $ created at: Tue Oct 5 09:44:46 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/inits.c b/inits.c index 873f11b..3df1d27 100644 --- a/inits.c +++ b/inits.c @@ -3,7 +3,7 @@ inits.c - $Author: matz $ - $Date: 1994/08/19 09:32:02 $ + $Date: 1994/10/14 06:19:24 $ created at: Tue Dec 28 16:01:58 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/io.c b/io.c index 429a1b9..8e0c6d8 100644 --- a/io.c +++ b/io.c @@ -3,7 +3,7 @@ io.c - $Author: matz $ - $Date: 1994/08/12 11:06:40 $ + $Date: 1994/10/14 10:00:55 $ created at: Fri Oct 15 18:08:59 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto @@ -1261,26 +1261,26 @@ VALUE rb_readonly_hook(); Init_IO() { - extern VALUE C_Kernel; + extern VALUE C_Builtin; id_write = rb_intern("write"); id_fd = rb_intern("fd"); id_print_on = rb_intern("print_on"); - rb_define_method(C_Kernel, "syscall", Fsyscall, -1); + rb_define_method(C_Builtin, "syscall", Fsyscall, -1); - rb_define_method(C_Kernel, "open", Fopen, -2); - rb_define_method(C_Kernel, "printf", Fprintf, -1); - rb_define_method(C_Kernel, "print", Fprint, -1); - rb_define_method(C_Kernel, "gets", Fgets, 0); - rb_define_alias(C_Kernel,"readline", "gets"); - rb_define_method(C_Kernel, "eof", Feof, 0); - rb_define_method(C_Kernel, "getc", Fgetc, 0); - rb_define_method(C_Kernel, "select", Fselect, -2); + rb_define_method(C_Builtin, "open", Fopen, -2); + rb_define_method(C_Builtin, "printf", Fprintf, -1); + rb_define_method(C_Builtin, "print", Fprint, -1); + rb_define_method(C_Builtin, "gets", Fgets, 0); + rb_define_alias(C_Builtin,"readline", "gets"); + rb_define_method(C_Builtin, "eof", Feof, 0); + rb_define_method(C_Builtin, "getc", Fgetc, 0); + rb_define_method(C_Builtin, "select", Fselect, -2); - rb_define_method(C_Kernel, "readlines", Freadlines, 0); + rb_define_method(C_Builtin, "readlines", Freadlines, 0); - rb_define_method(C_Kernel, "print_on", Fprint_on, 1); + rb_define_method(C_Builtin, "print_on", Fprint_on, 1); C_IO = rb_define_class("IO", C_Object); rb_include_module(C_IO, M_Enumerable); diff --git a/math.c b/math.c index 6beb8a6..5096ba6 100644 --- a/math.c +++ b/math.c @@ -3,7 +3,7 @@ math.c - $Author: matz $ - $Date: 1994/08/12 04:47:35 $ + $Date: 1994/10/14 06:19:27 $ created at: Tue Jan 25 14:12:56 JST 1994 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/newver.rb b/newver.rb new file mode 100644 index 0000000..a8cad4d --- /dev/null +++ b/newver.rb @@ -0,0 +1,19 @@ +#! /usr/local/bin/ruby +f = open("version.h", "r") +f.gets() +f.close + +if $_ =~ /"(\d+)\.(\d+)"/; + f = open("version.h", "w") + i = $2.to_i + if $ARGV[0] == "-f" + i += 1 + end + date = Time.now.strftime("%d %b %y") + printf("ruby version %d.%0d (%s)\n", $1, i, date) + printf(f, "#define RUBY_VERSION \"%d.%0d\"\n", $1, i) + printf(f, "#define VERSION_DATE \"%s\"\n", date) + f.close +else + printf("match error - %s\n", $_) +end diff --git a/node.h b/node.h index 9b9e53fb..702f1e9 100644 --- a/node.h +++ b/node.h @@ -3,7 +3,7 @@ node.h - $Author: matz $ - $Date: 1994/08/24 09:25:29 $ + $Date: 1994/10/14 06:19:30 $ created at: Fri May 28 15:14:02 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/numeric.c b/numeric.c index 07d3ec7..9d13126 100644 --- a/numeric.c +++ b/numeric.c @@ -3,7 +3,7 @@ numeric.c - $Author: matz $ - $Date: 1994/08/12 04:47:41 $ + $Date: 1994/10/14 06:19:31 $ created at: Fri Aug 13 18:33:09 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/object.c b/object.c index 53a9e30..e7e4539 100644 --- a/object.c +++ b/object.c @@ -3,7 +3,7 @@ object.c - $Author: matz $ - $Date: 1994/08/12 04:47:42 $ + $Date: 1994/10/14 10:00:56 $ created at: Thu Jul 15 12:01:24 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto @@ -17,12 +17,12 @@ #include VALUE C_Kernel; +VALUE C_Builtin; VALUE C_Object; VALUE C_Module; VALUE C_Class; VALUE C_Nil; VALUE C_Data; -VALUE C_Method; struct st_table *new_idhash(); @@ -348,11 +348,13 @@ Init_Object() VALUE metaclass; C_Kernel = boot_defclass("Kernel", Qnil); - C_Object = boot_defclass("Object", C_Kernel); + C_Builtin = boot_defclass("Builtin", C_Kernel); + C_Object = boot_defclass("Object", C_Builtin); C_Module = boot_defclass("Module", C_Object); C_Class = boot_defclass("Class", C_Module); metaclass = RBASIC(C_Kernel)->class = single_class_new(C_Class); + metaclass = RBASIC(C_Builtin)->class = single_class_new(metaclass); metaclass = RBASIC(C_Object)->class = single_class_new(metaclass); metaclass = RBASIC(C_Module)->class = single_class_new(metaclass); metaclass = RBASIC(C_Class)->class = single_class_new(metaclass); @@ -366,10 +368,13 @@ Init_Object() * | Kernel----->(Kernel) | * | ^ ^ ^ ^ | * | | | | | | - * | +---+ +----+ | +---+ | - * | | +-----|----+ | | - * | | | | | | - * +->Nil->(Nil) Object---->(Object) | + * | +---+ +-----+ | +---+ | + * | | +------|---+ | | + * | | | | | | + * +->Nil->(Nil) Builtin--->(Builtin) | + * ^ ^ | + * | | | + * Object---->(Object) | * ^ ^ ^ ^ | * | | | | | * | | +-------+ | | @@ -403,16 +408,16 @@ Init_Object() rb_define_method(C_Kernel, "_inspect", Fkrn_inspect, 0); #ifdef USE_CALLER - rb_define_method(C_Kernel, "caller", Fcaller, -2); + rb_define_method(C_Builtin, "caller", Fcaller, -2); #endif - rb_define_method(C_Kernel, "exit", Fexit, -2); - rb_define_method(C_Kernel, "eval", Feval, 1); - rb_define_method(C_Kernel, "defined", Fdefined, 1); - rb_define_method(C_Kernel, "sprintf", Fsprintf, -1); - rb_define_alias(C_Kernel, "format", "sprintf"); - rb_define_method(C_Kernel, "iterator_p", Fiterator_p, 0); + rb_define_method(C_Builtin, "exit", Fexit, -2); + rb_define_method(C_Builtin, "eval", Feval, 1); + rb_define_method(C_Builtin, "defined", Fdefined, 1); + rb_define_method(C_Builtin, "sprintf", Fsprintf, -1); + rb_define_alias(C_Builtin, "format", "sprintf"); + rb_define_method(C_Builtin, "iterator_p", Fiterator_p, 0); - rb_define_method(C_Kernel, "apply", Fapply, -2); + rb_define_method(C_Builtin, "apply", Fapply, -2); rb_define_method(C_Object, "_inspect", Fobj_inspect, 0); @@ -442,9 +447,6 @@ Init_Object() rb_define_method(C_Data, "clone", Fcant_clone, 0); rb_define_method(C_Data, "class", Fdata_class, 0); - C_Method = rb_define_class("Method", C_Kernel); - rb_define_method(C_Method, "clone", Fcant_clone, 0); - eq = rb_intern("=="); match = rb_intern("=~"); @@ -453,7 +455,7 @@ Init_Object() TRUE = obj_alloc(C_Object); rb_define_single_method(TRUE, "to_s", Ftrue_to_s, 0); - rb_define_const(C_Kernel, "%TRUE", TRUE); - rb_define_const(C_Kernel, "%FALSE", FALSE); + rb_define_const(C_Builtin, "%TRUE", TRUE); + rb_define_const(C_Builtin, "%FALSE", FALSE); } diff --git a/pack.c b/pack.c index ded70be..fbedc67 100644 --- a/pack.c +++ b/pack.c @@ -3,7 +3,7 @@ pack.c - $Author: matz $ - $Date: 1994/08/12 04:47:44 $ + $Date: 1994/10/14 06:19:34 $ created at: Thu Feb 10 15:17:05 JST 1994 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/parse.y b/parse.y index 74774d8..18ab233 100644 --- a/parse.y +++ b/parse.y @@ -3,7 +3,7 @@ parse.y - $Author: matz $ - $Date: 1994/08/25 09:21:07 $ + $Date: 1994/10/14 06:19:35 $ created at: Fri May 28 18:02:42 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/process.c b/process.c index 96fb4ce..15f101e 100644 --- a/process.c +++ b/process.c @@ -3,7 +3,7 @@ process.c - $Author: matz $ - $Date: 1994/08/12 04:47:47 $ + $Date: 1994/10/14 10:00:58 $ created at: Tue Aug 10 14:30:50 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto @@ -832,19 +832,19 @@ VALUE M_Process; Init_process() { - extern VALUE C_Kernel; + extern VALUE C_Builtin; rb_define_variable("$$", Qnil, get_pid, rb_readonly_hook); rb_define_variable("$?", &status, Qnil, rb_readonly_hook); - rb_define_method(C_Kernel, "exec", Fexec, 1); - rb_define_method(C_Kernel, "fork", Ffork, 0); - rb_define_method(C_Kernel, "_exit", Ffork, 1); - rb_define_method(C_Kernel, "wait", Fwait, 0); - rb_define_method(C_Kernel, "waitpid", Fwaitpid, 2); - rb_define_method(C_Kernel, "system", Fsystem, 1); - rb_define_method(C_Kernel, "kill", Fkill, -1); - rb_define_method(C_Kernel, "trap", Ftrap, -1); - rb_define_method(C_Kernel, "sleep", Fsleep, -1); + rb_define_method(C_Builtin, "exec", Fexec, 1); + rb_define_method(C_Builtin, "fork", Ffork, 0); + rb_define_method(C_Builtin, "_exit", Ffork, 1); + rb_define_method(C_Builtin, "wait", Fwait, 0); + rb_define_method(C_Builtin, "waitpid", Fwaitpid, 2); + rb_define_method(C_Builtin, "system", Fsystem, 1); + rb_define_method(C_Builtin, "kill", Fkill, -1); + rb_define_method(C_Builtin, "trap", Ftrap, -1); + rb_define_method(C_Builtin, "sleep", Fsleep, -1); M_Process = rb_define_module("Process"); diff --git a/random.c b/random.c index 85fa7b4..7b663b2 100644 --- a/random.c +++ b/random.c @@ -3,7 +3,7 @@ random.c - $Author: matz $ - $Date: 1994/08/12 04:47:48 $ + $Date: 1994/10/14 10:00:59 $ created at: Fri Dec 24 16:39:21 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto @@ -73,8 +73,8 @@ Frand(obj, max) Init_Random() { - extern VALUE C_Kernel; + extern VALUE C_Builtin; - rb_define_method(C_Kernel, "srand", Fsrand, -2); - rb_define_method(C_Kernel, "rand", Frand, 1); + rb_define_method(C_Builtin, "srand", Fsrand, -2); + rb_define_method(C_Builtin, "rand", Frand, 1); } diff --git a/range.c b/range.c index 0e464c0..42a18c3 100644 --- a/range.c +++ b/range.c @@ -3,7 +3,7 @@ range.c - $Author: matz $ - $Date: 1994/08/12 04:47:49 $ + $Date: 1994/10/14 06:19:39 $ created at: Thu Aug 19 17:46:47 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/re.c b/re.c index 42e881e..0d314c9 100644 --- a/re.c +++ b/re.c @@ -3,7 +3,7 @@ re.c - $Author: matz $ - $Date: 1994/08/18 07:06:23 $ + $Date: 1994/10/14 06:19:40 $ created at: Mon Aug 9 18:24:49 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/ruby.1 b/ruby.1 index ec6ba55..ad08231 100644 --- a/ruby.1 +++ b/ruby.1 @@ -1,6 +1,6 @@ .\"ruby.1 - -*- Nroff -*- .\" $Author: matz $ -.\" $Date: 1994/08/18 07:06:25 $ +.\" $Date: 1994/10/14 06:19:42 $ .\" created at: Tue Apr 12 01:45:04 JST 1994 .TH RUBY 1 "\*(RP" .UC diff --git a/ruby.c b/ruby.c index 4cef8d7..d0ad1e2 100644 --- a/ruby.c +++ b/ruby.c @@ -3,7 +3,7 @@ ruby.c - $Author: matz $ - $Date: 1994/08/24 09:25:34 $ + $Date: 1994/10/14 06:19:43 $ created at: Tue Aug 10 12:47:31 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/ruby.h b/ruby.h index 94fd224..8e3b4c0 100644 --- a/ruby.h +++ b/ruby.h @@ -3,7 +3,7 @@ ruby.h - $Author: matz $ - $Date: 1994/08/12 11:06:43 $ + $Date: 1994/10/14 06:19:44 $ created at: Thu Jun 10 14:26:32 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/socket.c b/socket.c index d8e9cb0..7d55d0d 100644 --- a/socket.c +++ b/socket.c @@ -3,7 +3,7 @@ socket.c - $Author: matz $ - $Date: 1994/08/12 04:47:56 $ + $Date: 1994/10/14 06:19:46 $ created at: Thu Mar 31 12:21:29 JST 1994 ************************************************/ diff --git a/spec b/spec index 37e6260..d22a970 100644 --- a/spec +++ b/spec @@ -845,10 +845,10 @@ Ruby ** ؿ -Rubyˤϸ̩ʰ̣ǤϴؿϤʤKernel饹Υ᥽åɤΰ( -饹ؿǸƤӽФΤ), ؿŪѤ. ؿŪѤ -᥽åɤʲˤ. Υ᥽åɤݤˤϸߴ -ͤƹԤʤ٤Ǥ. +Rubyˤϸ̩ʰ̣ǤϴؿϤʤBuiltin饹Υ᥽åɤ(Ƥ̾ +饹ؿǸƤӽФΤ), ؿŪѤ. ؿŪѤ +᥽åɤʲˤ. Υ᥽åɤݤˤϸߴ +ͤƹԤʤ٤Ǥ. _exit(status) @@ -1431,6 +1431,17 @@ Methods: Ⱦ;2Ǥ֤. +*** Builtin(饹) + +Ƥ̾說饹Υѡ饹. RubyȤ߹ߤƤδؿŪ˸ƤФ᥽å +ϤΥ饹Ƥ. + +SuperClass: Kernel + +Methods: + + ִؿפιܤ򻲾ȤΤ. + *** Class(饹) 饹Υ饹. 긷̩ȥ饹ðۥ᥽åɤѾ뤿 @@ -2452,8 +2463,7 @@ Single Methods: *** Kernel(饹) -ƤΥ饹δ쥯饹. RubyȤ߹ߤƤδؿŪ˸ƤФ᥽å -ϤΥ饹Ƥ. +ƤΥ饹δ쥯饹. SuperClass: ʤ @@ -2663,10 +2673,11 @@ Methods: *** Object(饹) -Ƥ̾說饹Υѥ饹. Υ饹Υ֥饹Ǥʤ饹 -KernelNilǤ. +Ƥ̾說饹Υѥ饹. ̾說饹Υ󥹥󥹤ΰŪʿ +Ƥ. Υ饹Υ֥饹Ǥʤ饹KernelNil, +Ȥ߹ߴؿƤBuiltinǤ. -SuperClass: Kernel +SuperClass: Builtin Methods: diff --git a/sprintf.c b/sprintf.c index b937928..6fef9c3 100644 --- a/sprintf.c +++ b/sprintf.c @@ -3,7 +3,7 @@ sprintf.c - $Author: matz $ - $Date: 1994/08/12 04:47:57 $ + $Date: 1994/10/14 06:19:50 $ created at: Fri Oct 15 10:39:26 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto diff --git a/string.c b/string.c index 1d96557..9025668 100644 --- a/string.c +++ b/string.c @@ -3,7 +3,7 @@ string.c - $Author: matz $ - $Date: 1994/08/12 11:06:44 $ + $Date: 1994/10/14 10:01:01 $ created at: Mon Aug 9 17:12:58 JST 1993 Copyright (C) 1994 Yukihiro Matsumoto @@ -1533,7 +1533,7 @@ Fstr_sum(str, args) } } -extern VALUE C_Kernel; +extern VALUE C_Builtin; extern VALUE M_Comparable; extern VALUE M_Enumerable; @@ -1595,8 +1595,8 @@ Init_String() rb_define_method(C_String, "sum", Fstr_sum, -2); - rb_define_method(C_Kernel, "sub", Fsub, 2); - rb_define_method(C_Kernel, "gsub", Fgsub, 2); + rb_define_method(C_Builtin, "sub", Fsub, 2); + rb_define_method(C_Builtin, "gsub", Fgsub, 2); pr_str = rb_intern("to_s"); } diff --git a/version.h b/version.h index 47b2310..ff07233 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define RUBY_VERSION "0.51" -#define VERSION_DATE "13 Oct 94" +#define RUBY_VERSION "0.52" +#define VERSION_DATE "14 Oct 94" -- cgit v1.1