rename mrb_true_or_false_value() to mrb_bool_value()

include/mruby/value.h

@@ -275,7 +275,7 @@ mrb_undef_value(void)
 }
 
 static inline mrb_value
-mrb_true_or_false_value(mrb_bool boolean)
+mrb_bool_value(mrb_bool boolean)
 {
   mrb_value v;
 

mrbgems/mruby-struct/src/struct.c

@@ -718,7 +718,7 @@ mrb_struct_equal(mrb_state *mrb, mrb_value s)
     }
   }
 
-  return mrb_true_or_false_value(equal_p);
+  return mrb_bool_value(equal_p);
 }
 
 /* 15.2.18.4.12(x)  */
@@ -762,7 +762,7 @@ mrb_struct_eql(mrb_state *mrb, mrb_value s)
     }
   }
 
-  return mrb_true_or_false_value(eql_p);
+  return mrb_bool_value(eql_p);
 }
 
 /*

mrbgems/mruby-time/src/time.c

@@ -302,7 +302,7 @@ mrb_time_eq(mrb_state *mrb, mrb_value self)
   tm2 = (struct mrb_time *)mrb_get_datatype(mrb, other, &mrb_time_type);
   eq_p = tm1 && tm2 && tm1->sec == tm2->sec && tm1->usec == tm2->usec;
 
-  return mrb_true_or_false_value(eq_p);
+  return mrb_bool_value(eq_p);
 }
 
 static mrb_value
@@ -459,7 +459,7 @@ mrb_time_dstp(mrb_state *mrb, mrb_value self)
 
   tm = (struct mrb_time *)mrb_get_datatype(mrb, self, &mrb_time_type);
   if (!tm) return mrb_nil_value();
-  return mrb_true_or_false_value(tm->datetime.tm_isdst);
+  return mrb_bool_value(tm->datetime.tm_isdst);
 }
 
 /* 15.2.19.7.8 */
@@ -678,7 +678,7 @@ mrb_time_utcp(mrb_state *mrb, mrb_value self)
   struct mrb_time *tm;
   tm = (struct mrb_time *)mrb_get_datatype(mrb, self, &mrb_time_type);
   if (!tm) return mrb_nil_value();
-  return mrb_true_or_false_value(tm->timezone == MRB_TIMEZONE_UTC);
+  return mrb_bool_value(tm->timezone == MRB_TIMEZONE_UTC);
 }
 
 

src/array.c

@@ -878,7 +878,7 @@ mrb_ary_empty_p(mrb_state *mrb, mrb_value self)
 {
   struct RArray *a = mrb_ary_ptr(self);
 
-  return mrb_true_or_false_value(a->len == 0);
+  return mrb_bool_value(a->len == 0);
 }
 
 mrb_value
@@ -1091,7 +1091,7 @@ mrb_ary_equal(mrb_state *mrb, mrb_value ary1)
     }
   }
 
-  return mrb_true_or_false_value(equal_p);
+  return mrb_bool_value(equal_p);
 }
 
 /* 15.2.12.5.34 (x) */
@@ -1130,7 +1130,7 @@ mrb_ary_eql(mrb_state *mrb, mrb_value ary1)
     }
   }
 
-  return mrb_true_or_false_value(eql_p);
+  return mrb_bool_value(eql_p);
 }
 
 void

src/class.c

@@ -1090,7 +1090,7 @@ mrb_bob_init(mrb_state *mrb, mrb_value cv)
 static mrb_value
 mrb_bob_not(mrb_state *mrb, mrb_value cv)
 {
-  return mrb_true_or_false_value(!mrb_test(cv));
+  return mrb_bool_value(!mrb_test(cv));
 }
 
 /* 15.3.1.3.30 */
@@ -1498,7 +1498,7 @@ mrb_mod_cvar_defined(mrb_state *mrb, mrb_value mod)
 
   check_cv_name(mrb, id);
   defined_p = mrb_cv_defined(mrb, mod, id);
-  return mrb_true_or_false_value(defined_p);
+  return mrb_bool_value(defined_p);
 }
 
 /* 15.2.2.4.17 */
