Merge branch 'master' of github.com:mruby/mruby

This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-05-15 12:09:05 +09:00
2 changed files with 4 additions and 2 deletions
+2 -2
View File
@@ -310,7 +310,7 @@ class RakeApp
['--nosearch', '-N', GetoptLong::NO_ARGUMENT,
"Do not search parent directories for the Rakefile."],
['--quiet', '-q', GetoptLong::NO_ARGUMENT,
"Do not log messages to standard output."],
"Do not log messages to standard output (default)."],
['--rakefile', '-f', GetoptLong::REQUIRED_ARGUMENT,
"Use FILE as the rakefile."],
['--require', '-r', GetoptLong::REQUIRED_ARGUMENT,
@@ -324,7 +324,7 @@ class RakeApp
['--usage', '-h', GetoptLong::NO_ARGUMENT,
"Display usage."],
['--verbose', '-v', GetoptLong::NO_ARGUMENT,
"Log message to standard output (default)."],
"Log message to standard output."],
['--directory', '-C', GetoptLong::REQUIRED_ARGUMENT,
"Change executing directory of rakefiles."]
]
+2
View File
@@ -2638,6 +2638,7 @@ loop_pop(codegen_scope *s, int val)
if (val) push();
}
#ifdef ENABLE_STDIO
static int
print_r(mrb_state *mrb, mrb_irep *irep, size_t n, int pre)
{
@@ -2680,6 +2681,7 @@ print_lv(mrb_state *mrb, mrb_irep *irep, mrb_code c, int r)
}
printf("\n");
}
#endif
static void
codedump(mrb_state *mrb, mrb_irep *irep)