* vm_core.h: change semantics of opt_num and opt_table.

  `opt_num' was the number of optional parameters + 1.
  `opt_table' has "opt_num" entries.
  Change them to:
  `opt_num' is the number of optional parameters.
  `opt_talbe' has "opt_num + 1" entries.
  This change simplify parameter fitting logics.
* compile.c: catch up this change.
* iseq.c: ditto.
* proc.c: ditto.
* vm_args.c: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 4 deletions

diff --git a/proc.c b/proc.c
index 55985752ae..a44cc53bca 100644
--- a/proc.c
+++ b/proc.c
@@ -848,10 +848,8 @@ static inline int
 rb_iseq_min_max_arity(const rb_iseq_t *iseq, int *max)
 {
     *max = iseq->param.flags.has_rest == FALSE ?
-      iseq->param.lead_num + iseq->param.post_num +
-      iseq->param.opt_num - (iseq->param.flags.has_opt == TRUE) +
-      (iseq->param.flags.has_kw == TRUE) +
-      (iseq->param.flags.has_kwrest == TRUE)
+      iseq->param.lead_num + iseq->param.opt_num + iseq->param.post_num +
+      (iseq->param.flags.has_kw == TRUE || iseq->param.flags.has_kwrest == TRUE)
       : UNLIMITED_ARGUMENTS;
     return iseq->param.lead_num + iseq->param.post_num + (iseq->param.flags.has_kw && iseq->param.keyword->required_num > 0);
 }