@@ -1638,7 +1638,7 @@ mrb_mod_method_defined(mrb_state *mrb, mrb_value mod)
 
   mrb_get_args(mrb, "n", &id);
   method_defined_p = mrb_obj_respond_to(mrb_class_ptr(mod), id);
-  return mrb_true_or_false_value(method_defined_p);
+  return mrb_bool_value(method_defined_p);
 }
 
 static void
@@ -1705,7 +1705,7 @@ mrb_mod_const_defined(mrb_state *mrb, mrb_value mod)
   check_const_name(mrb, id);
   const_defined_p = mrb_const_defined(mrb, mod, id);
 
-  return mrb_true_or_false_value(const_defined_p);
+  return mrb_bool_value(const_defined_p);
 }
 
 mrb_value
@@ -1754,7 +1754,7 @@ mrb_mod_eqq(mrb_state *mrb, mrb_value mod)
   mrb_get_args(mrb, "o", &obj);
   eqq = mrb_obj_is_kind_of(mrb, obj, mrb_class_ptr(mod));
 
-  return mrb_true_or_false_value(eqq);
+  return mrb_bool_value(eqq);
 }
 
 void

src/error.c

@@ -182,7 +182,7 @@ exc_equal(mrb_state *mrb, mrb_value exc)
     equal_p = mrb_equal(mrb, mrb_attr_get(mrb, exc, id_mesg), mesg);
   }
 
-  return mrb_true_or_false_value(equal_p);
+  return mrb_bool_value(equal_p);
 }
 
 static void

src/gc.c

@@ -983,7 +983,7 @@ gc_enable(mrb_state *mrb, mrb_value obj)
 
   mrb->gc_disabled = FALSE;
 
-  return mrb_true_or_false_value(old);
+  return mrb_bool_value(old);
 }
 
 /*
@@ -1005,7 +1005,7 @@ gc_disable(mrb_state *mrb, mrb_value obj)
 
   mrb->gc_disabled = TRUE;
 
-  return mrb_true_or_false_value(old);
+  return mrb_bool_value(old);
 }
 
 /*
@@ -1101,7 +1101,7 @@ change_gen_gc_mode(mrb_state *mrb, mrb_int enable)
 static mrb_value
 gc_generational_mode_get(mrb_state *mrb, mrb_value self)
 {
-  return mrb_true_or_false_value(mrb->is_generational_gc_mode);
+  return mrb_bool_value(mrb->is_generational_gc_mode);
 }
 
 /*
@@ -1121,7 +1121,7 @@ gc_generational_mode_set(mrb_state *mrb, mrb_value self)
   if (mrb->is_generational_gc_mode != enable)
     change_gen_gc_mode(mrb, enable);
 
-  return mrb_true_or_false_value(enable);
+  return mrb_bool_value(enable);
 }
 
 #ifdef GC_TEST

src/hash.c

@@ -810,7 +810,7 @@ mrb_hash_empty_p(mrb_state *mrb, mrb_value self)
     empty_p = 1;
   }
 
-  return mrb_true_or_false_value(empty_p);
+  return mrb_bool_value(empty_p);
 }
 
 /* 15.2.13.4.11 */
@@ -1023,7 +1023,7 @@ mrb_hash_has_keyWithKey(mrb_state *mrb, mrb_value hash, mrb_value key)
     result = 0;
   }
 
-  return mrb_true_or_false_value(result);
+  return mrb_bool_value(result);
 }
 
 /* 15.2.13.4.13 */
@@ -1115,7 +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) {
-    return mrb_true_or_false_value(!h2);
+    return mrb_bool_value(!h2);
   }
   if (!h2) return mrb_false_value();
   if (kh_size(h1) != kh_size(h2)) return mrb_false_value();

src/kernel.c

@@ -101,7 +101,7 @@ mrb_obj_equal_m(mrb_state *mrb, mrb_value self)
   mrb_get_args(mrb, "o", &arg);
   eql_p = mrb_obj_equal(mrb, self, arg);
 
-  return mrb_true_or_false_value(eql_p);
+  return mrb_bool_value(eql_p);
 }
 
 static mrb_value
