X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Parameters.xs;h=286e79d8422abef31fab927af8cbf0be4b8f6444;hb=91ad192b5d94ea86efed8a11b02174d7216897aa;hp=5d97321a6de26dd6eef2a35199ebed2c85ffd5bb;hpb=0f875412cdfbc1f0602b973fcd93d34189e8a43f;p=p5sagit%2FFunction-Parameters.git

diff --git a/Parameters.xs b/Parameters.xs
index 5d97321..286e79d 100644
--- a/Parameters.xs
+++ b/Parameters.xs
@@ -450,6 +450,7 @@ DEFSTRUCT(ParamSpec) {
 	VEC(Param) named_required;
 	VEC(ParamInit) named_optional;
 	Param slurpy;
+	PADOFFSET rest_hash;
 };
 
 DEFVECTOR_INIT(pv_init, Param);
@@ -467,6 +468,7 @@ static void ps_init(ParamSpec *ps) {
 	pv_init(&ps->named_required);
 	piv_init(&ps->named_optional);
 	p_init(&ps->slurpy);
+	ps->rest_hash = NOT_IN_PAD;
 }
 
 #define DEFVECTOR_EXTEND(N, B) static B (*N(VEC(B) *p)) { \
@@ -691,56 +693,25 @@ static OP *my_var(pTHX_ I32 flags, PADOFFSET padoff) {
 	return my_var_g(aTHX_ OP_PADSV, flags, padoff);
 }
 
