summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/mruby/hash.h13
-rw-r--r--src/hash.c14
2 files changed, 23 insertions, 4 deletions
diff --git a/include/mruby/hash.h b/include/mruby/hash.h
index 911a96042..ce51b2016 100644
--- a/include/mruby/hash.h
+++ b/include/mruby/hash.h
@@ -166,6 +166,19 @@ MRB_API mrb_value mrb_hash_values(mrb_state *mrb, mrb_value hash);
MRB_API mrb_value mrb_hash_clear(mrb_state *mrb, mrb_value hash);
/*
+ * Get hash size.
+ *
+ * Equivalent to:
+ *
+ * hash.size
+ *
+ * @param mrb The mruby state reference.
+ * @param hash The target hash.
+ * @return The hash size.
+ */
+MRB_API mrb_int mrb_hash_size(mrb_state *mrb, mrb_value hash);
+
+/*
* Copies the hash.
*
*
diff --git a/src/hash.c b/src/hash.c
index 3d6c2ed7d..2f60eb74a 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -1133,6 +1133,15 @@ mrb_hash_aset(mrb_state *mrb, mrb_value self)
return val;
}
+MRB_API mrb_int
+mrb_hash_size(mrb_state *mrb, mrb_value hash)
+{
+ htable *t = RHASH_TBL(hash);
+
+ if (!t) return 0;
+ return t->size;
+}
+
/* 15.2.13.4.20 */
/* 15.2.13.4.25 */
/*
@@ -1150,10 +1159,7 @@ mrb_hash_aset(mrb_state *mrb, mrb_value self)
static mrb_value
mrb_hash_size_m(mrb_state *mrb, mrb_value self)
{
- htable *t = RHASH_TBL(self);
-
- if (!t) return mrb_fixnum_value(0);
- return mrb_fixnum_value(t->size);
+ return mrb_fixnum_value(mrb_hash_size(mrb, self));
}
MRB_API mrb_bool