@@ -113,7 +113,7 @@ mrb_obj_not_equal_m(mrb_state *mrb, mrb_value self)
   mrb_get_args(mrb, "o", &arg);
   eql_p = mrb_obj_equal(mrb, self, arg);
 
-  return mrb_true_or_false_value(!eql_p);
+  return mrb_bool_value(!eql_p);
 }
 
 /* 15.3.1.3.2  */
@@ -134,7 +134,7 @@ mrb_equal_m(mrb_state *mrb, mrb_value self)
   mrb_get_args(mrb, "o", &arg);
   equal_p = mrb_equal(mrb, self, arg);
 
-  return mrb_true_or_false_value(equal_p);
+  return mrb_bool_value(equal_p);
 }
 
 /* 15.3.1.3.3  */
@@ -240,7 +240,7 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
     }
   }
 
-  return mrb_true_or_false_value(given_p);
+  return mrb_bool_value(given_p);
 }
 
 /* 15.3.1.3.7  */
@@ -548,7 +548,7 @@ obj_is_instance_of(mrb_state *mrb, mrb_value self)
   mrb_get_args(mrb, "o", &arg);
   instance_of_p = mrb_obj_is_instance_of(mrb, self, mrb_class_ptr(arg));
 
-  return mrb_true_or_false_value(instance_of_p);
+  return mrb_bool_value(instance_of_p);
 }
 
 static void
@@ -591,7 +591,7 @@ mrb_obj_ivar_defined(mrb_state *mrb, mrb_value self)
   check_iv_name(mrb, mid);
   defined_p = mrb_obj_iv_defined(mrb, mrb_obj_ptr(self), mid);
 
-  return mrb_true_or_false_value(defined_p);
+  return mrb_bool_value(defined_p);
 }
 
 /* 15.3.1.3.21 */
@@ -693,7 +693,7 @@ mrb_obj_is_kind_of_m(mrb_state *mrb, mrb_value self)
   mrb_get_args(mrb, "o", &arg);
   kind_of_p = mrb_obj_is_kind_of(mrb, self, mrb_class_ptr(arg));
 
-  return mrb_true_or_false_value(kind_of_p);
+  return mrb_bool_value(kind_of_p);
 }
 
 static void
@@ -1010,7 +1010,7 @@ obj_respond_to(mrb_state *mrb, mrb_value self)
 
   respond_to_p = basic_obj_respond_to(mrb, self, id, !mrb_test(priv));
 
-  return mrb_true_or_false_value(respond_to_p);
+  return mrb_bool_value(respond_to_p);
 }
 
 /* 15.3.1.3.45 */

src/numeric.c

@@ -390,7 +390,7 @@ num_eql(mrb_state *mrb, mrb_value x)
     eql_p = mrb_equal(mrb, x, y);
   }
 
-  return mrb_true_or_false_value(eql_p);
+  return mrb_bool_value(eql_p);
 }
 
 static mrb_value
@@ -432,7 +432,7 @@ flo_eq(mrb_state *mrb, mrb_value x)
     return num_equal(mrb, x, y);
   }
   a = mrb_float(x);
-  return mrb_true_or_false_value(a == b);
+  return mrb_bool_value(a == b);
 }
 
 /* 15.2.8.3.18 */
@@ -517,7 +517,7 @@ flo_finite_p(mrb_state *mrb, mrb_value num)
 
   finite_p = !(isinf(value) || isnan(value));
 
-  return mrb_true_or_false_value(finite_p);
+  return mrb_bool_value(finite_p);
 }
 
 /* 15.2.9.3.10 */
@@ -934,7 +934,7 @@ fix_equal(mrb_state *mrb, mrb_value x)
       (mrb_type(y) == MRB_TT_FLOAT &&
        (mrb_float)mrb_fixnum(x) == mrb_float(y));
 
-  return mrb_true_or_false_value(equal_p);
+  return mrb_bool_value(equal_p);
 }
 
 /* 15.2.8.3.8  */

src/object.c

@@ -115,7 +115,7 @@ true_and(mrb_state *mrb, mrb_value obj)
 
   mrb_get_args(mrb, "b", &obj2);
 
