Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #997 from monaka/pr-add-type-mrb_bool_t

Define mrb_bool_t.
  • Loading branch information...
commit ce1756b3b6a23050d96d49aef64a7f964e8bc75f 2 parents 38571fd + 1ffc9ba
@matz matz authored
View
2  include/mrbconf.h
@@ -110,8 +110,10 @@ typedef short mrb_sym;
# define strtoll _strtoi64
# define PRId32 "I32d"
# define PRId64 "I64d"
+typedef unsigned int mrb_bool;
#else
# include <inttypes.h>
+typedef _Bool mrb_bool;
#endif
#ifdef ENABLE_STDIO
View
6 include/mruby.h
@@ -121,9 +121,9 @@ typedef struct mrb_state {
size_t gc_threshold;
int gc_interval_ratio;
int gc_step_ratio;
- unsigned int gc_disabled:1;
- unsigned int gc_full:1;
- unsigned int is_generational_gc_mode:1;
+ mrb_bool gc_disabled:1;
+ mrb_bool gc_full:1;
+ mrb_bool is_generational_gc_mode:1;
size_t majorgc_old_threshold;
struct alloca_header *mems;
View
14 include/mruby/compile.h
@@ -21,9 +21,9 @@ typedef struct mrbc_context {
int slen;
char *filename;
short lineno;
- int capture_errors:1;
- int dump_result:1;
- int no_exec:1;
+ mrb_bool capture_errors:1;
+ mrb_bool dump_result:1;
+ mrb_bool no_exec:1;
} mrbc_context;
mrbc_context* mrbc_context_new(mrb_state *mrb);
@@ -67,8 +67,8 @@ enum heredoc_type {
/* heredoc structure */
struct mrb_parser_heredoc_info {
enum heredoc_type type;
- int allow_indent:1;
- int line_head:1;
+ mrb_bool allow_indent:1;
+ mrb_bool line_head:1;
const char *term;
int term_len;
mrb_ast_node *doc;
@@ -102,8 +102,8 @@ struct mrb_parser_state {
mrb_ast_node *heredocs; /* list of mrb_parser_heredoc_info* */
mrb_ast_node *parsing_heredoc;
- int heredoc_starts_nextline:1;
- int heredoc_end_now:1; /* for mirb */
+ mrb_bool heredoc_starts_nextline:1;
+ mrb_bool heredoc_end_now:1; /* for mirb */
void *ylval;
View
2  src/codegen.c
@@ -49,7 +49,7 @@ typedef struct scope {
int pc;
int lastlabel;
int ainfo:15;
- int mscope:1;
+ mrb_bool mscope:1;
struct loopinfo *loop;
int ensure_level;
View
2  src/gc.c
@@ -197,7 +197,7 @@ struct heap_page {
struct heap_page *next;
struct heap_page *free_next;
struct heap_page *free_prev;
- unsigned int old:1;
+ mrb_bool old:1;
RVALUE objects[MRB_HEAP_PAGE_SIZE];
};
View
4 tools/mrbc/mrbc.c
@@ -19,8 +19,8 @@ struct _args {
char *filename;
char *initname;
char *ext;
- int check_syntax : 1;
- int verbose : 1;
+ mrb_bool check_syntax : 1;
+ mrb_bool verbose : 1;
};
static void
View
8 tools/mruby/mruby.c
@@ -26,10 +26,10 @@ void mrb_show_copyright(mrb_state *);
struct _args {
FILE *rfp;
char* cmdline;
- int fname : 1;
- int mrbfile : 1;
- int check_syntax : 1;
- int verbose : 1;
+ mrb_bool fname : 1;
+ mrb_bool mrbfile : 1;
+ mrb_bool check_syntax : 1;
+ mrb_bool verbose : 1;
int argc;
char** argv;
};
Please sign in to comment.
Something went wrong with that request. Please try again.