summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-08-13 04:19:24 +0900
committerYukihiro Matsumoto <[email protected]>2012-08-13 04:19:24 +0900
commit1ed39d5c05bd37c6633e7729efb8e7aa46d7fdda (patch)
tree4b2a1b4540c7caf278b441356d47b74b27ea744c /src
parent0143a85a21027f0f171abb1d00a2e000a364671c (diff)
downloadmruby-1ed39d5c05bd37c6633e7729efb8e7aa46d7fdda.tar.gz
mruby-1ed39d5c05bd37c6633e7729efb8e7aa46d7fdda.zip
use TRUE/FALSE instead of 1/0
Diffstat (limited to 'src')
-rw-r--r--src/class.c6
-rw-r--r--src/codegen.c4
-rw-r--r--src/kernel.c4
-rw-r--r--src/object.c6
-rw-r--r--src/pool.c8
-rw-r--r--src/string.c2
-rw-r--r--src/symbol.c2
-rw-r--r--src/variable.c42
-rw-r--r--src/vm.c4
9 files changed, 39 insertions, 39 deletions
diff --git a/src/class.c b/src/class.c
index 8244a8637..d6bb85a58 100644
--- a/src/class.c
+++ b/src/class.c
@@ -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
diff --git a/src/codegen.c b/src/codegen.c
index 4f118753e..38d57d581 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -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
diff --git a/src/kernel.c b/src/kernel.c
index 4e5931fba..1334d8f9f 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -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 */
diff --git a/src/object.c b/src/object.c
index 26df48afd..20310d288 100644
--- a/src/object.c
+++ b/src/object.c
@@ -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
diff --git a/src/pool.c b/src/pool.c
index daa6d0f69..71e4b477d 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -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*
diff --git a/src/string.c b/src/string.c
index aef0ac88f..b749614dc 100644
--- a/src/string.c
+++ b/src/string.c
@@ -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 */
diff --git a/src/symbol.c b/src/symbol.c
index fdb0aa861..6b29ed350 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -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;
diff --git a/src/variable.c b/src/variable.c
index 3f08849a7..187e8cdd4 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -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;
}
diff --git a/src/vm.c b/src/vm.c
index fa5a52d1f..6cb421642 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -452,9 +452,9 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
CASE(OP_MOVE) {
/* A B R(A) := R(B) */
-#if 0
+#if 1
regs[GETARG_A(i)] = regs[GETARG_B(i)];
-#elif 1
+#elif 0
int a = GETARG_A(i);
int b = GETARG_B(i);