-static SV *mkbits1(pTHX_ size_t n) {
-	size_t bytes = n / 8, bits = n % 8;
-	SV *sv = newSV(bytes + !!bits);
-	char *p = SvPVX(sv), *q = p;
-	while (bytes--) {
-		*p++ = '\xff';
-	}
-	if (bits) {
-		*p++ = (1u << bits) - 1;
-	}
-	*p = '\0';
-	SvCUR_set(sv, p - q);
-	SvPOK_on(sv);
-	return sv;
+static OP *mkhvelem(pTHX_ PADOFFSET h, OP *k) {
+	OP *hv = my_var_g(aTHX_ OP_PADHV, OPf_REF, h);
+	return newBINOP(OP_HELEM, 0, hv, k);
 }
 
-static OP *mkvecbits(pTHX_ PADOFFSET padoff, size_t i) {
-	OP *first, *mid, *last, *vec;
-
-	last = newSVOP(OP_CONST, 0, newSViv(1));
-	first = last;
-
-	mid = newSVOP(OP_CONST, 0, newSViv(i));
-	mid->op_sibling = first;
-	first = mid;
-
-	mid = my_var(aTHX_ 0, padoff);
-	mid->op_sibling = first;
-
-	first = newOP(OP_PUSHMARK, 0);
-
-	vec = newLISTOP(OP_VEC, 0, first, mid);
-	vec->op_targ = pad_alloc(OP_VEC, SVs_PADTMP);
-	((LISTOP *)vec)->op_last = last;
-	op_null(((LISTOP *)vec)->op_first);
-
-	return vec;
+static OP *mkconstsv(pTHX_ SV *sv) {
+	return newSVOP(OP_CONST, 0, sv);
 }
 
-static OP *mkargselem(pTHX_ OP *index) {
-	OP *args = newAVREF(newGVOP(OP_GV, 0, PL_defgv));
-	args->op_flags |= OPf_REF;
-
-	return newBINOP(OP_AELEM, 0, args, index);
+static OP *mkconstiv(pTHX_ IV i) {
+	return mkconstsv(aTHX_ newSViv(i));
 }
 
-static OP *mkargselemv(pTHX_ PADOFFSET v) {
-	return mkargselem(aTHX_ my_var(aTHX_ 0, v));
+static OP *mkconstpv(pTHX_ const char *p, size_t n) {
+	return mkconstsv(aTHX_ newSVpv(p, n));
 }
 
+#define mkconstpvs(S) mkconstpv(aTHX_ "" S "", sizeof S - 1)
+
 static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len, const KWSpec *spec) {
 	ParamSpec *param_spec;
 	SV *declarator;
@@ -959,6 +930,10 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 			my_check_prototype(aTHX_ declarator, proto);
 			lex_read_space(0);
 			c = lex_peek_unichar(0);
+			if (!(c == ':' || c == '{')) {
+				lex_stuff_pvs(":", 0);
+				c = ':';
+			}
 		}
 	}
 
@@ -1013,7 +988,7 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 				}
 
 				if (attr) {
-					*attrs_sentinel = op_append_elem(OP_LIST, *attrs_sentinel, newSVOP(OP_CONST, 0, SvREFCNT_inc_simple_NN(attr)));
+					*attrs_sentinel = op_append_elem(OP_LIST, *attrs_sentinel, mkconstsv(aTHX_ SvREFCNT_inc_simple_NN(attr)));
 				}
 
 				if (c == ':') {
@@ -1041,8 +1016,8 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 
 		newATTRSUB(
 			sub_ix,
-			newSVOP(OP_CONST, 0, SvREFCNT_inc_simple_NN(saw_name)),
-			proto ? newSVOP(OP_CONST, 0, SvREFCNT_inc_simple_NN(proto)) : NULL,
+			mkconstsv(aTHX_ SvREFCNT_inc_simple_NN(saw_name)),
+			proto ? mkconstsv(aTHX_ SvREFCNT_inc_simple_NN(proto)) : NULL,
 			NULL,
 			NULL
 		);
@@ -1067,23 +1042,26 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 		if (amin > 0) {
 			OP *chk, *cond, *err, *croak;
 
-			err = newSVOP(OP_CONST, 0,
-				          newSVpvf("Not enough arguments for %"SVf" (expected %d, got ", SVfARG(declarator), amin));
-			err = newBINOP(OP_CONCAT, 0,
-				           err,
-				           newAVREF(newGVOP(OP_GV, 0, PL_defgv)));
-			err = newBINOP(OP_CONCAT, 0,
-				           err,
-				           newSVOP(OP_CONST, 0, newSVpvs(")")));
+			err = mkconstsv(aTHX_ newSVpvf("Not enough arguments for %"SVf" (expected %d, got ", SVfARG(declarator), amin));
+			err = newBINOP(
+				OP_CONCAT, 0,
+				err,
+				newAVREF(newGVOP(OP_GV, 0, PL_defgv))
+			);
+			err = newBINOP(
+				OP_CONCAT, 0,
+				err,
+				mkconstpvs(")")
+			);
 
 			croak = newCVREF(OPf_WANT_SCALAR,
-				             newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV)));
+			                 newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV)));
 			err = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				          op_append_elem(OP_LIST, err, croak));
+			              op_append_elem(OP_LIST, err, croak));
 
 			cond = newBINOP(OP_LT, 0,
-				            newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
-				            newSVOP(OP_CONST, 0, newSViv(amin)));
+			                newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
+			                mkconstiv(aTHX_ amin));
 			chk = newLOGOP(OP_AND, 0, cond, err);
 
 			*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk));
@@ -1093,23 +1071,30 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 		if (amax >= 0) {
 			OP *chk, *cond, *err, *croak;
 
-			err = newSVOP(OP_CONST, 0,
-				          newSVpvf("Too many arguments for %"SVf" (expected %d, got ", SVfARG(declarator), amax));
-			err = newBINOP(OP_CONCAT, 0,
-				           err,
-				           newAVREF(newGVOP(OP_GV, 0, PL_defgv)));
-			err = newBINOP(OP_CONCAT, 0,
-				           err,
-				           newSVOP(OP_CONST, 0, newSVpvs(")")));
+			err = mkconstsv(aTHX_ newSVpvf("Too many arguments for %"SVf" (expected %d, got ", SVfARG(declarator), amax));
+			err = newBINOP(
+				OP_CONCAT, 0,
+				err,
+				newAVREF(newGVOP(OP_GV, 0, PL_defgv))
+			);
+			err = newBINOP(
+				OP_CONCAT, 0,
+				err,
+				mkconstpvs(")")
+			);
 
-			croak = newCVREF(OPf_WANT_SCALAR,
-				             newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV)));
+			croak = newCVREF(
+				OPf_WANT_SCALAR,
+				newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV))
+			);
 			err = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				          op_append_elem(OP_LIST, err, croak));
