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

Removed no longer used variable last_hash

Browse Source 
1. By substituting `n_var` with its initializer, `0 < n_var` is
   equivalent to `argc > argi + n_trail`.
2. As `argi` is non-negative, so `argi + n_trail >= n_trail`, and
   the above expression is equivalent to `argc > n_trail`.
3. Therefore, `f_last` is always false, and `last_hash` is no
   longer used.
This commit is contained in:
Nobuyoshi Nakada 2020-02-02 23:09:25 +09:00 committed by GitHub
parent f5806eb206
commit fae537259d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2020-02-02 23:09:57 +09:00 
Merged: https://github.com/ruby/ruby/pull/2873

Merged-By: nobu <nobu@ruby-lang.org>
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
class.c
View File

@ -1964,7 +1964,6 @@ struct rb_scan_args_t {
int n_mand; int n_mand;
int argi; int argi;
VALUE hash; VALUE hash;
VALUE last_hash;
}; };
static void static void
@ -2065,11 +2064,7 @@ rb_scan_args_assign(struct rb_scan_args_t *arg, va_list vargs)
var = va_arg(vargs, VALUE *); var = va_arg(vargs, VALUE *);
if (0 < n_var) { if (0 < n_var) {
if (var) { if (var) *var = rb_ary_new4(n_var, &arg->argv[argi]);
int f_last = (arg->argc == arg->n_trail);
*var = rb_ary_new4(n_var - f_last, &arg->argv[argi]);
if (f_last) rb_ary_push(*var, arg->last_hash);
}
argi += n_var; argi += n_var;
} }
else { else {

8
include/ruby/ruby.h
View File

@ -2482,7 +2482,7 @@ rb_scan_args_set(int argc, const VALUE *argv,
# endif # endif
{ {
int i, argi = 0, vari = 0; int i, argi = 0, vari = 0;
VALUE *var, hash = Qnil, last_hash = 0; VALUE *var, hash = Qnil;
const int n_mand = n_lead + n_trail; const int n_mand = n_lead + n_trail;
if (f_hash && argc > 0 && rb_keyword_given_p()) { if (f_hash && argc > 0 && rb_keyword_given_p()) {
@ -2517,11 +2517,7 @@ rb_scan_args_set(int argc, const VALUE *argv,
var = vars[vari++]; var = vars[vari++];
if (0 < n_var) { if (0 < n_var) {
if (var) { if (var) *var = rb_ary_new4(n_var, &argv[argi]);
int f_last = (argc == n_trail);
*var = rb_ary_new4(n_var-f_last, &argv[argi]);
if (f_last) rb_ary_push(*var, last_hash);
}
argi += n_var; argi += n_var;
} }
else { else {