diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-01-16 01:40:27 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-01-16 01:40:27 -0800 |
| commit | 016e82173677ab626f66fc85c547c3860e3037af (patch) | |
| tree | 7783f5ac82c9869ba5983946d87bf701b92fd23e /src | |
| parent | 6445f575874c4c9b3cb81c6b586774e960705ea0 (diff) | |
| parent | 0a22c59938d3a69900bd9b9468c1c9898bcb4684 (diff) | |
| download | mruby-016e82173677ab626f66fc85c547c3860e3037af.tar.gz mruby-016e82173677ab626f66fc85c547c3860e3037af.zip | |
Merge pull request #739 from cremno/use-b-specifier
Use new mrb_get_args binary specifier.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gc.c | 10 | ||||
| -rw-r--r-- | src/kernel.c | 5 | ||||
| -rw-r--r-- | src/object.c | 32 |
3 files changed, 22 insertions, 25 deletions
@@ -1188,13 +1188,13 @@ gc_generational_mode_get(mrb_state *mrb, mrb_value self) static mrb_value gc_generational_mode_set(mrb_state *mrb, mrb_value self) { - mrb_value enable; + int enable; - mrb_get_args(mrb, "o", &enable); - if (mrb->is_generational_gc_mode != mrb_test(enable)) - change_gen_gc_mode(mrb, mrb_test(enable)); + mrb_get_args(mrb, "b", &enable); + if (mrb->is_generational_gc_mode != enable) + change_gen_gc_mode(mrb, enable); - if (mrb_test(enable)) + if (enable) return mrb_true_value(); else return mrb_false_value(); diff --git a/src/kernel.c b/src/kernel.c index 5e8a2f5aa..de4e474b3 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -728,10 +728,7 @@ class_instance_method_list(mrb_state *mrb, int argc, mrb_value *argv, struct RCl recur = TRUE; } else { - mrb_value r; - - mrb_get_args(mrb, "o", &r); - recur = mrb_test(r); + mrb_get_args(mrb, "b", &recur); } ary = mrb_ary_new(mrb); oldklass = 0; diff --git a/src/object.c b/src/object.c index 51b5c12d9..99034e3be 100644 --- a/src/object.c +++ b/src/object.c @@ -112,10 +112,10 @@ nil_inspect(mrb_state *mrb, mrb_value obj) static mrb_value true_and(mrb_state *mrb, mrb_value obj) { - mrb_value obj2; + int obj2; - mrb_get_args(mrb, "o", &obj2); - return mrb_test(obj2)?mrb_true_value():mrb_false_value(); + mrb_get_args(mrb, "b", &obj2); + return obj2 ? mrb_true_value() : mrb_false_value(); } /* 15.2.5.3.2 */ @@ -131,10 +131,10 @@ true_and(mrb_state *mrb, mrb_value obj) static mrb_value true_xor(mrb_state *mrb, mrb_value obj) { - mrb_value obj2; + int obj2; - mrb_get_args(mrb, "o", &obj2); - return mrb_test(obj2)?mrb_false_value():mrb_true_value(); + mrb_get_args(mrb, "b", &obj2); + return obj2 ? mrb_false_value() : mrb_true_value(); } /* 15.2.5.3.3 */ @@ -171,9 +171,9 @@ true_to_s(mrb_state *mrb, mrb_value obj) static mrb_value true_or(mrb_state *mrb, mrb_value obj) { - mrb_value obj2; + int obj2; - mrb_get_args(mrb, "o", &obj2); + mrb_get_args(mrb, "b", &obj2); return mrb_true_value(); } @@ -202,9 +202,9 @@ true_or(mrb_state *mrb, mrb_value obj) static mrb_value false_and(mrb_state *mrb, mrb_value obj) { - mrb_value obj2; + int obj2; - mrb_get_args(mrb, "o", &obj2); + mrb_get_args(mrb, "b", &obj2); return mrb_false_value(); } @@ -224,10 +224,10 @@ false_and(mrb_state *mrb, mrb_value obj) static mrb_value false_xor(mrb_state *mrb, mrb_value obj) { - mrb_value obj2; + int obj2; - mrb_get_args(mrb, "o", &obj2); - return mrb_test(obj2)?mrb_true_value():mrb_false_value(); + mrb_get_args(mrb, "b", &obj2); + return obj2 ? mrb_true_value() : mrb_false_value(); } /* 15.2.4.3.3 */ @@ -244,10 +244,10 @@ false_xor(mrb_state *mrb, mrb_value obj) static mrb_value false_or(mrb_state *mrb, mrb_value obj) { - mrb_value obj2; + int obj2; - mrb_get_args(mrb, "o", &obj2); - return mrb_test(obj2)?mrb_true_value():mrb_false_value(); + mrb_get_args(mrb, "b", &obj2); + return obj2 ? mrb_true_value() : mrb_false_value(); } /* 15.2.6.3.3 */ |