+			op_append_elem(OP_LIST, err, croak));
 
-			cond = newBINOP(OP_GT, 0,
-				            newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
-				            newSVOP(OP_CONST, 0, newSViv(amax)));
+			cond = newBINOP(
+				OP_GT, 0,
+				newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
+				mkconstiv(aTHX_ amax)
+			);
 			chk = newLOGOP(OP_AND, 0, cond, err);
 
 			*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk));
@@ -1119,30 +1104,27 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 			OP *chk, *cond, *err, *croak;
 			const UV fixed = count_positional_params(param_spec) + !!param_spec->invocant.name;
 
-			err = newSVOP(OP_CONST, 0,
-				          newSVpvf("Odd number of paired arguments for %"SVf"", SVfARG(declarator)));
+			err = mkconstsv(aTHX_ newSVpvf("Odd number of paired arguments for %"SVf"", SVfARG(declarator)));
 
-			croak = newCVREF(OPf_WANT_SCALAR,
-				             newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV)));
+			croak = newCVREF(
+				OPf_WANT_SCALAR,
+				newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV))
+			);
 			err = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				          op_append_elem(OP_LIST, err, croak));
+			op_append_elem(OP_LIST, err, croak));
 
 			cond = newBINOP(OP_GT, 0,
-				            fixed
-				            ? newBINOP(OP_SUBTRACT, 0,
-				                       newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
-				                       newSVOP(OP_CONST, 0, newSVuv(fixed)))
-				            : newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
-				            newSVOP(OP_CONST, 0, newSViv(0)));
+			                newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
+			                mkconstiv(aTHX_ fixed));
 			cond = newLOGOP(OP_AND, 0,
-				            cond,
-				            newBINOP(OP_MODULO, 0,
-				                     fixed
-				                     ? newBINOP(OP_SUBTRACT, 0,
-				                                newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
-				                                newSVOP(OP_CONST, 0, newSVuv(fixed)))
-				                     : newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
-				                     newSVOP(OP_CONST, 0, newSViv(2))));
+			                cond,
+			                newBINOP(OP_MODULO, 0,
+			                         fixed
+			                         ? newBINOP(OP_SUBTRACT, 0,
+			                                    newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
+			                                    mkconstiv(aTHX_ fixed))
+			                         : newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
+			                         mkconstiv(aTHX_ 2)));
 			chk = newLOGOP(OP_AND, 0, cond, err);
 
 			*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk));
@@ -1203,23 +1185,58 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 				lhs = op_append_elem(OP_LIST, lhs, var);
 			}
 
-			if (param_spec->slurpy.name) {
-				if (count_named_params(param_spec)) {
-					OP *const var = my_var_g(
-						aTHX_
-						SvPV_nolen(param_spec->slurpy.name)[0] == '@' ? OP_PADAV : OP_PADHV,
-						OPf_MOD | (OPpLVAL_INTRO << 8),
-						param_spec->slurpy.padoff
-					);
-					*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var));
+			{
+				PADOFFSET padoff;
+				I32 type;
+				bool slurpy_hash;
+
+				/*
+				 * cases:
+				 *  1) no named params
+				 *   1.1) slurpy
+				 *       => put it in
+				 *   1.2) no slurpy
+				 *       => nop
+				 *  2) named params
+				 *   2.1) no slurpy
+				 *       => synthetic %{rest}
+				 *   2.2) slurpy is a hash
+				 *       => put it in
+				 *   2.3) slurpy is an array
+				 *       => synthetic %{rest}
+				 *          remember to declare array later
+				 */
+
+				slurpy_hash = param_spec->slurpy.name && SvPV_nolen(param_spec->slurpy.name)[0] == '%';
+				if (!count_named_params(param_spec)) {
+					if (param_spec->slurpy.name) {
+						padoff = param_spec->slurpy.padoff;
+						type = slurpy_hash ? OP_PADHV : OP_PADAV;
+					} else {
+						padoff = NOT_IN_PAD;
+						type = OP_PADSV;
+					}
+				} else if (slurpy_hash) {
+					padoff = param_spec->slurpy.padoff;
+					type = OP_PADHV;
 				} else {
+					padoff = param_spec->rest_hash = pad_add_name_pvs("%{rest}", 0, NULL, NULL);
+					type = OP_PADHV;
+				}
+
+				if (padoff != NOT_IN_PAD) {
 					OP *const var = my_var_g(
 						aTHX_
-						SvPV_nolen(param_spec->slurpy.name)[0] == '@' ? OP_PADAV : OP_PADHV,
+						type,
 						OPf_WANT_LIST | (OPpLVAL_INTRO << 8),
-						param_spec->slurpy.padoff
+						padoff
 					);
+
 					lhs = op_append_elem(OP_LIST, lhs, var);
+
+					if (type == OP_PADHV) {
+						param_spec->rest_hash = padoff;
+					}
 				}
 			}
 
