* hash.c (rb_hash_s_create): use rb_hash_aset() instead of calling

  st_insert() directly, to dup&freeze string keys.

* parse.y (yylex): proper error message for "@@0".

* parse.y (yylex): paren to parse_string() must be zero for
  unparenthesized strings.

* parse.y (str_extend): broken string when unterminated "#{".


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

1 files changed, 2 insertions, 2 deletions

diff --git a/hash.c b/hash.c
index e43b2252a9..b9f09eef25 100644
--- a/hash.c
+++ b/hash.c
@@ -240,7 +240,7 @@ rb_hash_s_create(argc, argv, klass)
     hash = rb_hash_new2(klass);
 
     for (i=0; i<argc; i+=2) {
-	st_insert(RHASH(hash)->tbl, argv[i], argv[i+1]);
+        rb_hash_aset(hash, argv[i], argv[i + 1]);
     }
 
     return hash;
@@ -315,7 +315,7 @@ rb_hash_fetch(argc, argv, hash)
     if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
 	if (rb_block_given_p()) {
 	    if (argc > 1) {
-		rb_raise(rb_eArgError, "wrong # of arguments", argc);
+		rb_raise(rb_eArgError, "wrong # of arguments");
 	    }
 	    return rb_yield(key);
 	}