diff options
author | Yukihiro Matsumoto <matz@ruby-lang.org> | 1997-10-02 17:59:18 +0900 |
---|---|---|
committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-17 22:09:32 +0900 |
commit | 10d21745c8c1c3c78678ea7e0b62c0a7433ccfce (patch) | |
tree | 4e40254178d66c343cae763029131d959518f795 /ext/marshal/marshal.c | |
parent | ce930d042913722f209bbd3209b6c90a3c71325f (diff) |
version 1.0-971002v1_0_971002
https://cache.ruby-lang.org/pub/ruby/1.0/ruby-1.0-971002.tar.gz
Thu Oct 2 17:59:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-971002
Wed Oct 1 14:01:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/marshal/marshal.c (w_byte): argument must be char.
Wed Oct 1 10:30:22 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ext/marshal/marshal.c (marshal_dump): try to set binmode.
* ext/marshal/marshal.c (r_object): forgot to re-regist structs in
the object table.
* eval.c (ruby_options): call Init_ext() before any require()
calls by `-r'.
Tue Sep 30 14:51:07 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970930
Fri Sep 30 14:29:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/marshal/marshal.c (w_object): marshal dumped core.
Tue Sep 30 10:27:39 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/test.rb: bignum test suits added.
Mon Sep 29 13:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ruby.c (forbid_setid): forbid some options in suid mode.
Mon Sep 27 09:53:48 1997 EGUCHI Matsumoto <eguchi@shizuokanet.or.jp>
* bignum.c: modified for speeding.
Fri Sep 26 18:27:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* sample/from.rb: some extensions.
Mon Sep 29 13:15:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.
Fri Sep 26 14:41:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (ruby_run): deferred calling Init_ext() just before eval_node.
Fri Sep 26 13:27:24 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* io.c (io_isatty): forgot to return TRUE value.
Fri Sep 25 11:10:58 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
* eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
platforms.
Wed Sep 24 17:43:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (Init_String): String#taint and String#taint? added.
Wed Sep 24 00:57:00 1997 Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
* X68000 patch.
Tue Sep 23 20:42:30 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
* parse.y (node_newnode): SEGV on null node setup.
Mon Sep 22 11:22:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ruby.c (ruby_prog_init): wrong safe condition check.
Sun Sep 21 14:46:02 1997 MAEDA shugo <shugo@po.aianet.ne.jp>
* error.c (exc_inspect): garbage added to classpath.
Fri Sep 19 11:49:23 1997 <matz@netlab.co.jp>
* version 1.0-970919
* parse.y (newtok): forgot to adjust buffer size when shrinking
the token buffer.
* enum.c (enum_find): rb_eval_cmd() does not return value.
* io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
no longer used.
Tue Sep 16 17:54:25 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* file.c (f_test): problem if wrong command specified.
* ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.
* ruby.c (ruby_prog_init): should not add path from environment
variable, if ruby is running under seuid.
* process.c (init_ids): check suid check for setuid/seteuid etc.
Mon Sep 15 00:42:04 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* regex.c (re_compile_pattern): \w{3} and \W{3} did not work.
Thu Sep 11 10:31:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970911
* ext/socket/socket.c (sock_new): no setbuf() for NT.
* io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.
Wed Sep 10 15:55:31 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970910
* ext/marshal/marshal.c (r_bytes0): extra big length check.
Tue Sep 9 16:27:14 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* io.c (pipe_fptr_atexit): clean up popen()'ed fptr.
* error.c (set_syserr): some system has error code that is bigger
than sys_nerr. grrr.
Tue Sep 9 16:27:14 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970909
* error.c (set_syserr): some system has error code that is bigger
than sys_nerr. grrr.
Wed Sep 3 18:11:00 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970903
* eval.c (f_load): expand path if fname begins with `~'.
Mon Sep 1 13:42:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_call): alias occured in the module body caused SEGV.
Fri Aug 29 11:10:21 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (yylex): spaces can follow =begin/=end.
* variable.c (find_class_path): look for class_tbl also for
unnamed fundamental classes, such as Object, String, etc.
* variable.c (rb_name_class): can't name class before String class
is initilialized.
* inits.c (rb_call_inits): unrecognized dependency from GC to
Array.
* variable.c (find_class_path): could not find class if Object's
iv_tbl is NULL.
Thu Aug 28 13:12:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (yylex): revised `=begin' skip code.
* eval.c (is_defined): separated from rb_eval().
Wed Aug 27 11:32:42 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c (fc_i): some classes/modules does not have iv_tbl.
* variable.c (find_class_path): avoid inifinite loop.
Tue Aug 26 13:43:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_eval): undef'ing non-existing method will raise
NameError exception.
* object.c (class_s_new): needed to create metaclass too.
* eval.c (error_print): no class name print for anonymous class.
* eval.c (rb_longjmp): proper exception raised if raise() called
without arguments, with $! or $@ set.
* object.c (Init_Object): superclass()'s method argument setting
was wrong again.
Mon Aug 25 11:53:11 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/ruby-mode.el (ruby-parse-region): auto-indent now
supports "\\" in the strings.
* struct.c (struct_getmember): new API to get member value from C
language side.
Fri Aug 22 14:26:40 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (error_print): modified exception print format.
Thu Aug 21 16:10:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
calculated with keyword operators.
Thu Aug 21 11:55:41 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970821
Thu Aug 21 11:36:58 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* parse.y (arg): ary[0] += 1 cause SEGV
Wed Aug 20 14:24:42 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970820
* eval.c (rb_call): infinite loop bug
Tue Aug 19 00:15:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970819
* eval.c (rb_call): did not raise ArgumentError if too many
arguments more than optional arguments (without rest arg).
* eval.c (rb_eval): did not work well for op_asgn2 (attribute
self assignment).
Mon Aug 18 09:25:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (inspect_i): did not display T_DATA instance variables.
* parse.y: provides more accurate line number information.
* eval.c (thread_value): include value's backtrace information in
the variable `$@'.
* eval.c (f_abort): print backtrace and exit.
Sat Aug 16 00:17:44 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (class_s_new): do not make subclass of singleton class.
Fri Aug 15 15:49:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (call_trace_func): block context switch in the trace
function.
* eval.c (rb_eval): clear method cache at class extention.
Fri Aug 15 19:40:43 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/socket/socket.c (Init_socket): small typo caused SEGV.
Tue Aug 12 16:02:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c: option variables: $-0, $-p(readonly), $-v,
$-I(load_path), $-a(readonly), $-K, $-d, $-F, $-i, $-l.
* parse.y (yylex): ignore rd (ruby document) in the code.
Mon Aug 11 12:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* re.c (Init_Regexp): $-K as alias to the $KCODE.
* io.c (Init_IO): new virtual variable $-i for the value of -i
option.
* enum.c (Init_Enumerable): include? as alias of member?
Fri Aug 8 11:16:50 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* io.c (io_foreach): now the record separator can be specified.
* io.c (io_s_readlines): new method to read in whole file (or
command output) from path.
* ext/socket/socket.c (Init_socket): recvfrom did not work.
* ext/socket/socket.c (sock_send): forgot to check nil for false
value.
Thu Aug 7 11:40:01 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (Init_Object): remove private_attr/public_attr.
Wed Aug 6 14:21:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (mod_attr): forgot to check nil for false value.
Mon Aug 4 11:50:28 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c (rb_class_path): scan class constants for anonymous
classes/modules to make up pathes.
Wed Jul 30 08:45:12 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_eval): stop to cache const value in nodes.
Sat Jul 26 03:17:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* numeric.c (flo_to_s): wrong .0 at end.
Sat Jul 26 00:36:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (error_print): always print exception type in the
toplevel exception handler.
* string.c (str_hash): wrong hash value.
Thu Jul 24 11:05:51 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (uscore_get): proper error message for unset $_.
Wed Jul 23 09:56:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* object.c (obj_methods): returns list of method names of the
specified object.
* class.c (mod_instance_methods): returns list of method names of
the class instnace.
Fri Jul 11 22:38:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* object.c (class_superclass): returns class's superclass
itself. (1.1)
* object.c (obj_type): returns object's class itself. (1.1)
* class.c (mod_included_modules): list included modules.
* object.c (class_superclass): raises error for Object.
Thu Jul 3 09:54:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (SETUP_ARGS): save source position, remove nd_line().
* eval.c (rb_call): replace modulo by bit-masking.
* eval.c (POP_SCOPE): force recycle scope object to reduce gc rate.
* gc.c (obj_free): aboid calling run_final() when no finalizer is set.
* eval.c (PUSH_VARS): do not allocate the dynamic scope's end-mark
object.
Wed Jul 2 14:25:07 1997 KIMURA Koichi <kkimura@pure.cpdc.canon.co.jp>
* Native mswin32 support.
Tue Jul 1 09:59:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970701
* parse.y (mrhs): allow rest-star(*) in right hand side.
Tue Jun 24 19:04:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970624
Sat Jun 20 22:22:51 1997 Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
* eval.c: freebsd 3.0 <sys/select.h> support.
Fri Jun 20 01:24:45 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970620
* gc.c: eliminate uninitilalized field of Hash, Array etc., to
avoid dumping core.
Thu Jun 19 01:29:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970619
* string.c (str_split_method): wrong limit.
Sat Jun 14 01:54:16 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* class.c (rb_singleton_class): no singleton for special
constants (now raises exception).
* eval.c (ruby_init): cbase in TOPLEVEL_BINDING need to be
initialized.
Sat Jun 14 01:01:16 1997 maeda shugo <shugo@po.aianet.ne.jp>
* array.c (sort_2): wrong comparison.
Sat Jun 14 00:53:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_foreach): safe iteration.
Fri Jun 13 14:04:56 1997 Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
* configure.in: -Bshareable option for netbsd.
Fri Jun 13 01:16:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* io.c (pipe_open): call io_unbuffered() only for writable pipes.
Thu Jun 12 01:14:15 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970612
* ext/socket/socket.c (sock_new): use io_unbuffered().
* ext/marshal/marshal.c (w_long): compact long format, which
supports 64 bit architectures (unless longs are >32 bit size).
* ext/marshal/marshal.c: allows recursive data for marshaling.
* parse.y (rb_intern): raise exception for non-internable string.
* ext/marshal/marshal.c (marshal_load): allows direct loading from
strings.
* ext/marshal/marshal.c (marshal_dump): allows direct dump to strings.
* ext/marshal/marshal.c (marshal_dump): interface changed.
Wed Jun 11 18:26:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (rb_newobj): remove needless memset().
Mon Jun 9 13:03:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_eval): reduce condition checks from while/until loop.
* eval.c (rb_eval): wrong jump point for `next'.
Fri Jun 6 11:47:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c (ruby_set_argv): initialize dln_argv0 for dln_a_out.
* ext/socket/socket.c (open_unix): display path name for exceptions.
* ruby.c (proc_options): option -S did not work well.
Fri May 30 02:14:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970530
* eval.c (eval): set $! properly if exception raised in eval().
* io.c (io_write): now handles non T_FILE object.
* io.c (io_defset): $< can be anything which has `write' method.
Thu May 29 15:40:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): $@ is always an array (not string).
* pack.c (pack_unpack): avoid corrupting memory for unexpected
input strings.
Wed May 28 12:46:13 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970528
* process.c (rb_waitpid): do not block other threads.
Tue May 27 12:02:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (ruby_init): split initialize and processing command line
options.
* ruby.c (ruby_options): ruby_init(0, 0, envp) dumps core.
Tue May 20 18:59:45 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* variable.c (rb_ivar_set): invalid instance variable access for
built-in object raises TypeError.
Fri May 16 17:32:21 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970516
* dir.c (push_globs): was freeing non heap pointer.
* gc.c: remove some duplicated prototypes.
* ext/kconv/kconv.c: fix prototypes.
Fri May 9 11:38:59 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970509
* gc.c (obj_free): avoid free(NULL).
* eval.c (rb_check_safe_str): argument missing for TypeError().
Thu May 8 01:14:28 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_dirname): need to return "." for path without
slashes.
Wed May 7 19:18:48 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* process.c (f_fork): child processe does not inherit parent's
itimer setting on linux. call setitimer() again in the child
process.
Sat May 3 02:49:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/curses/curses.c: modified for portability and add to the
standard distribution.
Wed Apr 30 00:34:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_size): returns 0 for empty files (not FALSE).
Fri Apr 25 02:17:50 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970425
* eval.c (f_load): free unused name-table.
* eval.c (f_load): copy local variable name-table.
* gc.c (obj_free): avoid free(NULL).
* eval.c (rb_eval): forgot to make link from the scope object to
NODE_SCOPE. It may crash the interpreter.
Thu Apr 24 00:35:09 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* random.c (f_srand): save old seed anyway. srand() returns no
value on some systems.
* gc.c (obj_free): avoid double free of the local variable name
table.
* parse.y (top_local_setup): modify realloc to handle offset.
Tue Apr 22 12:58:26 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970422
Thu Apr 17 00:40:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* configure.in (rb_cv_bsdpgrp): proper check for BSD
setpgrp/setpgrp.
Wed Apr 16 16:14:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (proc_call): proc called in other thread must be orphan.
Tue Apr 15 10:46:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970415
* gc.c (obj_free): NODE_SCOPE marked from SCOPE object.
* gc.c (gc_mark): some nodes marked wrong.
* process.c (proc_getpgrp): wrong argument
Fri Apr 14 18:32:42 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970414
Fri Apr 12 01:20:12 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.h: String pointer changed to unsigned char.
Fri Apr 11 10:27:29 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970411
* Makefile.in: create libruby.a before linking ruby.
* string.c (str_strip_bang): >0x80 characters for isspace().
* eval.c (proc_call): set safe-level temporally
* eval.c (proc_s_new): save safe-level in the proc context.
* eval.c (rb_eval): no class/module extention in safe mode.
Thu Apr 10 02:10:41 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (gc_mark): remove some pointer checks for speeding up.
* ruby.c (ruby_options): set $0 temporally for -r option.
* eval.c: built-in security feature.
* gc.c (gc_sweep): do not free nodes during compile.
* parse.y (yycompile): set flag when compiling.
Wed Apr 9 10:19:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c: forgot to include <ctype.h> for isspace().
* file.c: provide S_ISREG for some platforms.
* io.c (Init_IO): added some $< operations.
* lib/ping.rb: check host upness using TCP echo.
Tue Apr 8 00:10:15 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (arg_read): bug with 0 length input.
Mon Apr 7 11:36:16 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/fcntl/fcntl.c: module for fcntl constants.
* eval.c (rb_alias): bug when original was an alias.
* parse.y (primary): syntax to access singleton class.
* eval.c (mod_public_method): method's to specify visibitily of
the class methods. make_method_{public,private} removed.
Fri Apr 4 21:43:57 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970404
* gc.c (obj_free): finalizer added for experiment.
Thu Apr 3 02:12:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_schedule): make Fatal rise on main_thread on
deadlocks.
* eval.c (thread_join): raise ThreadError instead of Fatal, in
case of deadlock.
* regex.c (re_compile_fastmap): uninitialized local variable.
* parse.y (parse_regx): new option //[nes] to specify character
code for regexp literals. Last specified code option is valid.
* re.c (reg_s_new): addtional 3rd argument to specify compiled
regexp's character code.
* re.c (reg_new_1): regexp character code can be specified for
each regexp object.
Wed Apr 2 14:51:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_create): handle uncaught throw.
* eval.c (thread_create): halt on some deadlock conditions.
* regex.c (is_in_list): wrong result for non-mbc higher-byte
characters.
* regex.c (re_match): wrong skip for multi-byte characters.
* regex.c (re_compile_fastmap): wrong fastmap in non-mbc mode.
* hash.c (Init_Hash): hash compatible features added to ENV.
Tue Apr 1 15:24:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_extend): remove Object#extend as an iterator which
is in experimental state, since it unveils internal singleton
classes.
Mon Mar 31 14:29:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970331
Sun Mar 30 19:40:57 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* parse.y (terms): avoided win32 gcc's optimization bug.
Sat Mar 29 11:21:58 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* struct.c (make_struct): St[val,..] creates new structure.
Fri Mar 28 11:24:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_make_private): new method make_method_{public,private}
to change visibility of singleton methods.
* regex.c (re_compile_pattern): enables numeric literal >= 0x80 in
the character class.
* regex.c (re_compile_pattern): enabled numeric literal >= 0x80,
in multibyte mode.
* regex.c (re_compile_fastmap): modified exantn and charset(_not)
to set fastmap for higher bytes properly.
* regex.c (is_in_list): now matches numeric literals.
Thu Mar 27 13:34:20 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* pack.c (pack_unpack): extra null byte after unpacked string.
Wed Mar 26 15:20:34 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_compile_pattern): register numbers must be fit in a
byte (0 <= regnum <= 0xff).
* regex.c (re_compile_fastmap): forgot to set mbchar map for
charset_not if RE_MBCTYPE is on.
* regex.c (re_compile_pattern): set list bits for multi-byte
characters for \W, \S, \D in range expression.
* object.c (obj_is_kind_of): defined that nil itself is kind of
nil. TRUE is kind of TRUE, FALSE is kind of FALSE likewise.
This change makes `obj.kind_of?(eval(obj.type))' always true.
Tue Mar 25 14:08:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* lib/English.rb: provides nicer English alias for the variables.
* parse.y (expr): alias $var1 $var2 makes alias of the global
variable.
Mon Mar 24 18:23:20 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970324
Thu Mar 20 22:04:59 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (mod_modfunc): forget to clear method cache.
Wed Mar 19 17:06:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (program): set methods' default private/public status
correctly under eval().
* eval.c (eval): set the_class correctly while evaluating string.
Tue Mar 18 12:23:53 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): yield can be called from eval().
* version 1.0-970318
* parse.y (program): regexp in condition expression should do
matching operation with $_.
* re.c (reg_regsub): wrong substitution.
Fri Mar 14 14:36:28 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_invert): returns value to key mapping of the
associative array.
* ext/socket/extconf.rb: set environment variable SOCKS_SERVER to
compile with libsocks.a.
* ext/socket/socket.c (socks_s_open): SOCKSsocket class to access
internet via SOCKS library.
* sprintf.c (f_sprintf): unsigned formats display leading double
dots for imaginary sequence of signed bit to the left.
* sprintf.c (f_sprintf): correct width and precision formatting
for big integers.
* parse.y (yylex): enables negative hex/octal numbers and `_' in
non-decimal numbers.
* sprintf.c (f_sprintf): %u added for unsigned decimal format.
Thu Mar 13 10:24:27 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* sprintf.c (f_sprintf): wrong output for bignums.
* array.c (ary_reverse_each): iterates in reverse order.
* pack.c (pack_unpack): L unpacked signed long.
* io.c (f_backquote): now returns an empty string for no output.
Wed Mar 12 10:20:30 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/socks/socks.c: socket module with socks library.
Mon Mar 10 20:44:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* re.c (reg_regsub): \& for substitution. \`, \', and \+ are
avaiable also.
Thu Mar 6 01:47:03 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970306
* sample/rubydb.el (gud): ruby debugger emacs interface
* lib/debug.rb: ruby debugger
* parse.y (exprs): more accurate line number display.
Wed Mar 5 21:31:46 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970305
Tue Mar 4 12:28:32 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c (proc_options): search through RUBYPATH and PATH for
option -S.
Mon Mar 3 22:44:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_status): returns nil for exception terminated
threads.
* eval.c (thread_value): re-raise exceptions.
Sat Mar 1 00:59:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_eval): restore $! value after rescue clause, to
re-raise exceptions correctly.
Fri Feb 28 16:43:38 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970228
Thu Feb 27 11:23:41 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_yield_0): redo raises exception
* eval.c (thread_schedule): bug in interrupt handling by rescue.
Wed Feb 26 00:55:36 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): forgot to restore dynamic local variable
bindings.
Tue Feb 25 11:22:08 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/aix_ld.rb: AIX dynamic load support (not tested).
* eval.c (rb_eval): wrong return value for defined? super.
* error.c (exception): more error check.
* re.c (reg_regsub): wrong substitution when sub expanded to null
string.
Fri Feb 21 13:01:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970221
* eval.c (f_require): volatile added. register variable was
recycled, so that GC did not mark that variable.
* object.c (Init_Object): forget to mark main object (was mostly
ok, but made trouble with early GC.)
Thu Feb 20 11:50:50 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970220
Thu Feb 20 11:25:50 1997 Yasuo OHBA <jammy@shljapan.co.jp>
* lib/date.rb: update
Thu Feb 20 08:25:57 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (yylex): forgot tokfix() before rb_intern().
* lib/tk.rb (TkVariable): give up using trace_var.
Wed Feb 19 00:24:35 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970219
* pack.c (pack_pack): packed by null for A specifier. must be
space filled.
* pack.c (pack_unpack): bug in skipping spaces
* gc.c (xmalloc): garbage collect for every 4 Meg. allocation.
* string.c (str_split_method): limit worked wrong way.
* io.c (io_gets_method): misunderstand 0xff in binary files when
$/ == nil.
* re.c (reg_regsub): re-implement.
* ext/socket/socket.c (thread_connect): remove O_NONBLOCK, which
is not defined on some platform like NeXT.
Mon Feb 17 13:08:30 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970217
* object.c (mod_eqq): === extended for subclass check (to use case
as typecase).
Sat Feb 15 02:07:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_compile_pattern): wrong match backref at end of pattern.
* io.c (arg_read): now works beyond end of file.
Thu Feb 13 16:21:24 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (expr): return/yield now accept normal argument format.
* parse.y (yylex): a star in `yield *x' must not be multiplication
operator.
Wed Feb 12 15:06:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* time.c (time_plus): bug in simple addition.
* eval.c (thread_raise): raise exceptions from outside.
* eval.c (Init_Thread): Thread#alive? -- alias for Thread#status.
Mon Feb 10 00:38:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.h (Data_Make_Struct): rename macros.
Sun Feb 8 11:48:13 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (f_syscall): argument offset was wrong.
Fri Feb 7 18:01:17 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970207
* eval.c: add volatiles to avoid variable crobbering by longjmp().
* eval.c (f_raise): 1st argument can be the GlobalExit object now.
* array.c (ary_unshift): no longer accept more than 2 args.
* eval.c (f_raise): bug if 2nd argument is the exception.
Tue Feb 4 00:37:29 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970204
* eval.c (eval): check compile errors by nerrs.
* eval.c (rb_eval): check syntax error by nerrs, not by the return
value, which may be NULL.
* eval.c (compile): Do not clear errinfo.
Mon Feb 3 10:13:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_extend): move real inclusion to Module#extend_object
to allow redfinition.
* object.c (Init_Object): Kernel class is now Module. Object class
became the true root class.
* object.c (obj_inspect): remove useless buffer.
* hash.c (any_cmp): disable interrupts and context switching.
* st.c: remove ALLOW_INTS to disable interrupt during operations.
Fri Jan 31 22:10:08 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_rehash): re-register all key-value.
Thu Jan 30 02:14:49 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (io_reopen): re-implement according to clone() way.
* io.c (io_clone): copy IO object.
* struct.c (struct_eql): compare elements by eql?.
* io.c (io_mode_flags): detect "rb", "wb" etc.
* io.h (FMODE_BINMODE): added.
* ext/socket/socket.c (Init_socket): undef BasicSocket.new
* file.c (Init_File): File.new(path[,mode])
* io.c (Init_IO): IO.new(fd[,mode])
* eval.c (rb_method_boundp): forgot to enable priv argument.
* object.c (Init_Object): remove `=~' from Kernel class.
* ext/socket/socket.c (open_inet): initialize sockaddr before
calling bind(2).
* sample/ruby-mode.el (ruby-calculate-indent): skip comment lines
Wed Jan 29 18:43:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (Init_Thread): DEFER_INTS during initializing threads.
* hash.c (Init_Hash): Hash#eql? checks for object identity.
* eval.c (thread_set_critical): wrong value assigned.
Mon Jan 27 16:10:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (io_print): remove print_on().
* eval.c (f_missing): proper error message for undefined method
without argument
Sat Jan 25 23:32:32 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* string.c (str_sub_s): false alert - sub() does not modify string.
* array.c (ary_times): negative multiplication detected
* string.c (str_times): negative multiplication detected
Fri Jan 24 10:51:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* time.c (time_arg): month -> 0 == "jan" == "1" == "01", little bit
confusing but wanted to conform japanese style.
* version 1.0-970124
Fri Jan 24 09:52:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* util.c (_fixpath): supports SJIS filenames on DJGPP.
Thu Jan 23 16:52:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* README.EXT: update. partially translated into English.
* ext/extmk.rb.in: inherit $LDFLAGS to the final link.
* ext/socket/socket.c (Init_socket): add various constants.
Mon Jan 23 11:40:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* eval.c (Init_Thread): allocate main_thread first to avoid crash.
Thu Jan 23 02:09:26 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (ObjectSpace): API modified. each_object method will do all
the iteration.
* eval.c (proc_call): wrong return from nested lambda.
* ext/GD/GD.c: debugged.
Wed Jan 22 16:12:25 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970122
* gc.c (gc_mark): forgot to mark match->str.
* ext/GD/GD.c: GD interface module.
* eval.c (PUSH_BLOCK): wrong value pushed as the block level.
Mon Jan 20 14:01:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_run): no context switch in the critical section.
Mon Jan 20 09:40:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* utils.c: supports 8+3 filenames
Sat Jan 18 01:23:03 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970118
* regex.c (PATFETCH): need cast to unsigned char.
* io.c (io_ctl): bug in case when arg is not a string.
* lib/tk.rb: forgot that Kernel#type returns the class name now.
* regex.c (re_search): "abc\n" =~ "^$" should not match.
Fri Jan 17 12:31:37 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970117
* ruby.c (ruby_options): constant PLATFORM, which is in the {cpu}-{os}
form, defined.
* configure.in: platform infomation embedded in the interpreter.
* regex.c (re_search): /^$/ did not match to "" by wrong exit condition.
* lib/thread.rb: re-write Mutex/Queue based on Thread.critical.
* eval.c (thread_set_critical): remove Thread.exclusive, add
Thread.critical = TRUE/FALSE instead.
* re.c (reg_search): re-compile pattern if needed
* regex.c (PATFETCH): do translate at compile time
Thu Jan 16 00:49:10 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (gc_mark_frame): forgot to mark frame->cbase.
* regex.c (re_compile_pattern): /a$|b)/ causes error.
* regex.c (re_compile_pattern): /(^|b)/ causes error.
* version 1.0-970116
* re.c (Init_Regexp): set RE_CONTEXTUAL_INVALID_OPS flag.
Tue Jan 14 02:09:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (proc_call): Proc#callをイテレータとして呼んだ時に対応
* configure.in: nextstep対応?
* eval.c (rb_eval): a[b]=cで無駄な配列を割り当てない
* eval.c (f_send): イテレータとして呼ばれたらイテレータとしてメソッ
ドを呼ぶ.
* string.c (str_new4): match共有用の生成関数
* re.c (reg_search): matchの実体(文字列)をマッチを行った文字列と
copy-on-writeで共有
* string.c (str_hash): toupperをかける条件が違っていた
* array.c (sort_2): FixnumとStringを特別扱いして高速化
Mon Jan 13 11:03:53 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_create): threadが生成されるまで割込みを設定しない
* eval.c (Init_Thread): 割込みタイミングを100msecに
Sat Jan 11 00:17:05 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_search): マッチに失敗する場合があった(本当に直ったか?)
* io.c (io_ioctl,io_fcntl): 第2引数を省略可能に
* io.c (io_ioctl,io_fcntl): 戻り値がIOだった.整数(システムコール
の戻り値)を返すようにした.
* io.c (io_ctl): 引数が整数の時に対応
* io.c (io_fcntl): file.cから移動
Fri Jan 10 17:01:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970110
* ext/socket/socket.c (thread_connect): open(connect(2))で他の
threadをブロックしないように
* eval.c (thread_create): exitでないときにexitだと思い込む
Mon Jan 6 17:42:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* string.c (str_sub_s): 文字列長より長いoffsetの検出
* regex.c (re_search): 空にマッチするパターン後の$で失敗
Thu Jan 2 16:36:23 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_reopen): Fileのreopen(pathまたはIOで指定).
* io.c (io_reopen): IOのreopen(IOで指定) -- change classつき
Wed Jan 1 11:09:01 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (f_select): timeoutでnilを返す
Fri Dec 27 13:06:44 1996 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_open): サブクラスではそのクラスのインスタンスを返
すように.
Fri Dec 27 08:58:27 1996 ono@isl.nara.sharp.co.jp
* numeric.c (flo_to_s): index()を使わない.strstr()に.
Thu Dec 26 01:34:17 1996 Yukihiro Matsumoto <matz@caelum.co.jp>
* lib/tk.rb: placeが使えるように
* pack.c (endian): マクロDYNAMIC_ENDIANを指定すると実行時にendian
を判定するように.
* eval.c (thread_alloc): 初期化忘れのメンバがあった.
Co-authored-by: EGUCHI Matsumoto <eguchi@shizuokanet.or.jp>
Co-authored-by: EGUCHI Osamu <eguchi@shizuokanet.or.jp>
Co-authored-by: KIMURA Koichi <kkimura@pure.cpdc.canon.co.jp>
Co-authored-by: Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
Co-authored-by: MAEDA shugo <shugo@po.aianet.ne.jp>
Co-authored-by: Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
Co-authored-by: WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
Co-authored-by: Yasuo OHBA <jammy@shljapan.co.jp>
Co-authored-by: maeda shugo <shugo@po.aianet.ne.jp>
Co-authored-by: ono <ono@isl.nara.sharp.co.jp>
Diffstat (limited to 'ext/marshal/marshal.c')
-rw-r--r-- | ext/marshal/marshal.c | 702 |
1 files changed, 385 insertions, 317 deletions
diff --git a/ext/marshal/marshal.c b/ext/marshal/marshal.c index eae8d7fe09..47cb0fcd2a 100644 --- a/ext/marshal/marshal.c +++ b/ext/marshal/marshal.c @@ -13,131 +13,167 @@ #include "io.h" #include "st.h" -#define MARSHAL_MAJOR 2 -#define MARSHAL_MINOR 1 +#define MARSHAL_MAJOR 4 +#define MARSHAL_MINOR 0 #define TYPE_NIL '0' #define TYPE_TRUE 'T' #define TYPE_FALSE 'F' #define TYPE_FIXNUM 'i' +#define TYPE_UCLASS 'C' #define TYPE_OBJECT 'o' #define TYPE_USERDEF 'u' #define TYPE_FLOAT 'f' #define TYPE_BIGNUM 'l' #define TYPE_STRING '"' -#define TYPE_STRING2 '\'' #define TYPE_REGEXP '/' #define TYPE_ARRAY '[' -#define TYPE_ARRAY2 ']' #define TYPE_HASH '{' -#define TYPE_HASH2 '}' #define TYPE_STRUCT 'S' +#define TYPE_MODULE 'M' #define TYPE_SYMBOL ':' #define TYPE_SYMLINK ';' -VALUE cString; -VALUE cArray; -VALUE cHash; +#define TYPE_LINK '@' + +extern VALUE cString; +extern VALUE cRegexp; +extern VALUE cArray; +extern VALUE cHash; -char *rb_class2path(); VALUE rb_path2class(); static ID s_dump, s_load; -#if (defined(linux) && defined(USE_DLN_A_OUT)) || !defined(HAVE_TMPNAM) -#define tmpnam(s) ltmpnam(s) -static char * -tmpnam(s) - char *s; -{ - static int n = 0; +struct dump_arg { + VALUE obj; + FILE *fp; + struct RString *str; + st_table *symbol; + st_table *data; +}; + +struct dump_call_arg { + VALUE obj; + struct dump_arg *arg; + int limit; +}; + +static void w_long _((long, struct dump_arg*)); - sprintf(s, "/tmp/rb-mrsr-%x%x", getpid(), n++); - return s; +static void +w_byte(c, arg) + char c; + struct dump_arg *arg; +{ + if (arg->fp) putc(c, arg->fp); + else str_cat(arg->str, &c, 1); } -#endif -#define w_byte(c, fp) putc((c), fp) -#define w_bytes(s, n, fp) (w_long((n), fp),fwrite(s, 1, n, fp)) +static void +w_bytes(s, n, arg) + char *s; + int n; + struct dump_arg *arg; +{ + w_long(n, arg); + if (arg->fp) { + fwrite(s, 1, n, arg->fp); + } + else { + str_cat(arg->str, s, n); + } +} static void -w_short(x, fp) +w_short(x, arg) int x; - FILE *fp; + struct dump_arg *arg; { - w_byte( x & 0xff, fp); - w_byte((x>> 8) & 0xff, fp); + w_byte( x & 0xff, arg); + w_byte((x>> 8) & 0xff, arg); } static void -w_long(x, fp) +w_long(x, arg) long x; - FILE *fp; + struct dump_arg *arg; { - w_byte((int)( x & 0xff), fp); - w_byte((int)((x>> 8) & 0xff), fp); - w_byte((int)((x>>16) & 0xff), fp); - w_byte((int)((x>>24) & 0xff), fp); + char buf[sizeof(long)+1]; + int i, len = 0; + + if (x == 0) { + w_byte(0, arg); + return; + } + for (i=1;i<sizeof(long)+1;i++) { + buf[i] = x & 0xff; + x = RSHIFT(x,8); + if (x == 0) { + buf[0] = i; + break; + } + if (x == -1) { + buf[0] = -i; + break; + } + } + len = i; + for (i=0;i<=len;i++) { + w_byte(buf[i], arg); + } } static void -w_float(d, fp) +w_float(d, arg) double d; - FILE *fp; + struct dump_arg *arg; { char buf[100]; sprintf(buf, "%.12g", d); - w_bytes(buf, strlen(buf), fp); + w_bytes(buf, strlen(buf), arg); } static void -w_symbol(id, fp, table) +w_symbol(id, arg) ID id; - FILE *fp; - st_table *table; + struct dump_arg *arg; { char *sym = rb_id2name(id); int num; - if (st_lookup(table, id, &num)) { - w_byte(TYPE_SYMLINK, fp); - w_long(num, fp); + if (st_lookup(arg->symbol, id, &num)) { + w_byte(TYPE_SYMLINK, arg); + w_long(num, arg); } else { - w_byte(TYPE_SYMBOL, fp); - w_bytes(sym, strlen(sym), fp); - st_insert(table, id, table->num_entries); + w_byte(TYPE_SYMBOL, arg); + w_bytes(sym, strlen(sym), arg); + st_insert(arg->symbol, id, arg->symbol->num_entries); } } static void -w_unique(s, fp, table) +w_unique(s, arg) char *s; - FILE *fp; - st_table *table; + struct dump_arg *arg; { - w_symbol(rb_intern(s), fp, table); + w_symbol(rb_intern(s), arg); } -static void w_object(); -extern VALUE cBignum, cStruct; - -struct each_arg { - FILE *fp; - VALUE limit; - st_table *table; -}; +static void w_object _((VALUE,struct dump_arg*,int)); +extern VALUE cIO, cBignum, cStruct; static int hash_each(key, value, arg) VALUE key, value; - struct each_arg *arg; + struct dump_call_arg *arg; { - w_object(key, arg->fp, arg->limit, arg->table); - w_object(value, arg->fp, arg->limit, arg->table); + w_object(key, arg->arg, arg->limit); + w_object(value, arg->arg, arg->limit); return ST_CONTINUE; } @@ -145,154 +181,166 @@ static int obj_each(id, value, arg) ID id; VALUE value; - struct each_arg *arg; + struct dump_call_arg *arg; { - w_symbol(id, arg->fp, arg->table); - w_object(value, arg->fp, arg->limit, arg->table); + w_symbol(id, arg->arg); + w_object(value, arg->arg, arg->limit); return ST_CONTINUE; } static void -w_object(obj, fp, limit, table) +w_uclass(obj, class, arg) + VALUE obj, class; + struct dump_arg *arg; +{ + if (CLASS_OF(obj) != class) { + w_byte(TYPE_UCLASS, arg); + w_unique(rb_class2name(CLASS_OF(obj)), arg); + } +} + +static void +w_object(obj, arg, limit) VALUE obj; - FILE *fp; + struct dump_arg *arg; int limit; - st_table *table; { - struct each_arg arg; int n; + struct dump_call_arg c_arg; if (limit == 0) { Fail("exceed depth limit"); } limit--; - - arg.fp = fp; - arg.limit = limit; - arg.table = table; + c_arg.limit = limit; + c_arg.arg = arg; if (obj == Qnil) { - w_byte(TYPE_NIL, fp); + w_byte(TYPE_NIL, arg); } else if (obj == TRUE) { - w_byte(TYPE_TRUE, fp); + w_byte(TYPE_TRUE, arg); } else if (obj == FALSE) { - w_byte(TYPE_FALSE, fp); + w_byte(TYPE_FALSE, arg); } else if (FIXNUM_P(obj)) { if (sizeof(long) == 4) { - w_byte(TYPE_FIXNUM, fp); - w_long(FIX2INT(obj), fp); + w_byte(TYPE_FIXNUM, arg); + w_long(FIX2INT(obj), arg); } } else { + int num; + + if (st_lookup(arg->data, obj, &num)) { + w_byte(TYPE_LINK, arg); + w_long(num, arg); + return; + } + st_insert(arg->data, obj, arg->data->num_entries); if (rb_respond_to(obj, s_dump)) { VALUE v; - w_byte(TYPE_USERDEF, fp); - w_unique(rb_class2path(CLASS_OF(obj)), fp, table); + w_byte(TYPE_USERDEF, arg); + w_unique(rb_class2name(CLASS_OF(obj)), arg); v = rb_funcall(obj, s_dump, 1, limit); if (TYPE(v) != T_STRING) { TypeError("_dump_to must return String"); } - w_bytes(RSTRING(v)->ptr, RSTRING(v)->len, fp); + w_bytes(RSTRING(v)->ptr, RSTRING(v)->len, arg); return; } + switch (BUILTIN_TYPE(obj)) { + case T_MODULE: + case T_CLASS: + w_byte(TYPE_MODULE, arg); + { + VALUE path = rb_class_path(obj); + w_bytes(RSTRING(path)->ptr, RSTRING(path)->len, arg); + } + return; + case T_FLOAT: - w_byte(TYPE_FLOAT, fp); - w_float(RFLOAT(obj)->value, fp); + w_byte(TYPE_FLOAT, arg); + w_float(RFLOAT(obj)->value, arg); return; case T_BIGNUM: - w_byte(TYPE_BIGNUM, fp); + w_byte(TYPE_BIGNUM, arg); { char sign = RBIGNUM(obj)->sign?'+':'-'; int len = RBIGNUM(obj)->len; USHORT *d = RBIGNUM(obj)->digits; - w_byte(sign, fp); - w_long(len, fp); + w_byte(sign, arg); + w_long(len, arg); while (len--) { - w_short(d, fp); + w_short(*d, arg); d++; } } return; - } - switch (BUILTIN_TYPE(obj)) { case T_STRING: - if (CLASS_OF(obj) == cString) { - w_byte(TYPE_STRING, fp); - w_bytes(RSTRING(obj)->ptr, RSTRING(obj)->len, fp); - } - else { - w_byte(TYPE_STRING2, fp); - w_bytes(RSTRING(obj)->ptr, RSTRING(obj)->len, fp); - w_unique(rb_class2path(CLASS_OF(obj)), fp, table); - } + w_uclass(obj, cString, arg); + w_byte(TYPE_STRING, arg); + w_bytes(RSTRING(obj)->ptr, RSTRING(obj)->len, arg); return; case T_REGEXP: - w_byte(TYPE_REGEXP, fp); - w_bytes(RREGEXP(obj)->str, RREGEXP(obj)->len, fp); - w_byte(FL_TEST(obj, FL_USER1), fp); + w_uclass(obj, cRegexp, arg); + w_byte(TYPE_REGEXP, arg); + w_bytes(RREGEXP(obj)->str, RREGEXP(obj)->len, arg); + w_byte(FL_TEST(obj, FL_USER1), arg); return; case T_ARRAY: - if (CLASS_OF(obj) == cArray) w_byte(TYPE_ARRAY, fp); - else w_byte(TYPE_ARRAY2, fp); + w_uclass(obj, cArray, arg); + w_byte(TYPE_ARRAY, arg); { int len = RARRAY(obj)->len; VALUE *ptr = RARRAY(obj)->ptr; - w_long(len, fp); + w_long(len, arg); while (len--) { - w_object(*ptr, fp, limit, table); + w_object(*ptr, arg, limit); ptr++; } } - if (CLASS_OF(obj) != cArray) { - w_unique(rb_class2path(CLASS_OF(obj)), fp, table); - } break; case T_HASH: - if (CLASS_OF(obj) == cHash) w_byte(TYPE_HASH, fp); - else w_byte(TYPE_HASH2, fp); - w_byte(TYPE_HASH, fp); - w_long(RHASH(obj)->tbl->num_entries, fp); - st_foreach(RHASH(obj)->tbl, hash_each, &arg); - if (CLASS_OF(obj) != cHash) { - w_unique(rb_class2path(CLASS_OF(obj)), fp, table); - } + w_uclass(obj, cHash, arg); + w_byte(TYPE_HASH, arg); + w_long(RHASH(obj)->tbl->num_entries, arg); + st_foreach(RHASH(obj)->tbl, hash_each, &c_arg); break; case T_STRUCT: - w_byte(TYPE_STRUCT, fp); + w_byte(TYPE_STRUCT, arg); { int len = RSTRUCT(obj)->len; - char *path = rb_class2path(CLASS_OF(obj)); + char *path = rb_class2name(CLASS_OF(obj)); VALUE mem; int i; - w_unique(path, fp, table); - w_long(len, fp); + w_unique(path, arg); + w_long(len, arg); mem = rb_ivar_get(CLASS_OF(obj), rb_intern("__member__")); if (mem == Qnil) { Fatal("non-initialized struct"); } for (i=0; i<len; i++) { - w_symbol(FIX2INT(RARRAY(mem)->ptr[i]), fp, table); - w_object(RSTRUCT(obj)->ptr[i], fp, limit, table); + w_symbol(FIX2INT(RARRAY(mem)->ptr[i]), arg); + w_object(RSTRUCT(obj)->ptr[i], arg, limit); } } break; case T_OBJECT: - w_byte(TYPE_OBJECT, fp); + w_byte(TYPE_OBJECT, arg); { VALUE class = CLASS_OF(obj); char *path; @@ -300,14 +348,14 @@ w_object(obj, fp, limit, table) if (FL_TEST(class, FL_SINGLETON)) { TypeError("singleton can't be dumped"); } - path = rb_class2path(class); - w_unique(path, fp, table); + path = rb_class2name(class); + w_unique(path, arg); if (ROBJECT(obj)->iv_tbl) { - w_long(ROBJECT(obj)->iv_tbl->num_entries, fp); - st_foreach(ROBJECT(obj)->iv_tbl, obj_each, &arg); + w_long(ROBJECT(obj)->iv_tbl->num_entries, arg); + st_foreach(ROBJECT(obj)->iv_tbl, obj_each, &c_arg); } else { - w_long(0, fp); + w_long(0, arg); } } break; @@ -319,146 +367,157 @@ w_object(obj, fp, limit, table) } } -struct dump_arg { - VALUE obj; - FILE *fp; - int limit; - st_table *table; -}; - static VALUE dump(arg) - struct dump_arg *arg; + struct dump_call_arg *arg; { - w_object(arg->obj, arg->fp, arg->limit, arg->table); + w_object(arg->obj, arg->arg, arg->limit); } static VALUE dump_ensure(arg) struct dump_arg *arg; { - st_free_table(arg->table); + st_free_table(arg->symbol); + st_free_table(arg->data); } static VALUE -dump_on(obj, port, limit) - VALUE obj, port; - int limit; +marshal_dump(argc, argv) + int argc; + VALUE argv; { + VALUE obj, port, a1, a2; + int limit = -1; extern VALUE cIO; - FILE *fp; - OpenFile *fptr; struct dump_arg arg; + struct dump_call_arg c_arg; - if (obj_is_kind_of(port, cIO)) { - GetOpenFile(port, fptr); - io_writable(fptr); - fp = (fptr->f2) ? fptr->f2 : fptr->f; + port = 0; + rb_scan_args(argc, argv, "12", &obj, &a1, &a2); + if (argc == 3) { + limit = NUM2INT(a2); + port = a1; + } + else if (argc == 2) { + if (FIXNUM_P(a1)) limit = FIX2INT(a1); + else port = a1; + } + if (port) { + if (obj_is_kind_of(port, cIO)) { + OpenFile *fptr; + + io_binmode(port); + GetOpenFile(port, fptr); + io_writable(fptr); + arg.fp = (fptr->f2) ? fptr->f2 : fptr->f; + } + else { + TypeError("instance of IO needed"); + } } else { - TypeError("instance of IO needed"); + arg.fp = 0; + port = str_new(0, 0); + arg.str = RSTRING(port); } - w_byte(MARSHAL_MAJOR, fp); - w_byte(MARSHAL_MINOR, fp); - - arg.obj = obj; - arg.fp = fp; - arg.limit = limit; - arg.table = st_init_numtable(); - rb_ensure(dump, &arg, dump_ensure, &arg); - - return Qnil; -} + arg.symbol = st_init_numtable(); + arg.data = st_init_numtable(); + c_arg.obj = obj; + c_arg.arg = &arg; + c_arg.limit = limit; -static VALUE -marshal_dump(argc, argv) - int argc; - VALUE argv; -{ - VALUE obj, port, lim; - int limit; + w_byte(MARSHAL_MAJOR, &arg); + w_byte(MARSHAL_MINOR, &arg); - rb_scan_args(argc, argv, "21", &obj, &port, &lim); - if (NIL_P(lim)) limit = 100; - else limit = NUM2INT(lim); + rb_ensure(dump, &c_arg, dump_ensure, &arg); - dump_on(obj, port, limit); + return port; } -static VALUE -marshal_dumps(argc, argv) - int argc; - VALUE argv; -{ - VALUE obj, lim; - int limit; - VALUE str = str_new(0, 0); - VALUE port; - FILE *fp = 0; - char buf[BUFSIZ]; - int n; - - rb_scan_args(argc, argv, "11", &obj, &lim); - if (NIL_P(lim)) limit = 100; - else limit = NUM2INT(lim); - - tmpnam(buf); - port = file_open(buf, "w"); - fp = rb_fopen(buf, "r"); -#if !defined(MSDOS) && !defined(__BOW__) - unlink(buf); -#endif - - dump_on(obj, port, limit); - io_close(port); -#if defined(MSDOS) || defined(__BOW__) - unlink(buf); -#endif - - while (n = fread(buf, 1, BUFSIZ, fp)) { - str_cat(str, buf, n); - } +struct load_arg { + FILE *fp; + UCHAR *ptr, *end; + st_table *symbol; + st_table *data; +}; - return str; +static int +r_byte(arg) + struct load_arg *arg; +{ + if (arg->fp) return getc(arg->fp); + if (arg->ptr < arg->end) return *arg->ptr++; + return EOF; } -#define r_byte(fp) getc(fp) - static int -r_short(fp) - FILE *fp; +r_short(arg) + struct load_arg *arg; { register short x; - x = r_byte(fp); - x |= r_byte(fp) << 8; + x = r_byte(arg); + x |= r_byte(arg) << 8; /* XXX If your short is > 16 bits, add sign-extension here!!! */ return x; } +static void +long_toobig(size) + int size; +{ + TypeError("long too big for this architecture (size %d, given %d)", + sizeof(long), size); +} + static long -r_long(fp) - FILE *fp; +r_long(arg) + struct load_arg *arg; { + char c = r_byte(arg), i; register long x; - x = r_byte(fp); - x |= (long)r_byte(fp) << 8; - x |= (long)r_byte(fp) << 16; - x |= (long)r_byte(fp) << 24; - /* XXX If your long is > 32 bits, add sign-extension here!!! */ + + if (c == 0) return 0; + if (c > 0) { + if (c > sizeof(long)) long_toobig((int)c); + x = 0; + for (i=0;i<c;i++) { + x |= (long)r_byte(arg) << (8*i); + } + } + else if (c < 0) { + c = -c; + if (c > sizeof(long)) long_toobig((int)c); + x = -1; + for (i=0;i<c;i++) { + x &= ~(0xff << (8*i)); + x |= (long)r_byte(arg) << (8*i); + } + } return x; } -#define r_bytes(s, fp) \ - (s = (char*)r_long(fp), r_bytes0(&s,ALLOCA_N(char,(int)s),(int)s,fp)) +#define r_bytes(s, arg) \ + (s = (char*)r_long(arg), r_bytes0(&s,ALLOCA_N(char,(int)s),(int)s,arg)) -static char -r_bytes0(sp, s, len, fp) +static int +r_bytes0(sp, s, len, arg) char **sp, *s; int len; - FILE *fp; + struct load_arg *arg; { - fread(s, 1, len, fp); + if (arg->fp) { + len = fread(s, 1, len, arg->fp); + } + else { + if (arg->ptr + len > arg->end) { + len = arg->end - arg->ptr; + } + memcpy(s, arg->ptr, len); + arg->ptr += len; + } + (s)[len] = '\0'; *sp = s; @@ -466,63 +525,84 @@ r_bytes0(sp, s, len, fp) } static ID -r_symbol(fp, table) - FILE *fp; - st_table *table; +r_symbol(arg) + struct load_arg *arg; { char *buf; ID id; char type; - if (r_byte(fp) == TYPE_SYMLINK) { - int num = r_long(fp); + if (r_byte(arg) == TYPE_SYMLINK) { + int num = r_long(arg); - if (st_lookup(table, num, &id)) { + if (st_lookup(arg->symbol, num, &id)) { return id; } TypeError("bad symbol"); } - r_bytes(buf, fp); + r_bytes(buf, arg); id = rb_intern(buf); - st_insert(table, table->num_entries, id); + st_insert(arg->symbol, arg->symbol->num_entries, id); return id; } static char* -r_unique(fp, table) - FILE *fp; - st_table *table; +r_unique(arg) + struct load_arg *arg; { - return rb_id2name(r_symbol(fp, table)); + return rb_id2name(r_symbol(arg)); } static VALUE -r_string(fp) - FILE *fp; +r_string(arg) + struct load_arg *arg; { char *buf; - int len = r_bytes(buf, fp); - VALUE v; + int len = r_bytes(buf, arg); - v = str_new(buf, len); + return str_taint(str_new(buf, len)); +} +static VALUE +r_regist(v, arg) + VALUE v; + struct load_arg *arg; +{ + st_insert(arg->data, arg->data->num_entries, v); return v; } static VALUE -r_object(fp, table) - FILE *fp; - st_table *table; +r_object(arg) + struct load_arg *arg; { VALUE v; - int type = r_byte(fp); + int type = r_byte(arg); switch (type) { case EOF: eof_error("EOF read where object expected"); return Qnil; + case TYPE_LINK: + if (st_lookup(arg->data, r_long(arg), &v)) { + return v; + } + ArgError("dump format error (unlinked)"); + break; + + case TYPE_UCLASS: + { + VALUE c = rb_path2class(r_unique(arg)); + v = r_object(arg); + if (rb_special_const_p(v)) { + ArgError("dump format error (user class)"); + } + RBASIC(v)->class = c; + return v; + } + case TYPE_NIL: return Qnil; @@ -534,7 +614,7 @@ r_object(fp, table) case TYPE_FIXNUM: { - int i = r_long(fp); + int i = r_long(arg); return INT2FIX(i); } @@ -543,9 +623,9 @@ r_object(fp, table) double atof(); char *buf; - r_bytes(buf, fp); + r_bytes(buf, arg); v = float_new(atof(buf)); - return v; + return r_regist(v, arg); } case TYPE_BIGNUM: @@ -555,50 +635,46 @@ r_object(fp, table) NEWOBJ(big, struct RBignum); OBJSETUP(big, cBignum, T_BIGNUM); - big->sign = (r_byte(fp) == '+'); - big->len = len = r_long(fp); + big->sign = (r_byte(arg) == '+'); + big->len = len = r_long(arg); big->digits = digits = ALLOC_N(USHORT, len); while (len--) { - *digits++ = r_short(fp); + *digits++ = r_short(arg); } - return (VALUE)big; + return r_regist(big, arg); } case TYPE_STRING: - return r_string(fp); - - case TYPE_STRING2: - v = r_string(fp); - RBASIC(v)->class = rb_path2class(r_unique(fp, table)); - return v; + return r_regist(r_string(arg), arg); case TYPE_REGEXP: { char *buf; - int len = r_bytes(buf, fp); - int ci = r_byte(fp); - v = reg_new(buf, len, ci); - return v; + int len = r_bytes(buf, arg); + int ci = r_byte(arg); + return r_regist(reg_new(buf, len, ci), arg); } case TYPE_ARRAY: { - int len = r_long(fp); + volatile int len = r_long(arg); v = ary_new2(len); + r_regist(v, arg); while (len--) { - ary_push(v, r_object(fp, table)); + ary_push(v, r_object(arg)); } return v; } case TYPE_HASH: { - int len = r_long(fp); + int len = r_long(arg); v = hash_new(); + r_regist(v, arg); while (len--) { - VALUE key = r_object(fp, table); - VALUE value = r_object(fp, table); + VALUE key = r_object(arg); + VALUE value = r_object(arg); hash_aset(v, key, value); } return v; @@ -608,23 +684,27 @@ r_object(fp, table) { VALUE class, mem, values; int i, len; + int num = arg->data->num_entries; - class = rb_path2class(r_unique(fp, table)); + st_insert(arg->data, num, 15); /* temp reg. */ + class = rb_path2class(r_unique(arg)); mem = rb_ivar_get(class, rb_intern("__member__")); if (mem == Qnil) { Fatal("non-initialized struct"); } - len = r_long(fp); + len = r_long(arg); values = ary_new2(len); i = 0; for (i=0; i<len; i++) { - ID slot = r_symbol(fp, table); + ID slot = r_symbol(arg); if (RARRAY(mem)->ptr[i] != INT2FIX(slot)) TypeError("struct not compatible"); - ary_push(values, r_object(fp, table)); + ary_push(values, r_object(arg)); } v = struct_alloc(class, values); + st_insert(arg->data, num, v); /* re-regist */ + return v; } break; @@ -633,112 +713,101 @@ r_object(fp, table) VALUE class; int len; - class = rb_path2class(r_unique(fp, table)); + class = rb_path2class(r_unique(arg)); if (rb_respond_to(class, s_load)) { - v = rb_funcall(class, s_load, 1, r_string(fp)); - } - else { - TypeError("class %s needs to have method `_load_from'", - rb_class2name(class)); + v = rb_funcall(class, s_load, 1, r_string(arg)); + return r_regist(v, arg); } + TypeError("class %s needs to have method `_load_from'", + rb_class2name(class)); } break; + case TYPE_OBJECT: { VALUE class; int len; - class = rb_path2class(r_unique(fp, table)); - len = r_long(fp); + class = rb_path2class(r_unique(arg)); + len = r_long(arg); v = obj_alloc(class); + r_regist(v, arg); if (len > 0) { while (len--) { - ID id = r_symbol(fp, table); - VALUE val = r_object(fp, table); + ID id = r_symbol(arg); + VALUE val = r_object(arg); rb_ivar_set(v, id, val); } } + return v; } break; + case TYPE_MODULE: + { + char *buf; + r_bytes(buf, arg); + return rb_path2class(buf); + } + default: ArgError("dump format error(0x%x)", type); break; } - return v; } -struct load_arg { - FILE *fp; - st_table *table; -}; - static VALUE load(arg) struct load_arg *arg; { - return r_object(arg->fp, arg->table); + return r_object(arg); } static VALUE load_ensure(arg) struct load_arg *arg; { - st_free_table(arg->table); + st_free_table(arg->symbol); + st_free_table(arg->data); } static VALUE marshal_load(self, port) VALUE self, port; { - extern VALUE cIO; FILE *fp; int major; VALUE v; OpenFile *fptr; - char buf[32]; -#if defined(MSDOS) || defined(__BOW__) - int need_unlink_tmp = 0; -#endif struct load_arg arg; if (TYPE(port) == T_STRING) { - tmpnam(buf); - fp = rb_fopen(buf, "w"); - v = file_open(buf, "r"); -#if defined(MSDOS) || defined(__BOW__) - need_unlink_tmp = 0; -#else - unlink(buf); -#endif - - fwrite(RSTRING(port)->ptr, RSTRING(port)->len, 1, fp); - fclose(fp); - port = v; - } - - if (obj_is_kind_of(port, cIO)) { - GetOpenFile(port, fptr); - io_readable(fptr); - fp = fptr->f; + arg.fp = 0; + arg.ptr = RSTRING(port)->ptr; + arg.end = arg.ptr + RSTRING(port)->len; } else { - TypeError("instance of IO needed"); + if (obj_is_kind_of(port, cIO)) { + io_binmode(port); + GetOpenFile(port, fptr); + io_readable(fptr); + arg.fp = fptr->f; + } + else { + TypeError("instance of IO needed"); + } } - major = r_byte(fp); + major = r_byte(&arg); if (major == MARSHAL_MAJOR) { - if (r_byte(fp) != MARSHAL_MINOR) { + if (r_byte(&arg) != MARSHAL_MINOR) { Warning("Old marshal file format (can be read)"); } - arg.fp = fp; - arg.table = st_init_numtable(); + arg.symbol = st_init_numtable(); + arg.data = st_init_numtable(); v = rb_ensure(load, &arg, load_ensure, &arg); } -#if defined(MSDOS) || defined(__BOW__) - if (need_unlink_tmp) unlink(buf); -#endif - if (major != MARSHAL_MAJOR) { + else { TypeError("Old marshal file format (can't read)"); } @@ -752,7 +821,6 @@ Init_marshal() s_dump = rb_intern("_dump_to"); s_load = rb_intern("_load_from"); rb_define_module_function(mMarshal, "dump", marshal_dump, -1); - rb_define_module_function(mMarshal, "dumps", marshal_dumps, -1); rb_define_module_function(mMarshal, "load", marshal_load, 1); rb_define_module_function(mMarshal, "restore", marshal_load, 1); } |