@@ -1238,7 +1255,7 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 			}
 		}
 
-		/* default arguments */
+		/* default positional arguments */
 		{
 			size_t i, lim, req;
 			OP *nest;
@@ -1253,7 +1270,7 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 				cond = newBINOP(
 					OP_LT, 0,
 					newAVREF(newGVOP(OP_GV, 0, PL_defgv)),
-					newSVOP(OP_CONST, 0, newSViv(req + i + 1))
+					mkconstiv(aTHX_ req + i + 1)
 				);
 
 				var = my_var(aTHX_ 0, cur->param.padoff);
@@ -1279,383 +1296,143 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len
 
 		/* named parameters */
 		if (count_named_params(param_spec)) {
-			int nameblock_ix;
-			OP *nameblock;
-			PADOFFSET vb, vc, vi, vk;
-			int vb_is_str, vc_is_str;
-			const size_t pos = count_positional_params(param_spec);
-
-			nameblock = NULL;
-			nameblock_ix = S_block_start(aTHX_ TRUE);
+			size_t i, lim;
 
-			{
-				OP *decl, *var;
+			assert(param_spec->rest_hash != NOT_IN_PAD);
 
-				decl = NULL;
+			for (i = 0, lim = param_spec->named_required.used; i < lim; i++) {
+				Param *cur = &param_spec->named_required.data[i];
+				size_t n;
+				char *p = SvPV(cur->name, n);
+				OP *var, *cond;
 
-				vb_is_str = param_spec->named_required.used > UV_BITS;
-				if (!param_spec->named_required.used || !(spec->flags & FLAG_CHECK_NARGS)) {
-					vb = 0;
-				} else {
-					var = newOP(OP_PADSV, OPf_MOD | (OPpLVAL_INTRO << 8));
-					var->op_targ = vb = pad_add_name_pvs("$__B", 0, NULL, NULL);
-					var = newASSIGNOP(OPf_STACKED, var, 0, newSVOP(OP_CONST, 0, vb_is_str ? newSVpvs("") : newSVuv(0)));
-					decl = op_append_list(OP_LINESEQ, decl, newSTATEOP(0, NULL, var));
-				}
+				cond = mkhvelem(aTHX_ param_spec->rest_hash, mkconstpv(aTHX_ p + 1, n - 1));
 
-				vc_is_str = param_spec->named_optional.used > UV_BITS;
-				if (!param_spec->named_optional.used) {
-					vc = 0;
-				} else {
-					var = newOP(OP_PADSV, OPf_MOD | (OPpLVAL_INTRO << 8));
-					var->op_targ = vc = pad_add_name_pvs("$__C", 0, NULL, NULL);
-					var = newASSIGNOP(OPf_STACKED, var, 0, newSVOP(OP_CONST, 0, vc_is_str ? newSVpvs("") : newSVuv(0)));
-					decl = op_append_list(OP_LINESEQ, decl, newSTATEOP(0, NULL, var));
-				}
+				if (spec->flags & FLAG_CHECK_NARGS) {
+					OP *croak, *msg;
 
-				var = newOP(OP_PADSV, OPf_MOD | (OPpLVAL_INTRO << 8));
-				var->op_targ = vk = pad_add_name_pvs("$__K", 0, NULL, NULL);
-				decl = op_append_list(OP_LINESEQ, decl, newSTATEOP(0, NULL, var));
+					var = mkhvelem(aTHX_ param_spec->rest_hash, mkconstpv(aTHX_ p + 1, n - 1));
+					var = newUNOP(OP_DELETE, 0, var);
 
-				var = newOP(OP_PADSV, OPf_MOD | (OPpLVAL_INTRO << 8));
-				var->op_targ = vi = pad_add_name_pvs("$__I", 0, NULL, NULL);
-				var = newASSIGNOP(OPf_STACKED, var, 0, newSVOP(OP_CONST, 0, newSViv(pos)));
-				decl = op_append_list(OP_LINESEQ, decl, newSTATEOP(0, NULL, var));
-
-				//S_intro_my(aTHX);
-				nameblock = op_append_list(OP_LINESEQ, nameblock, decl);
-			}
+					msg = mkconstsv(aTHX_ newSVpvf("In %"SVf": missing named parameter: %.*s", SVfARG(declarator), (int)(n - 1), p + 1));
+					croak = newCVREF(
+						OPf_WANT_SCALAR,
+						newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV))
+					);
+					croak = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, msg, croak));
 
