* class.c (rb_scan_args): Allow specifying the number of trailing

  mandatory arguments right after the number of optional arguments
  only if the number of leading mandatory arguments is not omitted.

* ext/socket/tcpserver.c (tcp_svr_init): Make use of it.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 0 deletions

diff --git a/class.c b/class.c
index 7ba47e4e2..a75a789ce 100644
--- a/class.c
+++ b/class.c
@@ -934,6 +934,11 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	if (ISDIGIT(*p)) {
 	    n_opt = *p - '0';
 	    p++;
+	    if (ISDIGIT(*p)) {
+		n_trail = *p - '0';
+		p++;
+		goto block_arg;
+	    }
 	}
     }
     if (*p == '*') {
@@ -944,6 +949,7 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	    p++;
 	}
     }
+  block_arg:
     if (*p == '&') {
 	f_block = 1;
 	p++;