return sv;
}
-static void my_safefree(void *p) {
- Safefree(p);
-}
-
-#define SENTINEL_ALLOC(SEN, P, N, T) STMT_START { \
- Newx(P, N, T); \
- sentinel_register(SEN, P, my_safefree); \
-} STMT_END
-
-#define SENTINEL_MDUP(SEN, P, O, N, T) STMT_START { \
- void *const _sentinel_mdup_tmp_ = (P); \
- SENTINEL_ALLOC(SEN, P, N, T); \
- memcpy(P, _sentinel_mdup_tmp_, O * sizeof (T)); \
-} STMT_END
-
-#define SENTINEL_REALLOC(SEN, P, N, T) STMT_START { \
- assert((N) > 0); \
- if (!(P)) { \
- SENTINEL_ALLOC(SEN, P, N, T); \
- } else { \
- Resource **_sentinel_realloc_tmp_ = (SEN); \
- for (;;) { \
- assert(*_sentinel_realloc_tmp_ != NULL); \
- if ((*_sentinel_realloc_tmp_)->data == (P)) { \
- Renew((*_sentinel_realloc_tmp_)->data, N, T); \
- (P) = (*_sentinel_realloc_tmp_)->data; \
- break; \
- } \
- _sentinel_realloc_tmp_ = &(*_sentinel_realloc_tmp_)->next; \
- } \
- } \
-} STMT_END
-
static int kw_flags(pTHX_ Sentinel sen, const char *kw_ptr, STRLEN kw_len, KWSpec *spec) {
HV *hints;
SV *sv, **psv;
}
-static void free_ptr_op_void(pTHX_ void *vp) {
- OP **pp = vp;
- op_free(*pp);
- Safefree(pp);
+#if HAVE_PERL_VERSION(5, 17, 2)
+ #define MY_OP_SLABBED(O) ((O)->op_slabbed)
+#else
+ #define MY_OP_SLABBED(O) 0
+#endif
+
+DEFSTRUCT(OpGuard) {
+ OP *op;
+ bool needs_freed;
+};
+
+static void op_guard_init(OpGuard *p) {
+ p->op = NULL;
+ p->needs_freed = FALSE;
+}
+
+static OpGuard op_guard_transfer(OpGuard *p) {
+ OpGuard r = *p;
+ op_guard_init(p);
+ return r;
+}
+
+static OP *op_guard_relinquish(OpGuard *p) {
+ OP *o = p->op;
+ op_guard_init(p);
+ return o;
+}
+
+static void op_guard_update(OpGuard *p, OP *o) {
+ p->op = o;
+ p->needs_freed = o && !MY_OP_SLABBED(o);
+}
+
+static void op_guard_clear(pTHX_ OpGuard *p) {
+ if (p->needs_freed) {
+ op_free(p->op);
+ }
+}
+
+static void free_op_guard_void(pTHX_ void *vp) {
+ OpGuard *p = vp;
+ op_guard_clear(aTHX_ p);
+ Safefree(p);
}
static void free_op_void(pTHX_ void *vp) {
static void my_sv_cat_c(pTHX_ SV *sv, U32 c) {
char ds[UTF8_MAXBYTES + 1], *d;
- d = uvchr_to_utf8(ds, c);
+ d = (char *)uvchr_to_utf8((U8 *)ds, c);
if (d - ds > 1) {
sv_utf8_upgrade(sv);
}
PUSHs(name);
PUTBACK;
- n = call_pv("Moose::Util::TypeConstraints::find_or_parse_type_constraint", G_SCALAR);
+ n = call_pv("Moose::Util::TypeConstraints::find_or_create_isa_type_constraint", G_SCALAR);
SPAGAIN;
assert(n == 1);
+ /* don't warn about n being unused if assert() is compiled out */
+ n = n;
+
t = sentinel_mortalize(sen, SvREFCNT_inc(POPs));
PUTBACK;
DEFSTRUCT(ParamInit) {
Param param;
- OP *init;
+ OpGuard init;
};
#define VEC(B) B ## _Vec
static void pi_clear(pTHX_ ParamInit *pi) {
p_clear(aTHX_ &pi->param);
- if (pi->init) {
- op_free(pi->init);
- pi->init = NULL;
- }
+ op_guard_clear(aTHX_ &pi->init);
}
DEFVECTOR_CLEAR(pv_clear, Param, p_clear);
PARAM_NAMED = 0x02
};
-/* *pinit must be NULL on entry.
- * caller must free *pinit on error.
- */
static PADOFFSET parse_param(
pTHX_
Sentinel sen,
const SV *declarator, const KWSpec *spec, ParamSpec *param_spec,
- int *pflags, SV **pname, OP **pinit, SV **ptype
+ int *pflags, SV **pname, OpGuard *ginit, SV **ptype
) {
I32 c;
char sigil;
SV *name;
- assert(!*pinit);
+ assert(!ginit->op);
*pflags = 0;
*ptype = NULL;
if (!(expr = parse_fullexpr(PARSE_OPTIONAL))) {
croak("In %"SVf": invalid type expression", SVfARG(declarator));
}
- expr_sentinel = sentinel_register(sen, expr, free_op_void);
+ if (MY_OP_SLABBED(expr)) {
+ expr_sentinel = NULL;
+ } else {
+ expr_sentinel = sentinel_register(sen, expr, free_op_void);
+ }
lex_read_space(0);
c = lex_peek_unichar(0);
lex_read_space(0);
SvREFCNT_inc_simple_void(PL_compcv);
- sentinel_disarm(expr_sentinel);
+ if (expr_sentinel) {
+ sentinel_disarm(expr_sentinel);
+ }
*ptype = my_eval(aTHX_ sen, floor, expr);
*ptype = reify_type(aTHX_ sen, declarator, *ptype);
if (!sv_isobject(*ptype)) {
param_spec->invocant.padoff = pad_add_name_sv(param_spec->invocant.name, 0, NULL, NULL);
}
- *pinit = parse_termexpr(0);
+ op_guard_update(ginit, parse_termexpr(0));
lex_read_space(0);
c = lex_peek_unichar(0);
static OP *mktypecheck(pTHX_ const SV *declarator, int nr, SV *name, PADOFFSET padoff, SV *type) {
/* $type->check($value) or Carp::croak "...: " . $type->get_message($value) */
- OP *chk, *cond, *err, *msg, *xcroak;
+ OP *chk, *err, *msg, *xcroak;
err = mkconstsv(aTHX_ newSVpvf("In %"SVf": parameter %d (%"SVf"): ", SVfARG(declarator), nr, SVfARG(name)));
{
size_t n;
char *p = SvPV(declarator, n);
char *q = memchr(p, ' ', n);
- mPUSHp(p, q ? q - p : n);
+ mPUSHp(p, q ? (size_t)(q - p) : n);
}
if (!ps) {
if (SvTRUE(kws->shift)) {
I32 floor_ix;
int save_ix;
SV *saw_name;
- OP **prelude_sentinel;
+ OpGuard *prelude_sentinel;
SV *proto;
- OP **attrs_sentinel, *body;
+ OpGuard *attrs_sentinel;
+ OP *body;
unsigned builtin_attrs;
I32 c;
save_ix = S_block_start(aTHX_ TRUE);
/* initialize synthetic optree */
- Newx(prelude_sentinel, 1, OP *);
- *prelude_sentinel = NULL;
- sentinel_register(sen, prelude_sentinel, free_ptr_op_void);
+ Newx(prelude_sentinel, 1, OpGuard);
+ op_guard_init(prelude_sentinel);
+ sentinel_register(sen, prelude_sentinel, free_op_guard_void);
/* parameters */
param_spec = NULL;
c = lex_peek_unichar(0);
if (c == '(') {
- OP **init_sentinel;
+ OpGuard *init_sentinel;
- Newx(init_sentinel, 1, OP *);
- *init_sentinel = NULL;
- sentinel_register(sen, init_sentinel, free_ptr_op_void);
+ Newx(init_sentinel, 1, OpGuard);
+ op_guard_init(init_sentinel);
+ sentinel_register(sen, init_sentinel, free_op_guard_void);
Newx(param_spec, 1, ParamSpec);
ps_init(param_spec);
croak("In %"SVf": named parameter %"SVf" can't be a%s", SVfARG(declarator), SVfARG(name), sigil == '@' ? "n array" : " hash");
}
} else if (flags & PARAM_INVOCANT) {
- if (*init_sentinel) {
+ if (init_sentinel->op) {
croak("In %"SVf": invocant %"SVf" can't have a default value", SVfARG(declarator), SVfARG(name));
}
if (sigil != '$') {
croak("In %"SVf": invocant %"SVf" can't be a%s", SVfARG(declarator), SVfARG(name), sigil == '@' ? "n array" : " hash");
}
- } else if (sigil != '$' && *init_sentinel) {
+ } else if (sigil != '$' && init_sentinel->op) {
croak("In %"SVf": %s %"SVf" can't have a default value", SVfARG(declarator), sigil == '@' ? "array" : "hash", SVfARG(name));
}
croak("In %"SVf": I was expecting \")\" after \"%"SVf"\", not \"%"SVf"\"", SVfARG(declarator), SVfARG(param_spec->slurpy.name), SVfARG(name));
}
if (sigil != '$') {
- assert(!*init_sentinel);
+ assert(!init_sentinel->op);
param_spec->slurpy.name = name;
param_spec->slurpy.padoff = padoff;
param_spec->slurpy.type = type;
continue;
}
- if (*init_sentinel && !(spec->flags & FLAG_DEFAULT_ARGS)) {
+ if (init_sentinel->op && !(spec->flags & FLAG_DEFAULT_ARGS)) {
croak("In %"SVf": default argument for %"SVf" not allowed here", SVfARG(declarator), SVfARG(name));
}
croak("In %"SVf": named parameter :%"SVf" not allowed here", SVfARG(declarator), SVfARG(name));
}
- if (*init_sentinel) {
+ if (init_sentinel->op) {
ParamInit *pi = piv_extend(¶m_spec->named_optional);
pi->param.name = name;
pi->param.padoff = padoff;
pi->param.type = type;
- pi->init = *init_sentinel;
- *init_sentinel = NULL;
+ pi->init = op_guard_transfer(init_sentinel);
param_spec->named_optional.used++;
} else {
+ Param *p;
+
if (param_spec->positional_optional.used) {
croak("In %"SVf": can't combine optional positional (%"SVf") and required named (%"SVf") parameters", SVfARG(declarator), SVfARG(param_spec->positional_optional.data[0].param.name), SVfARG(name));
}
- Param *p = pv_extend(¶m_spec->named_required);
+ p = pv_extend(¶m_spec->named_required);
p->name = name;
p->padoff = padoff;
p->type = type;
param_spec->named_required.used++;
}
} else {
- if (*init_sentinel || param_spec->positional_optional.used) {
+ if (init_sentinel->op || param_spec->positional_optional.used) {
ParamInit *pi = piv_extend(¶m_spec->positional_optional);
pi->param.name = name;
pi->param.padoff = padoff;
pi->param.type = type;
- pi->init = *init_sentinel;
- *init_sentinel = NULL;
+ pi->init = op_guard_transfer(init_sentinel);
param_spec->positional_optional.used++;
} else {
Param *p = pv_extend(¶m_spec->positional_required);
}
lex_read_unichar(0);
lex_read_space(0);
- *init_sentinel = NULL;
if (!param_spec->invocant.name && SvTRUE(spec->shift)) {
if (ps_contains(aTHX_ param_spec, spec->shift)) {
}
/* attributes */
- Newx(attrs_sentinel, 1, OP *);
- *attrs_sentinel = NULL;
- sentinel_register(sen, attrs_sentinel, free_ptr_op_void);
+ Newx(attrs_sentinel, 1, OpGuard);
+ op_guard_init(attrs_sentinel);
+ sentinel_register(sen, attrs_sentinel, free_op_guard_void);
if (c == ':' || c == '{') /* '}' - hi, vim */ {
}
if (attr) {
- *attrs_sentinel = op_append_elem(OP_LIST, *attrs_sentinel, mkconstsv(aTHX_ SvREFCNT_inc_simple_NN(attr)));
+ op_guard_update(attrs_sentinel, op_append_elem(OP_LIST, attrs_sentinel->op, mkconstsv(aTHX_ SvREFCNT_inc_simple_NN(attr))));
}
if (c == ':') {
/* check number of arguments */
if (spec->flags & FLAG_CHECK_NARGS) {
int amin, amax;
- size_t named;
amin = args_min(aTHX_ param_spec, spec);
if (amin > 0) {
mkconstiv(aTHX_ amin));
chk = newLOGOP(OP_AND, 0, cond, err);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, chk)));
}
amax = args_max(param_spec);
);
chk = newLOGOP(OP_AND, 0, cond, err);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, chk)));
}
if (param_spec && (count_named_params(param_spec) || (param_spec->slurpy.name && SvPV_nolen(param_spec->slurpy.name)[0] == '%'))) {
mkconstiv(aTHX_ 2)));
chk = newLOGOP(OP_AND, 0, cond, err);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, chk)));
}
}
);
var = newASSIGNOP(OPf_STACKED, var, 0, newOP(OP_SHIFT, 0));
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, var)));
}
} else {
/* my $invocant = shift; */
);
var = newASSIGNOP(OPf_STACKED, var, 0, newOP(OP_SHIFT, 0));
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, var)));
if (param_spec->invocant.type && (spec->flags & FLAG_CHECK_TARGS)) {
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, 0, ¶m_spec->invocant)));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, 0, ¶m_spec->invocant))));
}
}
lhs->op_flags |= OPf_PARENS;
rhs = newAVREF(newGVOP(OP_GV, 0, PL_defgv));
- *prelude_sentinel = op_append_list(
- OP_LINESEQ, *prelude_sentinel,
+ op_guard_update(prelude_sentinel, op_append_list(
+ OP_LINESEQ, prelude_sentinel->op,
newSTATEOP(
0, NULL,
newASSIGNOP(OPf_STACKED, lhs, 0, rhs)
)
- );
+ ));
}
}
nest = op_append_list(
OP_LINESEQ, nest,
- newASSIGNOP(OPf_STACKED, var, 0, cur->init)
+ newASSIGNOP(OPf_STACKED, var, 0, op_guard_relinquish(&cur->init))
);
- cur->init = NULL;
nest = newCONDOP(
0,
cond,
);
}
- *prelude_sentinel = op_append_list(
- OP_LINESEQ, *prelude_sentinel,
+ op_guard_update(prelude_sentinel, op_append_list(
+ OP_LINESEQ, prelude_sentinel->op,
nest
- );
+ ));
}
/* named parameters */
);
var = newASSIGNOP(OPf_STACKED, var, 0, cond);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, var)));
}
for (i = 0, lim = param_spec->named_optional.used; i < lim; i++) {
cond = mkhvelem(aTHX_ param_spec->rest_hash, mkconstpv(aTHX_ p + 1, n - 1));
cond = newUNOP(OP_EXISTS, 0, cond);
- cond = newCONDOP(0, cond, var, cur->init);
- cur->init = NULL;
+ cond = newCONDOP(0, cond, var, op_guard_relinquish(&cur->init));
var = my_var(
aTHX_
);
var = newASSIGNOP(OPf_STACKED, var, 0, cond);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, var)));
}
if (!param_spec->slurpy.name) {
cond = newUNOP(OP_KEYS, 0, my_var_g(aTHX_ OP_PADHV, 0, param_spec->rest_hash));
xcroak = newCONDOP(0, cond, xcroak, NULL);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, xcroak));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, xcroak)));
} else {
OP *clear;
newNULLLIST()
);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, clear));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, clear)));
}
} else if (param_spec->slurpy.padoff != param_spec->rest_hash) {
OP *var, *clear;
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, newSTATEOP(0, NULL, var));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, var)));
clear = newASSIGNOP(
OPf_STACKED,
newNULLLIST()
);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, clear));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, clear)));
}
}
Param *cur = ¶m_spec->positional_required.data[i];
if (cur->type) {
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, base + i, cur)));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, base + i, cur))));
}
}
base += i;
Param *cur = ¶m_spec->positional_optional.data[i].param;
if (cur->type) {
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, base + i, cur)));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, base + i, cur))));
}
}
base += i;
Param *cur = ¶m_spec->named_required.data[i];
if (cur->type) {
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, base + i, cur)));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, base + i, cur))));
}
}
base += i;
Param *cur = ¶m_spec->named_optional.data[i].param;
if (cur->type) {
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, base + i, cur)));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, mktypecheckp(aTHX_ declarator, base + i, cur))));
}
}
base += i;
if (param_spec->slurpy.type) {
/* $type->valid($_) or croak $type->get_message($_) for @rest / values %rest */
- OP *body, *list, *loop;
+ OP *check, *list, *loop;
- body = mktypecheck(aTHX_ declarator, base, param_spec->slurpy.name, NOT_IN_PAD, param_spec->slurpy.type);
+ check = mktypecheck(aTHX_ declarator, base, param_spec->slurpy.name, NOT_IN_PAD, param_spec->slurpy.type);
if (SvPV_nolen(param_spec->slurpy.name)[0] == '@') {
list = my_var_g(aTHX_ OP_PADAV, 0, param_spec->slurpy.padoff);
list = newUNOP(OP_VALUES, 0, list);
}
- loop = newFOROP(0, NULL, list, body, NULL);
+ loop = newFOROP(0, NULL, list, check, NULL);
- *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, loop));
+ op_guard_update(prelude_sentinel, op_append_list(OP_LINESEQ, prelude_sentinel->op, newSTATEOP(0, NULL, loop)));
}
}
}
/* add '();' to make function return nothing by default */
/* (otherwise the invisible parameter initialization can "leak" into
the return value: fun ($x) {}->("asdf", 0) == 2) */
- if (*prelude_sentinel) {
+ if (prelude_sentinel->op) {
body = newSTATEOP(0, NULL, body);
}
- body = op_append_list(OP_LINESEQ, *prelude_sentinel, body);
- *prelude_sentinel = NULL;
+ body = op_append_list(OP_LINESEQ, op_guard_relinquish(prelude_sentinel), body);
/* it's go time. */
{
CV *cv;
- OP *const attrs = *attrs_sentinel;
- *attrs_sentinel = NULL;
+ OP *const attrs = op_guard_relinquish(attrs_sentinel);
SvREFCNT_inc_simple_void(PL_compcv);
body
);
- register_info(aTHX_ PTR2UV(CvROOT(cv)), declarator, spec, param_spec);
+ if (cv) {
+ register_info(aTHX_ PTR2UV(CvROOT(cv)), declarator, spec, param_spec);
+ }
if (saw_name) {
*pop = newOP(OP_NULL, 0);
fp__cv_root(sv)
SV * sv
PREINIT:
- CV *cv;
+ CV *xcv;
HV *hv;
GV *gv;
CODE:
- cv = sv_2cv(sv, &hv, &gv, 0);
- RETVAL = PTR2UV(cv ? CvROOT(cv) : NULL);
+ xcv = sv_2cv(sv, &hv, &gv, 0);
+ RETVAL = PTR2UV(xcv ? CvROOT(xcv) : NULL);
OUTPUT:
RETVAL
projects / p5sagit/Function-Parameters.git / blobdiff