-			{
-				OP *loop;
+					cond = newUNOP(OP_EXISTS, 0, cond);
 
-				loop = NULL;
+					cond = newCONDOP(0, cond, var, croak);
+				}
 
-				loop = op_append_list(
-					OP_LINESEQ,
-					loop,
-					newSTATEOP(
-						0, NULL,
-						newASSIGNOP(
-							OPf_STACKED,
-							my_var(aTHX_ 0, vk),
-							0,
-							mkargselemv(aTHX_ vi)
-						)
-					)
+				var = my_var(
+					aTHX_
+					OPf_MOD | (OPpLVAL_INTRO << 8),
+					cur->padoff
 				);
+				var = newASSIGNOP(OPf_STACKED, var, 0, cond);
 
-				{
-					OP *nest;
-					size_t i;
-
-					if (param_spec->slurpy.name) {
-						if (SvPV_nolen(param_spec->slurpy.name)[0] == '@') {
-							OP *first, *mid, *last;
-
-							last = mkargselem(
-								aTHX_
-								newBINOP(
-									OP_ADD, 0,
-									my_var(aTHX_ 0, vi),
-									newSVOP(OP_CONST, 0, newSViv(1))
-								)
-							);
-							mid = last;
-
-							first = my_var(aTHX_ 0, vk);
-							first->op_sibling = mid;
-							mid = first;
-
-							first = my_var_g(aTHX_ OP_PADAV, 0, param_spec->slurpy.padoff);
-							first->op_sibling = mid;
-							mid = first;
-
-							first = newOP(OP_PUSHMARK, 0);
-							nest = newLISTOP(OP_PUSH, 0, first, mid);
-							nest->op_targ = pad_alloc(OP_PUSH, SVs_PADTMP);
-							((LISTOP *)nest)->op_last = last;
-						} else {
-							nest = newASSIGNOP(
-								OPf_STACKED,
-								newBINOP(
-									OP_HELEM, 0,
-									my_var_g(aTHX_ OP_PADHV, 0, param_spec->slurpy.padoff),
-									my_var(aTHX_ 0, vk)
-								),
-								0,
-								mkargselem(
-									aTHX_
-									newBINOP(
-										OP_ADD, 0,
-										my_var(aTHX_ 0, vi),
-										newSVOP(OP_CONST, 0, newSViv(1))
-									)
-								)
-							);
-						}
-					} else if (spec->flags & FLAG_CHECK_NARGS) {
-						OP *err, *croak;
-
-						err = newSVOP(OP_CONST, 0,
-						              newSVpvf("In %"SVf": no such named parameter: ", SVfARG(declarator)));
-						err = newBINOP(
-							OP_CONCAT, 0,
-							err,
-							my_var(aTHX_ 0, vk)
-						);
-
-						croak = newCVREF(OPf_WANT_SCALAR,
-						                 newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV)));
-						nest = newUNOP(OP_ENTERSUB, OPf_STACKED,
-						               op_append_elem(OP_LIST, err, croak));
-					} else {
-						nest = NULL;
-					}
-
-					for (i = param_spec->named_optional.used; i--; ) {
-						Param *cur = &param_spec->named_optional.data[i].param;
-						size_t dn;
-						char *dp = SvPV(cur->name, dn);
-						OP *vec;
-
-						if (!(spec->flags & FLAG_CHECK_NARGS)) {
-							vec = NULL;
-						} else if (vc_is_str) {
-							vec = newASSIGNOP(
-								OPf_STACKED,
-								mkvecbits(aTHX_ vc, i),
-								0,
-								newSVOP(OP_CONST, 0, newSViv(1))
-							);
-						} else {
-							vec = newASSIGNOP(
-								OPf_STACKED,
-								my_var(0, vc),
-								OP_BIT_OR,
-								newSVOP(OP_CONST, 0, newSVuv((UV)1 << i))
-							);
-						}
+				*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var));
+			}
 
