1 files changed, 34 insertions, 25 deletions

diff --git a/src/hash.c b/src/hash.c
index 2439a235d..e32ee73e1 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -5,17 +5,17 @@
 */
 
 #include "mruby.h"
+#include "mruby/array.h"
+#include "mruby/class.h"
 #include "mruby/hash.h"
 #include "mruby/khash.h"
-#include "mruby/class.h"
-#include "mruby/array.h"
 #include "mruby/string.h"
 #include "mruby/variable.h"
 
 static inline khint_t
 mrb_hash_ht_hash_func(mrb_state *mrb, mrb_value key)
 {
-  khint_t h = mrb_type(key) << 24;
+  khint_t h = (khint_t)mrb_type(key) << 24;
   mrb_value h2;
 
   h2 = mrb_funcall(mrb, key, "hash", 0, 0);
@@ -52,11 +52,15 @@ mrb_gc_mark_ht(mrb_state *mrb, struct RHash *hash)
   khash_t(ht) *h = hash->ht;
 
   if (!h) return;
-  for (k = kh_begin(h); k != kh_end(h); k++)
+  for (k = kh_begin(h); k != kh_end(h); k++) {
     if (kh_exist(h, k)) {
-      mrb_gc_mark_value(mrb, kh_key(h, k));
-      mrb_gc_mark_value(mrb, kh_value(h, k));
+      mrb_value key = kh_key(h, k);
+      mrb_value val = kh_value(h, k);
+
+      mrb_gc_mark_value(mrb, key);
+      mrb_gc_mark_value(mrb, val);
     }
+  }
 }
 
 size_t
@@ -258,7 +262,7 @@ mrb_hash_init_core(mrb_state *mrb, mrb_value hash)
     RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
     ifnone = block;
   }
-  mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone"), ifnone);
+  mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone);
   return hash;
 }
 
@@ -423,7 +427,7 @@ mrb_hash_set_default(mrb_state *mrb, mrb_value hash)
 
   mrb_get_args(mrb, "o", &ifnone);
   mrb_hash_modify(mrb, hash);
-  mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone"), ifnone);
+  mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone);
   RHASH(hash)->flags &= ~(MRB_HASH_PROC_DEFAULT);
 
   return ifnone;
@@ -474,7 +478,7 @@ mrb_hash_set_default_proc(mrb_state *mrb, mrb_value hash)
 
   mrb_get_args(mrb, "o", &ifnone);
   mrb_hash_modify(mrb, hash);
-  mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone"), ifnone);
+  mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone);
   RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
 
   return ifnone;
@@ -559,7 +563,7 @@ mrb_hash_shift(mrb_state *mrb, mrb_value hash)
         delVal = mrb_hash_delete_key(mrb, hash, delKey);
         mrb_gc_protect(mrb, delVal);
 
-	return mrb_assoc_new(mrb, delKey, delVal);
+        return mrb_assoc_new(mrb, delKey, delVal);
       }
     }
   }
@@ -755,7 +759,7 @@ mrb_hash_replace(mrb_state *mrb, mrb_value hash)
   else {
     ifnone = RHASH_IFNONE(hash2);
   }
-  mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone"), ifnone);
+  mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone);
 
   return hash;
 }
@@ -797,13 +801,16 @@ static mrb_value
 mrb_hash_empty_p(mrb_state *mrb, mrb_value self)
 {
   khash_t(ht) *h = RHASH_TBL(self);
+  mrb_bool empty_p;
 
   if (h) {
-    if (kh_size(h) == 0)
-      return mrb_true_value();
-    return mrb_false_value();
+    empty_p = (kh_size(h) == 0);
   }
-  return mrb_true_value();
+  else {
+    empty_p = 1;
+  }
+
+  return mrb_bool_value(empty_p);
 }
 
 /* 15.2.13.4.11 */
@@ -887,7 +894,7 @@ inspect_hash(mrb_state *mrb, mrb_value hash, int recur)
 
       ai = mrb_gc_arena_save(mrb);
 
-      if (RSTRING_LEN(str) > 1) mrb_str_cat2(mrb, str, ", ");
+      if (RSTRING_LEN(str) > 1) mrb_str_cat(mrb, str, ", ", 2);
 
       str2 = mrb_inspect(mrb, kh_key(h,k));
       mrb_str_append(mrb, str, str2);
@@ -1006,14 +1013,17 @@ mrb_hash_has_keyWithKey(mrb_state *mrb, mrb_value hash, mrb_value key)
 {
   khash_t(ht) *h = RHASH_TBL(hash);
   khiter_t k;
+  mrb_bool result;
 
   if (h) {
     k = kh_get(ht, h, key);
-    if (k != kh_end(h))
-      return mrb_true_value();
+    result = (k != kh_end(h));
+  }
+  else {
+    result = 0;
   }
 
-  return mrb_false_value();
+  return mrb_bool_value(result);
 }
 
 /* 15.2.13.4.13 */
@@ -1094,7 +1104,7 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, int eql)
 
   if (mrb_obj_equal(mrb, hash1, hash2)) return mrb_true_value();
   if (!mrb_hash_p(hash2)) {
-      if (!mrb_respond_to(mrb, hash2, mrb_intern(mrb, "to_hash"))) {
+      if (!mrb_respond_to(mrb, hash2, mrb_intern2(mrb, "to_hash", 7))) {
           return mrb_false_value();
       }
       if (eql)
@@ -1105,8 +1115,7 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, int eql)
   h1 = RHASH_TBL(hash1);
   h2 = RHASH_TBL(hash2);
   if (!h1) {
-    if (!h2)  return mrb_true_value();
-    return mrb_false_value();
+    return mrb_bool_value(!h2);
   }
   if (!h2) return mrb_false_value();
   if (kh_size(h1) != kh_size(h2)) return mrb_false_value();
@@ -1119,9 +1128,9 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, int eql)
       key = kh_key(h1,k1);
       k2 = kh_get(ht, h2, key);
       if (k2 != kh_end(h2)) {
-	if (mrb_equal(mrb, kh_value(h1,k1), kh_value(h2,k2))) {
-	  continue; /* next key */
-	}
+        if (mrb_equal(mrb, kh_value(h1,k1), kh_value(h2,k2))) {
+          continue; /* next key */
+        }
       }
       return mrb_false_value();
     }