Merge pull request #1674 from cremno/mrb_bool-FALSE-TRUE

use mrb_bool, FALSE and TRUE more

3 files changed, 6 insertions, 5 deletions

diff --git a/include/mruby/compile.h b/include/mruby/compile.h
index c416df082..6717f001e 100644
--- a/include/mruby/compile.h
+++ b/include/mruby/compile.h
@@ -119,7 +119,8 @@ struct mrb_parser_state {
   unsigned int cmdarg_stack;
   int paren_nest;
   int lpar_beg;
-  int in_def, in_single, cmd_start;
+  int in_def, in_single;
+  mrb_bool cmd_start:1;
   mrb_ast_node *locals;
 
   mrb_ast_node *pb;
@@ -138,7 +139,7 @@ struct mrb_parser_state {
   size_t nwarn;
   mrb_ast_node *tree;
 
-  int capture_errors;
+  mrb_bool capture_errors:1;
   struct mrb_parser_message error_buffer[10];
   struct mrb_parser_message warn_buffer[10];
 
diff --git a/include/mruby/range.h b/include/mruby/range.h
index 6030410ba..78ddf32a3 100644
--- a/include/mruby/range.h
+++ b/include/mruby/range.h
@@ -26,7 +26,7 @@ struct RRange {
 #define mrb_range_value(p)  mrb_obj_value((void*)(p))
 
 mrb_value mrb_range_new(mrb_state*, mrb_value, mrb_value, int);
-mrb_int mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len);
+mrb_bool mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len);
 
 #if defined(__cplusplus)
 }  /* extern "C" { */
diff --git a/include/mruby/string.h b/include/mruby/string.h
index c6d2e0e70..fbc39368b 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -55,8 +55,8 @@ int mrb_str_offset(mrb_state *mrb, mrb_value str, int pos);
 mrb_value mrb_str_dup(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_intern(mrb_state *mrb, mrb_value self);
 mrb_value mrb_str_cat_cstr(mrb_state *, mrb_value, const char *);
-mrb_value mrb_str_to_inum(mrb_state *mrb, mrb_value str, int base, int badcheck);
-double mrb_str_to_dbl(mrb_state *mrb, mrb_value str, int badcheck);
+mrb_value mrb_str_to_inum(mrb_state *mrb, mrb_value str, int base, mrb_bool badcheck);
+double mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck);
 mrb_value mrb_str_to_str(mrb_state *mrb, mrb_value str);
 mrb_int mrb_str_hash(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_buf_append(mrb_state *mrb, mrb_value str, mrb_value str2);