summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-03 07:29:00 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-03 07:29:00 +0000
commit08eef47e5b0ce77d457fca8a0f5e1fa257d984c6 (patch)
tree0d3abef059492db16681931cd7d8530c7fdb7666
parent604a8f18836e7779b2859bab86e3eb0f77bdfb55 (diff)
credit rb_name_error() fix to Nobuyoshi Nakada.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--intern.h3
-rw-r--r--marshal.c20
-rw-r--r--version.h4
4 files changed, 26 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 68ca26fa82..2691fe4bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/intern.h b/intern.h
index 340c3f0a3a..7a837bea79 100644
--- a/intern.h
+++ b/intern.h
@@ -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));
diff --git a/marshal.c b/marshal.c
index 29620125dd..d8f7703092 100644
--- a/marshal.c
+++ b/marshal.c
@@ -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);
+}
diff --git a/version.h b/version.h
index cdd1190579..2024b48d6f 100644
--- a/version.h
+++ b/version.h
@@ -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