1 files changed, 11 insertions, 13 deletions

diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index c2ba43002..a32a89985 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -1,13 +1,11 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "mruby.h"
-#include "mruby/proc.h"
 #include "mruby/array.h"
-#include "mruby/string.h"
 #include "mruby/compile.h"
 #include "mruby/dump.h"
 #include "mruby/variable.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #ifndef ENABLE_STDIO
 static void
@@ -77,10 +75,10 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
     item = argv[0] + 1;
     switch (*item++) {
     case 'b':
-      args->mrbfile = 1;
+      args->mrbfile = TRUE;
       break;
     case 'c':
-      args->check_syntax = 1;
+      args->check_syntax = TRUE;
       break;
     case 'e':
       if (item[0]) {
@@ -118,7 +116,7 @@ append_cmdline:
       break;
     case 'v':
       if (!args->verbose) mrb_show_version(mrb);
-      args->verbose = 1;
+      args->verbose = TRUE;
       break;
     case '-':
       if (strcmp((*argv) + 2, "version") == 0) {
@@ -126,7 +124,7 @@ append_cmdline:
         exit(EXIT_SUCCESS);
       }
       else if (strcmp((*argv) + 2, "verbose") == 0) {
-        args->verbose = 1;
+        args->verbose = TRUE;
         break;
       }
       else if (strcmp((*argv) + 2, "copyright") == 0) {
@@ -146,7 +144,7 @@ append_cmdline:
         printf("%s: Cannot open program file. (%s)\n", *origargv, *argv);
         return 0;
       }
-      args->fname = 1;
+      args->fname = TRUE;
       args->cmdline = argv[0];
       argc--; argv++;
     }
@@ -201,14 +199,14 @@ main(int argc, char **argv)
 
   c = mrbc_context_new(mrb);
   if (args.verbose)
-    c->dump_result = 1;
+    c->dump_result = TRUE;
   if (args.check_syntax)
-    c->no_exec = 1;
+    c->no_exec = FALSE;
   if (args.mrbfile) {
     v = mrb_load_irep_file_cxt(mrb, args.rfp, c);
   }
   else {
-    mrb_sym zero_sym = mrb_intern2(mrb, "$0", 2);
+    mrb_sym zero_sym = mrb_intern_lit(mrb, "$0");
 
     if (args.rfp) {
       char *cmdline;