diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-03 07:29:00 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-03 07:29:00 +0000 |
commit | 3e2d55e441089f44ca2b97e174a0d15f0db5febe (patch) | |
tree | 0d3abef059492db16681931cd7d8530c7fdb7666 | |
parent | c6df8c18efdf6e2ab9fba1e2eeeedf7cbbe3ae69 (diff) | |
download | ruby-3e2d55e441089f44ca2b97e174a0d15f0db5febe.tar.gz ruby-3e2d55e441089f44ca2b97e174a0d15f0db5febe.tar.xz ruby-3e2d55e441089f44ca2b97e174a0d15f0db5febe.zip |
credit rb_name_error() fix to Nobuyoshi Nakada.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | intern.h | 3 | ||||
-rw-r--r-- | marshal.c | 20 | ||||
-rw-r--r-- | version.h | 4 |
4 files changed, 26 insertions, 3 deletions
@@ -4,7 +4,7 @@ Tue Jul 3 14:56:27 2001 Shugo Maeda <shugo@ruby-lang.org> * eval.c (rb_yield_0): preserve wrapper information. -Tue Jul 3 14:49:51 2001 Shugo Maeda <shugo@ruby-lang.org> +Tue Jul 3 08:59:50 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> * error.c (rb_name_error): raise NameError instead of LoadError. @@ -216,6 +216,9 @@ VALUE rb_io_eof _((VALUE)); VALUE rb_io_binmode _((VALUE)); VALUE rb_file_open _((const char*, const char*)); VALUE rb_gets _((void)); +/* marshal.c */ +VALUE rb_marshal_dump _((VALUE, VALUE)); +VALUE rb_marshal_load _((VALUE)); /* numeric.c */ void rb_num_zerodiv _((void)); VALUE rb_num_coerce_bin _((VALUE, VALUE)); @@ -1097,3 +1097,23 @@ Init_marshal() rb_define_module_function(rb_mMarshal, "load", marshal_load, -1); rb_define_module_function(rb_mMarshal, "restore", marshal_load, -1); } + +VALUE +rb_marshal_dump(obj, port) + VALUE obj, port; +{ + int argc = 1; + VALUE argv[2]; + + argv[0] = obj; + argv[1] = port; + if (!NIL_P(port)) argc = 2; + return marshal_dump(argc, argv); +} + +VALUE +rb_marshal_load(port) + VALUE port; +{ + return marshal_load(1, &port); +} @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.1" -#define RUBY_RELEASE_DATE "2001-06-22" +#define RUBY_RELEASE_DATE "2001-07-03" #define RUBY_VERSION_CODE 171 -#define RUBY_RELEASE_CODE 20010622 +#define RUBY_RELEASE_CODE 20010703 |