From 0f785c3840d3dab5eb59ecca82e9a045dfdd77c0 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 9 Sep 2006 16:19:33 +0000
Subject: * file.c (rb_f_test): test(0) should not have any special   meaning. 
 [ruby-dev:29425]

* file.c (rb_f_test): properer error message.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  7 +++++++
 file.c    | 15 ++++++++-------
 string.c  |  8 ++++----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd8cc505e3..ce83032a63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Sep  9 23:55:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_f_test): test(0) should not have any special
+	  meaning.  [ruby-dev:29425]
+
+	* file.c (rb_f_test): properer error message.
+
 Sat Sep  9 14:08:38 2006  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/test/unit/testcase.rb (Test::Unit::TestCase#run): Rescue
diff --git a/file.c b/file.c
index d5f005aa76..94de21b3b0 100644
--- a/file.c
+++ b/file.c
@@ -3248,13 +3248,8 @@ rb_f_test(int argc, VALUE *argv)
     int cmd;
 
     if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments");
-#if 0 /* 1.7 behavior? */
-    if (argc == 1) {
-	return RTEST(argv[0]) ? Qtrue : Qfalse;
-    }
-#endif
     cmd = NUM2CHR(argv[0]);
-    if (cmd == 0) return Qfalse;
+    if (cmd == 0) goto unknown;
     if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {
 	CHECK(1);
 	switch (cmd) {
@@ -3371,8 +3366,14 @@ rb_f_test(int argc, VALUE *argv)
 	    return Qfalse;
 	}
     }
+  unknown:
     /* unknown command */
-    rb_raise(rb_eArgError, "unknown command ?%c", cmd);
+    if (ISPRINT(cmd)) {
+	rb_raise(rb_eArgError, "unknown command ?%c", cmd);
+    }
+    else {
+	rb_raise(rb_eArgError, "unknown command ?\\%03o", cmd);
+    }
     return Qnil;		/* not reached */
 }
 
diff --git a/string.c b/string.c
index 59b81b44e6..dc389b16fb 100644
--- a/string.c
+++ b/string.c
@@ -2501,12 +2501,12 @@ rb_str_to_s(VALUE str)
  * call-seq:
  *   str.inspect   => string
  *
- * Returns a printable version of _str_, with special characters
- * escaped.
+ * Returns a printable version of _str_, srrounded by quote marks,
+ * with special characters escaped.
  *
  *    str = "hello"
- *    str[3] = 8
- *    str.inspect       #=> "hel\010o"
+ *    str[3] = "\b"
+ *    str.inspect       #=> "\"hel\bo\""
  */
 
 VALUE
-- 
cgit v1.2.3