summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-19 06:27:06 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-19 06:27:06 +0000
commitdb0b2bb24174aa7d960c01f63d2ac637f24ebbfb (patch)
tree430b40bc83914fdd8ac33c6c4e47e3c546af279b
parent6e52d10fe63fa99b6bfb12e5abb232c1165c804f (diff)
* object.c (rb_mod_cmp): stupid comparison fixed.
* io.c (Init_IO): ARGF.path added (alias to ARGF.filename). [ruby-dev:20197] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--io.c1
-rw-r--r--object.c3
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 170c202cfc..8a718a670a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon May 19 14:42:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * object.c (rb_mod_cmp): stupid comparison fixed.
+
+ * io.c (Init_IO): ARGF.path added (alias to ARGF.filename).
+ [ruby-dev:20197]
+
Mon May 19 13:58:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (init_copy): rename copy_object as initialize_copy,
diff --git a/io.c b/io.c
index 90d4afed8e..76e7c1e550 100644
--- a/io.c
+++ b/io.c
@@ -4036,6 +4036,7 @@ Init_IO()
rb_define_singleton_method(argf, "to_s", argf_filename, 0);
rb_define_singleton_method(argf, "filename", argf_filename, 0);
+ rb_define_singleton_method(argf, "path", argf_filename, 0);
rb_define_singleton_method(argf, "file", argf_file, 0);
rb_define_singleton_method(argf, "skip", argf_skip, 0);
rb_define_singleton_method(argf, "close", argf_close, 0);
diff --git a/object.c b/object.c
index 73f01256c1..cfd9ce9a0e 100644
--- a/object.c
+++ b/object.c
@@ -668,11 +668,10 @@ rb_mod_cmp(mod, arg)
}
cmp = rb_mod_le(mod, arg);
-
+ if (NIL_P(cmp)) return Qnil;
if (cmp) {
return INT2FIX(-1);
}
- if (NIL_P(cmp)) return Qnil;
return INT2FIX(1);
}