mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
use TRUE/FALSE instead of 1/0
This commit is contained in:
+3
-3
@@ -1061,16 +1061,16 @@ mrb_obj_respond_to(struct RClass* c, mrb_sym mid)
|
||||
k = kh_get(mt, h, mid);
|
||||
if (k != kh_end(h)) {
|
||||
if (kh_value(h, k)) {
|
||||
return 1; /* exist method */
|
||||
return TRUE; /* method exists */
|
||||
}
|
||||
else {
|
||||
return 0;
|
||||
return FALSE; /* undefined method */
|
||||
}
|
||||
}
|
||||
}
|
||||
c = c->super;
|
||||
}
|
||||
return 0; /* no method */
|
||||
return FALSE; /* no method */
|
||||
}
|
||||
|
||||
int
|
||||
|
||||
+2
-2
@@ -610,10 +610,10 @@ static int
|
||||
nosplat(node *t)
|
||||
{
|
||||
while (t) {
|
||||
if ((intptr_t)t->car->car == NODE_SPLAT) return 0;
|
||||
if ((intptr_t)t->car->car == NODE_SPLAT) return FALSE;
|
||||
t = t->cdr;
|
||||
}
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static mrb_sym
|
||||
|
||||
+2
-2
@@ -37,8 +37,8 @@ mrb_obj_basic_to_s_p(mrb_state *mrb, mrb_value obj)
|
||||
{
|
||||
struct RProc *me = mrb_method_search(mrb, mrb_class(mrb, obj), mrb_intern(mrb, "to_s"));
|
||||
if (me && MRB_PROC_CFUNC_P(me) && (me->body.func == mrb_any_to_s))
|
||||
return 1;
|
||||
return 0;
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* 15.3.1.3.17 */
|
||||
|
||||
+3
-3
@@ -14,7 +14,7 @@
|
||||
int
|
||||
mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
|
||||
{
|
||||
if (v1.tt != v2.tt) return 0;
|
||||
if (v1.tt != v2.tt) return FALSE;
|
||||
switch (v1.tt) {
|
||||
case MRB_TT_TRUE:
|
||||
return 1;
|
||||
@@ -498,10 +498,10 @@ mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c)
|
||||
|
||||
while (cl) {
|
||||
if (cl == c || cl->mt == c->mt)
|
||||
return 1/* TRUE */;
|
||||
return TRUE;
|
||||
cl = cl->super;
|
||||
}
|
||||
return 0/* FALSE */;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static mrb_value
|
||||
|
||||
+4
-4
@@ -123,7 +123,7 @@ mrb_pool_can_realloc(mrb_pool *pool, void *p, size_t len)
|
||||
{
|
||||
struct mrb_pool_page *page;
|
||||
|
||||
if (!pool) return 0;
|
||||
if (!pool) return FALSE;
|
||||
len += ALIGN_PADDING(len);
|
||||
page = pool->pages;
|
||||
while (page) {
|
||||
@@ -131,12 +131,12 @@ mrb_pool_can_realloc(mrb_pool *pool, void *p, size_t len)
|
||||
size_t beg;
|
||||
|
||||
beg = (char*)p - page->page;
|
||||
if (beg + len > page->len) return 0;
|
||||
return 1;
|
||||
if (beg + len > page->len) return FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
page = page->next;
|
||||
}
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void*
|
||||
|
||||
+1
-1
@@ -2296,7 +2296,7 @@ mrb_block_given_p()
|
||||
{
|
||||
/*if (ruby_frame->iter == ITER_CUR && ruby_block)
|
||||
return 1;*//*Qtrue*/
|
||||
return 0/*Qfalse*/;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* 15.2.10.5.37 */
|
||||
|
||||
+1
-1
@@ -236,7 +236,7 @@ is_special_global_name(const char* m)
|
||||
if (is_identchar(*m)) m += 1;
|
||||
break;
|
||||
default:
|
||||
if (!ISDIGIT(*m)) return 0;
|
||||
if (!ISDIGIT(*m)) return FALSE;
|
||||
do ++m; while (ISDIGIT(*m));
|
||||
}
|
||||
return !*m;
|
||||
|
||||
+21
-21
@@ -122,16 +122,16 @@ iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
|
||||
mrb_sym key = seg->key[i];
|
||||
|
||||
if (!seg->next && i >= t->last_len) {
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
if (key == sym) {
|
||||
if (vp) *vp = seg->val[i];
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
seg = seg->next;
|
||||
}
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -146,18 +146,18 @@ iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
|
||||
mrb_sym key = seg->key[i];
|
||||
|
||||
if (!seg->next && i >= t->last_len) {
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
if (key == sym) {
|
||||
t->size--;
|
||||
seg->key[i] = 0;
|
||||
if (vp) *vp = seg->val[i];
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
seg = seg->next;
|
||||
}
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -173,11 +173,11 @@ iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
|
||||
|
||||
/* no value in last segment after last_len */
|
||||
if (!seg->next && i >= t->last_len) {
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
if (key != 0) {
|
||||
n =(*func)(mrb, key, seg->val[i], p);
|
||||
if (n > 0) return 0;
|
||||
if (n > 0) return FALSE;
|
||||
if (n < 0) {
|
||||
t->size--;
|
||||
seg->key[i] = 0;
|
||||
@@ -186,7 +186,7 @@ iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
|
||||
}
|
||||
seg = seg->next;
|
||||
}
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -290,9 +290,9 @@ iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
|
||||
k = kh_get(iv, h, sym);
|
||||
if (k != kh_end(h)) {
|
||||
if (vp) *vp = kh_value(h, k);
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -307,10 +307,10 @@ iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
|
||||
mrb_value val = kh_value(h, k);
|
||||
kh_del(iv, h, k);
|
||||
if (vp) *vp = val;
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -324,14 +324,14 @@ iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
|
||||
for (k = kh_begin(h); k != kh_end(h); k++) {
|
||||
if (kh_exist(h, k)){
|
||||
n = (*func)(mrb, kh_key(h, k), kh_value(h, k), p);
|
||||
if (n > 0) return 0;
|
||||
if (n > 0) return FALSE;
|
||||
if (n < 0) {
|
||||
kh_del(iv, h, k);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -486,13 +486,13 @@ mrb_obj_iv_defined(mrb_state *mrb, struct RObject *obj, mrb_sym sym)
|
||||
if (t) {
|
||||
return iv_get(mrb, t, sym, NULL);
|
||||
}
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
int
|
||||
mrb_iv_defined(mrb_state *mrb, mrb_value obj, mrb_sym sym)
|
||||
{
|
||||
if (!obj_iv_p(obj)) return 0;
|
||||
if (!obj_iv_p(obj)) return FALSE;
|
||||
return mrb_obj_iv_defined(mrb, mrb_obj_ptr(obj), sym);
|
||||
}
|
||||
|
||||
@@ -670,7 +670,7 @@ mrb_const_defined(mrb_state *mrb, mrb_value mod, mrb_sym sym)
|
||||
struct RClass *m = mrb_class_ptr(mod);
|
||||
iv_tbl *t = m->iv;
|
||||
|
||||
if (!t) return 0;
|
||||
if (!t) return FALSE;
|
||||
return iv_get(mrb, t, sym, NULL);
|
||||
}
|
||||
|
||||
@@ -846,7 +846,7 @@ mrb_const_defined_0(mrb_state *mrb, struct RClass *klass, mrb_sym id, int exclud
|
||||
retry:
|
||||
while (tmp) {
|
||||
if (tmp->iv && iv_get(mrb, tmp->iv, id, NULL)) {
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
if (!recurse && (klass != mrb->object_class)) break;
|
||||
tmp = tmp->super;
|
||||
@@ -856,7 +856,7 @@ retry:
|
||||
tmp = mrb->object_class;
|
||||
goto retry;
|
||||
}
|
||||
return (int)0/*Qfalse*/;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
int
|
||||
@@ -893,7 +893,7 @@ csym_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
|
||||
|
||||
if (mrb_type(v) == c->tt && mrb_class_ptr(v) == c) {
|
||||
a->sym = sym;
|
||||
return 1; /* stop iteration*/
|
||||
return 1; /* stop iteration */
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user