1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby.c: unify nested code

Browse Source 
* ruby.c (load_file): unify each preparations and clean-ups by
  merging load_file_internal and load_file_internal2, and remove
  nested rb_protect and rb_ensure.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-10-17 04:19:12 +00:00
parent f63ad35524
commit c1a6fdc86c
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Oct 17 13:19:10 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (load_file): unify each preparations and clean-ups by
merging load_file_internal and load_file_internal2, and remove
nested rb_protect and rb_ensure.
Sat Oct 17 05:28:32 2015 Rei Odaira <Rei.Odaira@gmail.com> Sat Oct 17 05:28:32 2015 Rei Odaira <Rei.Odaira@gmail.com>
* test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up * test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up

50
ruby.c
View File

@ -1603,10 +1603,11 @@ struct load_file_arg {
int xflag; int xflag;
struct cmdline_options *opt; struct cmdline_options *opt;
VALUE f; VALUE f;
VALUE lineno;
}; };
static VALUE static VALUE
load_file_internal2(VALUE argp_v) load_file_internal(VALUE argp_v)
{ {
struct load_file_arg *argp = (struct load_file_arg *)argp_v; struct load_file_arg *argp = (struct load_file_arg *)argp_v;
VALUE parser = argp->parser; VALUE parser = argp->parser;
@ -1620,6 +1621,7 @@ load_file_internal2(VALUE argp_v)
ID set_encoding; ID set_encoding;
int xflag = argp->xflag; int xflag = argp->xflag;
argp->script = 0;
CONST_ID(set_encoding, "set_encoding"); CONST_ID(set_encoding, "set_encoding");
if (script) { if (script) {
VALUE c = 1; /* something not nil */ VALUE c = 1; /* something not nil */
@ -1719,25 +1721,17 @@ load_file_internal2(VALUE argp_v)
rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-")); rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
tree = rb_parser_compile_file_path(parser, orig_fname, f, line_start); tree = rb_parser_compile_file_path(parser, orig_fname, f, line_start);
rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser)); rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
if (script && rb_parser_end_seen_p(parser)) argp->script = script;
return (VALUE)tree; return (VALUE)tree;
} }
static VALUE static VALUE
load_file_internal(VALUE arg) open_load_file(VALUE fname_v, int *xflag)
{ {
extern VALUE rb_stdin;
struct load_file_arg *argp = (struct load_file_arg *)arg;
VALUE parser = argp->parser;
VALUE orig_fname = argp->fname;
VALUE fname_v = rb_str_encode_ospath(orig_fname);
const char *fname = StringValueCStr(fname_v); const char *fname = StringValueCStr(fname_v);
int script = argp->script;
VALUE f; VALUE f;
NODE *tree;
int xflag = 0;
int state;
if (strcmp(fname, "-") == 0) { if (RSTRING_LEN(fname_v) == 1 && fname[0] == '-') {
f = rb_stdin; f = rb_stdin;
} }
else { else {
@ -1753,7 +1747,7 @@ load_file_internal(VALUE arg)
const char *ext = strrchr(fname, '.'); const char *ext = strrchr(fname, '.');
if (ext && STRCASECMP(ext, ".exe") == 0) { if (ext && STRCASECMP(ext, ".exe") == 0) {
mode |= O_BINARY; mode |= O_BINARY;
xflag = 1; *xflag = 1;
} }
} }
#endif #endif
@ -1774,17 +1768,17 @@ load_file_internal(VALUE arg)
#endif #endif
f = rb_io_fdopen(fd, mode, fname); f = rb_io_fdopen(fd, mode, fname);
} }
return f;
}
argp->f = f; static VALUE
argp->xflag = xflag; restore_load_file(VALUE arg)
tree = (NODE *)rb_protect(load_file_internal2, (VALUE)argp, &state); {
if (state) { struct load_file_arg *argp = (struct load_file_arg *)arg;
if (f != rb_stdin) VALUE f = argp->f;
rb_io_close(f); VALUE lineno = argp->lineno;
rb_jump_tag(state);
}
if (script && tree && rb_parser_end_seen_p(parser)) { if (argp->script) {
/* /*
* DATA is a File that contains the data section of the executed file. * DATA is a File that contains the data section of the executed file.
* To create a data section use <tt>__END__</tt>: * To create a data section use <tt>__END__</tt>:
@ -1802,12 +1796,6 @@ load_file_internal(VALUE arg)
else if (f != rb_stdin) { else if (f != rb_stdin) {
rb_io_close(f); rb_io_close(f);
} }
return (VALUE)tree;
}
static VALUE
restore_lineno(VALUE lineno)
{
return rb_gv_set("$.", lineno); return rb_gv_set("$.", lineno);
} }
@ -1819,7 +1807,11 @@ load_file(VALUE parser, VALUE fname, int script, struct cmdline_options *opt)
arg.fname = fname; arg.fname = fname;
arg.script = script; arg.script = script;
arg.opt = opt; arg.opt = opt;
return (NODE *)rb_ensure(load_file_internal, (VALUE)&arg, restore_lineno, rb_gv_get("$.")); arg.xflag = 0;
arg.lineno = rb_gv_get("$.");
arg.f = open_load_file(rb_str_encode_ospath(fname), &arg.xflag);
return (NODE *)rb_ensure(load_file_internal, (VALUE)&arg,
restore_load_file, (VALUE)&arg);
} }
void * void *