-  return mrb_true_or_false_value(obj2);
+  return mrb_bool_value(obj2);
 }
 
 /* 15.2.5.3.2  */
@@ -134,7 +134,7 @@ true_xor(mrb_state *mrb, mrb_value obj)
   int obj2;
 
   mrb_get_args(mrb, "b", &obj2);
-  return mrb_true_or_false_value(!obj2);
+  return mrb_bool_value(!obj2);
 }
 
 /* 15.2.5.3.3  */
@@ -227,7 +227,7 @@ false_xor(mrb_state *mrb, mrb_value obj)
   int obj2;
 
   mrb_get_args(mrb, "b", &obj2);
-  return mrb_true_or_false_value(obj2);
+  return mrb_bool_value(obj2);
 }
 
 /* 15.2.4.3.3  */
@@ -247,7 +247,7 @@ false_or(mrb_state *mrb, mrb_value obj)
   int obj2;
 
   mrb_get_args(mrb, "b", &obj2);
-  return mrb_true_or_false_value(obj2);
+  return mrb_bool_value(obj2);
 }
 
 /* 15.2.6.3.3  */

src/range.c

@@ -91,7 +91,7 @@ mrb_range_excl(mrb_state *mrb, mrb_value range)
 {
   struct RRange *r = mrb_range_ptr(range);
 
-  return mrb_true_or_false_value(r->excl);
+  return mrb_bool_value(r->excl);
 }
 
 static void
@@ -175,7 +175,7 @@ mrb_range_eq(mrb_state *mrb, mrb_value range)
     }
   }
 
-  return mrb_true_or_false_value(eq_p);
+  return mrb_bool_value(eq_p);
 }
 
 static int
@@ -242,7 +242,7 @@ mrb_range_include(mrb_state *mrb, mrb_value range)
               ((r->excl && r_gt(mrb, end, val)) || /* end >  val */
               (r_ge(mrb, end, val))); /* end >= val */
 
-  return mrb_true_or_false_value(include_p);
+  return mrb_bool_value(include_p);
 }
 
 /*
@@ -412,7 +412,7 @@ range_eql(mrb_state *mrb, mrb_value range)
     }
   }
 
-  return mrb_true_or_false_value(eql_p);
+  return mrb_bool_value(eql_p);
 }
 
 /* 15.2.14.4.15(x) */

src/string.c

@@ -601,7 +601,7 @@ mrb_str_equal_m(mrb_state *mrb, mrb_value str1)
   mrb_get_args(mrb, "o", &str2);
   equal_p = mrb_str_equal(mrb, str1, str2);
 
-  return mrb_true_or_false_value(equal_p);
+  return mrb_bool_value(equal_p);
 }
 /* ---------------------------------- */
 mrb_value
@@ -1135,7 +1135,7 @@ mrb_str_empty_p(mrb_state *mrb, mrb_value self)
 {
   struct RString *s = mrb_str_ptr(self);
 
-  return mrb_true_or_false_value(s->len == 0);
+  return mrb_bool_value(s->len == 0);
 }
 
 /* 15.2.10.5.17 */
@@ -1154,7 +1154,7 @@ mrb_str_eql(mrb_state *mrb, mrb_value self)
   mrb_get_args(mrb, "o", &str2);
   eql_p = (mrb_type(str2) == MRB_TT_STRING) && str_eql(mrb, self, str2);
 
-  return mrb_true_or_false_value(eql_p);
+  return mrb_bool_value(eql_p);
 }
 
 static mrb_value
@@ -1325,7 +1325,7 @@ mrb_str_include(mrb_state *mrb, mrb_value self)
     include_p = (i != -1);
   }
 
-  return mrb_true_or_false_value(include_p);
+  return mrb_bool_value(include_p);
 }
 
 /* 15.2.10.5.22 */

src/symbol.c

@@ -163,7 +163,7 @@ sym_equal(mrb_state *mrb, mrb_value sym1)
   mrb_get_args(mrb, "o", &sym2);
   equal_p = mrb_obj_equal(mrb, sym1, sym2);
 
-  return mrb_true_or_false_value(equal_p);
+  return mrb_bool_value(equal_p);
 }
 
 /* 15.2.11.3.2  */