-						nest = newCONDOP(
-							0,
-							newBINOP(
-								OP_SEQ, 0,
-								my_var(aTHX_ 0, vk),
-								newSVOP(OP_CONST, 0, newSVpvn_utf8(dp + 1, dn - 1, SvUTF8(cur->name)))
-							),
-							op_append_list(
-								OP_LINESEQ,
-								newASSIGNOP(
-									OPf_STACKED,
-									my_var(aTHX_ 0, cur->padoff),
-									0,
-									mkargselem(
-										aTHX_
-										newBINOP(
-											OP_ADD, 0,
-											my_var(aTHX_ 0, vi),
-											newSVOP(OP_CONST, 0, newSViv(1))
-										)
-									)
-								),
-								vec
-							),
-							nest
-						);
-					}
+			for (i = 0, lim = param_spec->named_optional.used; i < lim; i++) {
+				ParamInit *cur = &param_spec->named_optional.data[i];
+				size_t n;
+				char *p = SvPV(cur->param.name, n);
+				OP *var, *cond;
 
-					for (i = param_spec->named_required.used; i--; ) {
-						Param *cur = &param_spec->named_required.data[i];
-						size_t dn;
-						char *dp = SvPV(cur->name, dn);
-						OP *vec;
-
-						if (!(spec->flags & FLAG_CHECK_NARGS)) {
-							vec = NULL;
-						} else if (vb_is_str) {
-							vec = newASSIGNOP(
-								OPf_STACKED,
-								mkvecbits(aTHX_ vb, i),
-								0,
-								newSVOP(OP_CONST, 0, newSViv(1))
-							);
-						} else {
-							vec = newASSIGNOP(
-								OPf_STACKED,
-								my_var(0, vb),
-								OP_BIT_OR,
-								newSVOP(OP_CONST, 0, newSVuv((UV)1 << i))
-							);
-						}
+				var = mkhvelem(aTHX_ param_spec->rest_hash, mkconstpv(aTHX_ p + 1, n - 1));
+				var = newUNOP(OP_DELETE, 0, var);
 
-						nest = newCONDOP(
-							0,
-							newBINOP(
-								OP_SEQ, 0,
-								my_var(aTHX_ 0, vk),
-								newSVOP(OP_CONST, 0, newSVpvn_utf8(dp + 1, dn - 1, SvUTF8(cur->name)))
-							),
-							op_append_list(
-								OP_LINESEQ,
-								newASSIGNOP(
-									OPf_STACKED,
-									my_var(aTHX_ 0, cur->padoff),
-									0,
-									mkargselem(
-										aTHX_
-										newBINOP(
-											OP_ADD, 0,
-											my_var(aTHX_ 0, vi),
-											newSVOP(OP_CONST, 0, newSViv(1))
-										)
-									)
-								),
-								vec
-							),
-							nest
-						);
-					}
+				cond = mkhvelem(aTHX_ param_spec->rest_hash, mkconstpv(aTHX_ p + 1, n - 1));
+				cond = newUNOP(OP_EXISTS, 0, cond);
 
-					loop = op_append_elem(OP_LINESEQ, loop, newSTATEOP(0, NULL, nest));
-				}
+				cond = newCONDOP(0, cond, var, cur->init);
+				cur->init = NULL;
 
