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

ruby.c: simplify

Browse Source 
* ruby.c (load_file_internal): simplify by local variables instead
  of repeating RSTRING macros.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-03-04 05:19:12 +00:00
parent 38dd6a3881
commit 989a6f1ce8
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruby.c
View File

@ -1697,7 +1697,8 @@ load_file_internal(VALUE argp_v)
if (script) { if (script) {
VALUE c = 1; /* something not nil */ VALUE c = 1; /* something not nil */
VALUE line; VALUE line;
char *p; char *p, *str;
long len;
int no_src_enc = !opt->src.enc.name; int no_src_enc = !opt->src.enc.name;
int no_ext_enc = !opt->ext.enc.name; int no_ext_enc = !opt->ext.enc.name;
int no_int_enc = !opt->intern.enc.name; int no_int_enc = !opt->intern.enc.name;
@ -1712,10 +1713,9 @@ load_file_internal(VALUE argp_v)
opt->xflag = FALSE; opt->xflag = FALSE;
while (!NIL_P(line = rb_io_gets(f))) { while (!NIL_P(line = rb_io_gets(f))) {
line_start++; line_start++;
if (RSTRING_LEN(line) > 2 RSTRING_GETMEM(line, str, len);
&& RSTRING_PTR(line)[0] == '#' if (len > 2 && str[0] == '#' && str[1] == '!') {
&& RSTRING_PTR(line)[1] == '!') { if ((p = strstr(str+2, ruby_engine)) != 0) {
if ((p = strstr(RSTRING_PTR(line), ruby_engine)) != 0) {
goto start_read; goto start_read;
} }
} }
@ -1731,15 +1731,16 @@ load_file_internal(VALUE argp_v)
if (NIL_P(line)) if (NIL_P(line))
return 0; return 0;
if ((p = strstr(RSTRING_PTR(line), ruby_engine)) == 0) { RSTRING_GETMEM(line, str, len);
if ((p = strstr(str, ruby_engine)) == 0) {
/* not ruby script, assume -x flag */ /* not ruby script, assume -x flag */
goto search_shebang; goto search_shebang;
} }
start_read: start_read:
RSTRING_PTR(line)[RSTRING_LEN(line) - 1] = '\0'; str += len - 1;
if (RSTRING_PTR(line)[RSTRING_LEN(line) - 2] == '\r') if (*str == '\n') *str-- = '\0';
RSTRING_PTR(line)[RSTRING_LEN(line) - 2] = '\0'; if (*str == '\r') *str-- = '\0';
/* ruby_engine should not contain a space */ /* ruby_engine should not contain a space */
if ((p = strstr(p, " -")) != 0) { if ((p = strstr(p, " -")) != 0) {
opt->warning = 0; opt->warning = 0;