X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Parameters.xs;h=3ca4d406a8b9d2dc5c2c1ab15e15e824004884f1;hb=4b76be72b837cd476900a7defa44ddc92fd75185;hp=ec46ef337a6eaa6841c0f2709db57f4a0b9e6b5b;hpb=e6d6238331493d5dadfcfbf7231d9dccb80acd20;p=p5sagit%2FFunction-Parameters.git

diff --git a/Parameters.xs b/Parameters.xs
index ec46ef3..3ca4d40 100644
--- a/Parameters.xs
+++ b/Parameters.xs
@@ -157,67 +157,6 @@ static SV *sentinel_mortalize(Sentinel sen, SV *sv) {
 	return sv;
 }
 
-static int kw_flags(pTHX_ Sentinel sen, const char *kw_ptr, STRLEN kw_len, KWSpec *spec) {
-	HV *hints;
-	SV *sv, **psv;
-	const char *p, *kw_active;
-	STRLEN kw_active_len;
-
-	spec->flags = 0;
-	spec->shift = sentinel_mortalize(sen, newSVpvs(""));
-	spec->attrs = sentinel_mortalize(sen, newSVpvs(""));
-
-	if (!(hints = GvHV(PL_hintgv))) {
-		return FALSE;
-	}
-	if (!(psv = hv_fetchs(hints, HINTK_KEYWORDS, 0))) {
-		return FALSE;
-	}
-	sv = *psv;
-	kw_active = SvPV(sv, kw_active_len);
-	if (kw_active_len <= kw_len) {
-		return FALSE;
-	}
-	for (
-		p = kw_active;
-		(p = strchr(p, *kw_ptr)) &&
-		p < kw_active + kw_active_len - kw_len;
-		p++
-	) {
-		if (
-			(p == kw_active || p[-1] == ' ') &&
-			p[kw_len] == ' ' &&
-			memcmp(kw_ptr, p, kw_len) == 0
-		) {
-
-#define FETCH_HINTK_INTO(NAME, PTR, LEN, X) STMT_START { \
-	const char *fk_ptr_; \
-	STRLEN fk_len_; \
-	SV *fk_sv_; \
-	fk_sv_ = sentinel_mortalize(sen, newSVpvs(HINTK_ ## NAME)); \
-	sv_catpvn(fk_sv_, PTR, LEN); \
-	fk_ptr_ = SvPV(fk_sv_, fk_len_); \
-	if (!((X) = hv_fetch(hints, fk_ptr_, fk_len_, 0))) { \
-		croak("%s: internal error: $^H{'%.*s'} not set", MY_PKG, (int)fk_len_, fk_ptr_); \
-	} \
-} STMT_END
-
-			FETCH_HINTK_INTO(FLAGS_, kw_ptr, kw_len, psv);
-			spec->flags = SvIV(*psv);
-
-			FETCH_HINTK_INTO(SHIFT_, kw_ptr, kw_len, psv);
-			SvSetSV(spec->shift, *psv);
-
-			FETCH_HINTK_INTO(ATTRS_, kw_ptr, kw_len, psv);
-			SvSetSV(spec->attrs, *psv);
-
-#undef FETCH_HINTK_INTO
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
 
 #if HAVE_PERL_VERSION(5, 17, 2)
  #define MY_OP_SLABBED(O) ((O)->op_slabbed)
@@ -281,6 +220,15 @@ static int my_sv_eq_pvn(pTHX_ SV *sv, const char *p, STRLEN n) {
 #include "padop_on_crack.c.inc"
 
 
+static void my_require(pTHX_ const char *file) {
+	SV *err;
+	require_pv(file);
+	err = ERRSV;
+	if (SvTRUE(err)) {
+		croak_sv(err);
+	}
+}
+
 enum {
 	MY_ATTR_LVALUE = 0x01,
 	MY_ATTR_METHOD = 0x02,
@@ -563,6 +511,8 @@ static SV *reify_type(pTHX_ Sentinel sen, const SV *declarator, SV *name) {
 	int n;
 	dSP;
 
+	my_require(aTHX_ "Moose/Util/TypeConstraints.pm");
+
 	ENTER;
 	SAVETMPS;
 
@@ -773,13 +723,6 @@ static size_t count_named_params(const ParamSpec *ps) {
 	return ps->named_required.used + ps->named_optional.used;
 }
 
-static void my_require(pTHX_ const char *file) {
-	require_pv(file);
-	if (SvTRUE(ERRSV)) {
-		croak_sv(ERRSV);
-	}
-}
-
 static SV *my_eval(pTHX_ Sentinel sen, I32 floor, OP *op) {
 	SV *sv;
 	CV *cv;
@@ -857,7 +800,9 @@ static PADOFFSET parse_param(
 				sentinel_disarm(expr_sentinel);
 			}
 			*ptype = my_eval(aTHX_ sen, floor, expr);
-			*ptype = reify_type(aTHX_ sen, declarator, *ptype);
+			if (!SvROK(*ptype)) {
+				*ptype = reify_type(aTHX_ sen, declarator, *ptype);
+			}
 			if (!sv_isobject(*ptype)) {
 				croak("In %"SVf": (%"SVf") doesn't look like a type object", SVfARG(declarator), SVfARG(*ptype));
 			}
@@ -865,7 +810,6 @@ static PADOFFSET parse_param(
 			c = lex_peek_unichar(0);
 		} else if (MY_UNI_IDFIRST(c)) {
 			*ptype = parse_type(aTHX_ sen, declarator);
-			my_require(aTHX_ "Moose/Util/TypeConstraints.pm");
 			*ptype = reify_type(aTHX_ sen, declarator, *ptype);
 
 			c = lex_peek_unichar(0);
@@ -1035,10 +979,11 @@ static void register_info(pTHX_ UV key, SV *declarator, const KWSpec *kws, const
 		mPUSHu(key);
 	}
 	/* 1 */ {
-		size_t n;
+		STRLEN n;
 		char *p = SvPV(declarator, n);
 		char *q = memchr(p, ' ', n);
-		mPUSHp(p, q ? (size_t)(q - p) : n);
+		SV *tmp = newSVpvn_utf8(p, q ? (size_t)(q - p) : n, SvUTF8(declarator));
+		mPUSHs(tmp);
 	}
 	if (!ps) {
 		if (SvTRUE(kws->shift)) {
@@ -1175,6 +1120,9 @@ static int parse_fun(pTHX_ Sentinel sen, OP **pop, const char *keyword_ptr, STRL
 	I32 c;
 
 	declarator = sentinel_mortalize(sen, newSVpvn(keyword_ptr, keyword_len));
+	if (lex_bufutf8()) {
+		SvUTF8_on(declarator);
+	}
 
 	lex_read_space(0);
 
@@ -2001,25 +1949,95 @@ static int parse_fun(pTHX_ Sentinel sen, OP **pop, const char *keyword_ptr, STRL
 	}
 }
 
+static int kw_flags_enter(pTHX_ Sentinel sen, const char *kw_ptr, STRLEN kw_len, KWSpec *spec) {
+	HV *hints;
+	SV *sv, **psv;
+	const char *p, *kw_active;
+	STRLEN kw_active_len;
+	bool kw_is_utf8;
+
+	if (!(hints = GvHV(PL_hintgv))) {
+		return FALSE;
+	}
+	if (!(psv = hv_fetchs(hints, HINTK_KEYWORDS, 0))) {
+		return FALSE;
+	}
+	sv = *psv;
+	kw_active = SvPV(sv, kw_active_len);
+	if (kw_active_len <= kw_len) {
+		return FALSE;
+	}
+
+	kw_is_utf8 = lex_bufutf8();
+
+	for (
+		p = kw_active;
+		(p = strchr(p, *kw_ptr)) &&
+		p < kw_active + kw_active_len - kw_len;
+		p++
+	) {
+		if (
+			(p == kw_active || p[-1] == ' ') &&
+			p[kw_len] == ' ' &&
+			memcmp(kw_ptr, p, kw_len) == 0
+		) {
+			ENTER;
+			SAVETMPS;
+
+			SAVEDESTRUCTOR_X(sentinel_clear_void, sen);
+
+			spec->flags = 0;
+			spec->shift = sentinel_mortalize(sen, newSVpvs(""));
+			spec->attrs = sentinel_mortalize(sen, newSVpvs(""));
+
+#define FETCH_HINTK_INTO(NAME, PTR, LEN, X) STMT_START { \
+	const char *fk_ptr_; \
+	STRLEN fk_len_; \
+	I32 fk_xlen_; \
+	SV *fk_sv_; \
+	fk_sv_ = sentinel_mortalize(sen, newSVpvs(HINTK_ ## NAME)); \
+	sv_catpvn(fk_sv_, PTR, LEN); \
+	fk_ptr_ = SvPV(fk_sv_, fk_len_); \
+	fk_xlen_ = fk_len_; \
+	if (kw_is_utf8) { \
+		fk_xlen_ = -fk_xlen_; \
+	} \
+	if (!((X) = hv_fetch(hints, fk_ptr_, fk_xlen_, 0))) { \
+		croak("%s: internal error: $^H{'%.*s'} not set", MY_PKG, (int)fk_len_, fk_ptr_); \
+	} \
+} STMT_END
+
+			FETCH_HINTK_INTO(FLAGS_, kw_ptr, kw_len, psv);
+			spec->flags = SvIV(*psv);
+
+			FETCH_HINTK_INTO(SHIFT_, kw_ptr, kw_len, psv);
+			SvSetSV(spec->shift, *psv);
+
+			FETCH_HINTK_INTO(ATTRS_, kw_ptr, kw_len, psv);
+			SvSetSV(spec->attrs, *psv);
+
+#undef FETCH_HINTK_INTO
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
 static int my_keyword_plugin(pTHX_ char *keyword_ptr, STRLEN keyword_len, OP **op_ptr) {
+	Sentinel sen = { NULL };
 	KWSpec spec;
 	int ret;
-	Sentinel sen = { NULL };
-
-	ENTER;
-	SAVETMPS;
 
-	SAVEDESTRUCTOR_X(sentinel_clear_void, sen);
-
-	if (kw_flags(aTHX_ sen, keyword_ptr, keyword_len, &spec)) {
+	if (kw_flags_enter(aTHX_ sen, keyword_ptr, keyword_len, &spec)) {
+		/* scope was entered, 'sen' and 'spec' are initialized */
 		ret = parse_fun(aTHX_ sen, op_ptr, keyword_ptr, keyword_len, &spec);
+		FREETMPS;
+		LEAVE;
 	} else {
+		/* not one of our keywords, no allocation done */
 		ret = next_keyword_plugin(aTHX_ keyword_ptr, keyword_len, op_ptr);
 	}
 
-	FREETMPS;
-	LEAVE;
-
 	return ret;
 }