-				loop = newWHILEOP(
-					0, 1,
-					NULL,
-					newBINOP(
-						OP_LT, 0,
-						my_var(aTHX_ 0, vi),
-						newAVREF(newGVOP(OP_GV, 0, PL_defgv))
-					),
-					loop,
-					newASSIGNOP(
-						OPf_STACKED,
-						my_var(aTHX_ 0, vi),
-						OP_ADD,
-						newSVOP(OP_CONST, 0, newSViv(2))
-					),
-					0
+				var = my_var(
+					aTHX_
+					OPf_MOD | (OPpLVAL_INTRO << 8),
+					cur->param.padoff
 				);
+				var = newASSIGNOP(OPf_STACKED, var, 0, cond);
 
-				nameblock = op_append_list(OP_LINESEQ, nameblock, newSTATEOP(0, NULL, loop));
+				*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var));
 			}
 
-			if (param_spec->named_required.used && (spec->flags & FLAG_CHECK_NARGS)) {
-				OP *cond, *err, *croak, *join;
-
-				{
-					size_t i, lim;
-					OP *first, *mid, *last;
-
-					last = newNULLLIST();
-					mid = last;
-
-					for (i = param_spec->named_required.used; i--; ) {
-						OP *cur;
-						SV *sv = param_spec->named_required.data[i].name;
-						size_t n;
-						char *p = SvPV(sv, n);
-						cur = newCONDOP(
-							0,
-							vb_is_str
-								? mkvecbits(aTHX_ vb, i)
-								: newBINOP(OP_BIT_AND, 0, my_var(0, vb), newSVOP(OP_CONST, 0, newSVuv((UV)1 << i)))
-							,
-							newNULLLIST(),
-							newSVOP(OP_CONST, 0, newSVpvn_utf8(p + 1, n - 1, SvUTF8(sv)))
-						);
-						cur->op_sibling = mid;
-						mid = cur;
-					}
+			if (!param_spec->slurpy.name) {
+				if (spec->flags & FLAG_CHECK_NARGS) {
+					/* croak if %{rest} */
+					OP *croak, *cond, *keys, *msg;
 
-					first = newSVOP(OP_CONST, 0, newSVpvs(", "));
-					first->op_sibling = mid;
-					mid = first;
+					keys = newUNOP(OP_KEYS, 0, my_var_g(aTHX_ OP_PADHV, 0, param_spec->rest_hash));
+					keys = newLISTOP(OP_SORT, 0, newOP(OP_PUSHMARK, 0), keys);
+					{
+						OP *first, *mid, *last;
 
-					first = newOP(OP_PUSHMARK, 0);
+						last = keys;
 
-					join = newLISTOP(OP_JOIN, 0, first, mid);
-					join->op_targ = pad_alloc(OP_JOIN, SVs_PADTMP);
-					((LISTOP *)join)->op_last = last;
-				}
+						mid = mkconstpvs(", ");
+						mid->op_sibling = last;
 
-				err = newSVOP(
-					OP_CONST, 0,
-					newSVpvf("In %"SVf": missing named parameter(s): ", SVfARG(declarator))
-				);
-				err = newBINOP(OP_CONCAT, 0, err, join);
-				croak = newCVREF(
-					OPf_WANT_SCALAR,
-					newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV))
-				);
-				err = newUNOP(
-					OP_ENTERSUB,
-					OPf_STACKED,
-					op_append_elem(OP_LIST, err, croak)
-				);
-				if (vb_is_str) {
-					cond = newBINOP(
-						OP_SNE, 0,
-						my_var(aTHX_ 0, vb),
-						newSVOP(OP_CONST, 0, mkbits1(aTHX_ param_spec->named_required.used))
-					);
-				} else {
-					cond = newBINOP(
-						OP_NE, 0,
-						my_var(aTHX_ 0, vb),
-						newSVOP(
-							OP_CONST, 0,
-							newSVuv(
-								param_spec->named_required.used == UV_BITS
-								? ~(UV)0
-								: ((UV)1 << param_spec->named_required.used) - 1
-							)
-						)
-					);
-				}
-				err = newCONDOP(
-					0,
-					cond,
-					err,
-					NULL
-				);
+						first = newOP(OP_PUSHMARK, 0);
 
-				nameblock = op_append_list(OP_LINESEQ, nameblock, err);
-			}
+						keys = newLISTOP(OP_JOIN, 0, first, mid);
+						keys->op_targ = pad_alloc(OP_JOIN, SVs_PADTMP);
+						((LISTOP *)keys)->op_last = last;
+					}
+
+					msg = mkconstsv(aTHX_ newSVpvf("In %"SVf": no such named parameter: ", SVfARG(declarator)));
+					msg = newBINOP(OP_CONCAT, 0, msg, keys);
 
