Merge pull request #2118 from ksss/range-bool

RRange excl flag use mrb_bool insteard of int

3 files changed, 6 insertions, 6 deletions

diff --git a/include/mruby/range.h b/include/mruby/range.h
index 78ddf32a3..828ec2691 100644
--- a/include/mruby/range.h
+++ b/include/mruby/range.h
@@ -19,13 +19,13 @@ typedef struct mrb_range_edges {
 struct RRange {
   MRB_OBJECT_HEADER;
   mrb_range_edges *edges;
-  int excl;
+  mrb_bool excl : 1;
 };
 
 #define mrb_range_ptr(v)    ((struct RRange*)(mrb_ptr(v)))
 #define mrb_range_value(p)  mrb_obj_value((void*)(p))
 
-mrb_value mrb_range_new(mrb_state*, mrb_value, mrb_value, int);
+mrb_value mrb_range_new(mrb_state*, mrb_value, mrb_value, mrb_bool);
 mrb_bool mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len);
 
 #if defined(__cplusplus)
diff --git a/src/codegen.c b/src/codegen.c
index b35599470..204ec64d0 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -1448,7 +1448,7 @@ codegen(codegen_scope *s, node *tree, int val)
     codegen(s, tree->cdr, val);
     if (val) {
       pop(); pop();
-      genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), 0));
+      genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), FALSE));
       push();
     }
     break;
@@ -1458,7 +1458,7 @@ codegen(codegen_scope *s, node *tree, int val)
     codegen(s, tree->cdr, val);
     if (val) {
       pop(); pop();
-      genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), 1));
+      genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), TRUE));
       push();
     }
     break;
diff --git a/src/range.c b/src/range.c
index 6b1f7faa2..b59b234ef 100644
--- a/src/range.c
+++ b/src/range.c
@@ -33,7 +33,7 @@ range_check(mrb_state *mrb, mrb_value a, mrb_value b)
 }
 
 mrb_value
-mrb_range_new(mrb_state *mrb, mrb_value beg, mrb_value end, int excl)
+mrb_range_new(mrb_state *mrb, mrb_value beg, mrb_value end, mrb_bool excl)
 {
   struct RRange *r;
 
@@ -95,7 +95,7 @@ mrb_range_excl(mrb_state *mrb, mrb_value range)
 }
 
 static void
-range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, int exclude_end)
+range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, mrb_bool exclude_end)
 {
   struct RRange *r = mrb_range_ptr(range);