* string.c (rb_str_usascii_new{,2}: defined.

  (rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
  string.

* encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
  (rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
  use rb_str_ascii_new.

* array.c (recursive_join, inspect_ary): ditto.

* object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
  rb_mod_to_s): ditto.

* hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
  env_clear, env_to_s, env_inspect): ditto.

* numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.

* bignum.c (rb_big2str): ditto.

* file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
  file_inspect_join, Init_file): ditto.

* test/ruby/test_ruby_m17n.rb: add checks for encoding of string.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 6 deletions

diff --git a/hash.c b/hash.c
index 430ebac779..707f8a676f 100644
--- a/hash.c
+++ b/hash.c
@@ -1169,7 +1169,7 @@ inspect_hash(VALUE hash, VALUE dummy, int recur)
 {
     VALUE str;
 
-    if (recur) return rb_str_new2("{...}");
+    if (recur) return rb_usascii_str_new2("{...}");
     str = rb_str_buf_new2("{");
     rb_hash_foreach(hash, inspect_i, str);
     rb_str_buf_cat2(str, "}");
@@ -1193,7 +1193,7 @@ static VALUE
 rb_hash_inspect(VALUE hash)
 {
     if (RHASH_EMPTY_P(hash))
-	return rb_str_new2("{}");
+	return rb_usascii_str_new2("{}");
     return rb_exec_recursive(inspect_hash, hash, 0);
 }
 
@@ -1821,7 +1821,7 @@ rb_f_getenv(VALUE obj, VALUE name)
 	if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
 #endif
 	{
-	    VALUE str = rb_str_new2(env);
+	    VALUE str = rb_usascii_str_new2(env);
 
 	    rb_obj_freeze(str);
 	    return str;
@@ -1862,7 +1862,7 @@ env_fetch(int argc, VALUE *argv)
 #else
     if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
 #endif
-	return rb_str_new2(env);
+	return rb_usascii_str_new2(env);
     return env_str_new2(env);
 }
 
@@ -2217,7 +2217,7 @@ env_clear(void)
 static VALUE
 env_to_s(void)
 {
-    return rb_str_new2("ENV");
+    return rb_usascii_str_new2("ENV");
 }
 
 static VALUE
@@ -2239,7 +2239,7 @@ env_inspect(void)
 	    rb_str_buf_cat2(str, "\"");
 	    rb_str_buf_cat(str, *env, s-*env);
 	    rb_str_buf_cat2(str, "\"=>");
-	    i = rb_inspect(rb_str_new2(s+1));
+	    i = rb_inspect(rb_usascii_str_new2(s+1));
 	    rb_str_buf_append(str, i);
 	}
 	env++;