-			if (param_spec->named_optional.used) {
-				size_t i, lim;
+					croak = newCVREF(
+						OPf_WANT_SCALAR,
+						newGVOP(OP_GV, 0, gv_fetchpvs("Carp::croak", 0, SVt_PVCV))
+					);
+					croak = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, msg, croak));
+
+					cond = newUNOP(OP_KEYS, 0, my_var_g(aTHX_ OP_PADHV, 0, param_spec->rest_hash));
+					croak = newCONDOP(0, cond, croak, NULL);
 
-				for (i = 0, lim = param_spec->named_optional.used; i < lim; i++) {
-					ParamInit *const cur = &param_spec->named_optional.data[i];
-					OP *init, *cond;
+					*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, croak));
+				} else {
+					OP *clear;
 
-					init = newASSIGNOP(
+					clear = newASSIGNOP(
 						OPf_STACKED,
-						my_var(aTHX_ 0, cur->param.padoff),
+						my_var_g(aTHX_ OP_PADHV, 0, param_spec->rest_hash),
 						0,
-						cur->init
+						newNULLLIST()
 					);
-					cur->init = NULL;
 
-					cond = newUNOP(
-						OP_NOT, OPf_SPECIAL,
-						vc_is_str
-						? mkvecbits(aTHX_ vc, i)
-						: newBINOP(OP_BIT_AND, 0, my_var(0, vc), newSVOP(OP_CONST, 0, newSVuv((UV)1 << i)))
-					);
+					*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, clear));
+				}
+			} else if (param_spec->slurpy.padoff != param_spec->rest_hash) {
+				OP *var, *clear;
 
-					init = newCONDOP(0, cond, init, NULL);
+				assert(SvPV_nolen(param_spec->slurpy.name)[0] == '@');
 
-					nameblock = op_append_list(OP_LINESEQ, nameblock, newSTATEOP(0, NULL, init));
-				}
-			}
+				var = my_var_g(
+					aTHX_
+					OP_PADAV,
+					OPf_MOD | (OPpLVAL_INTRO << 8),
+					param_spec->slurpy.padoff
+				);
 
-			nameblock = S_block_end(aTHX_ nameblock_ix, nameblock);
-			nameblock = op_scope(nameblock);
+				var = newASSIGNOP(OPf_STACKED, var, 0, my_var_g(aTHX_ OP_PADHV, 0, param_spec->rest_hash));
 
-			*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, nameblock);
+				*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var));
+
+				clear = newASSIGNOP(
+					OPf_STACKED,
+					my_var_g(aTHX_ OP_PADHV, 0, param_spec->rest_hash),
+					0,
+					newNULLLIST()
+				);
+
+				*prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, clear));
+			}
 		}
 	}