From: Lukas Mai Date: Fri, 26 Oct 2012 15:44:18 +0000 (+0200) Subject: first cut at named parameters X-Git-Tag: v0.10_02~3 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e158cf8f49978f42fb2380d3f84c5df963a39a3f;p=p5sagit%2FFunction-Parameters.git first cut at named parameters --- diff --git a/MANIFEST b/MANIFEST index 7ef9fa0..a008d0f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -26,11 +26,11 @@ t/invocant.t t/lexical.t t/lineno-torture.t t/lineno.t -t/named.t -t/named_1.fail -t/named_2.fail -t/named_3.fail -t/named_4.fail +t/name.t +t/name_1.fail +t/name_2.fail +t/name_3.fail +t/name_4.fail t/pod.t t/precedence.t t/prototype.t diff --git a/Parameters.xs b/Parameters.xs index 2031f0b..8082d2b 100644 --- a/Parameters.xs +++ b/Parameters.xs @@ -62,6 +62,22 @@ WARNINGS_ENABLE #define IF_HAVE_PERL_5_16(YES, NO) NO #endif +#if 0 + #if HAVE_PERL_VERSION(5, 17, 6) + #error "internal error: missing definition of KEY_my (your perl is too new)" + #elif HAVE_PERL_VERSION(5, 15, 8) + #define S_KEY_my 134 + #elif HAVE_PERL_VERSION(5, 15, 6) + #define S_KEY_my 133 + #elif HAVE_PERL_VERSION(5, 15, 5) + #define S_KEY_my 132 + #elif HAVE_PERL_VERSION(5, 13, 0) + #define S_KEY_my 131 + #else + #error "internal error: missing definition of KEY_my (your perl is too old)" + #endif +#endif + #define MY_PKG "Function::Parameters" @@ -72,19 +88,13 @@ WARNINGS_ENABLE #define DEFSTRUCT(T) typedef struct T T; struct T -DEFSTRUCT(DefaultParamSpec) { - DefaultParamSpec *next; - int limit; - SV *name; - OP *init; -}; - enum { FLAG_NAME_OK = 0x01, FLAG_ANON_OK = 0x02, FLAG_DEFAULT_ARGS = 0x04, FLAG_CHECK_NARGS = 0x08, - FLAG_INVOCANT = 0x10 + FLAG_INVOCANT = 0x10, + FLAG_NAMED_PARAMS = 0x20 }; DEFSTRUCT(KWSpec) { @@ -157,12 +167,6 @@ static int kw_flags(pTHX_ const char *kw_ptr, STRLEN kw_len, KWSpec *spec) { } -static void free_defspec(pTHX_ void *vp) { - DefaultParamSpec *dp = vp; - op_free(dp->init); - Safefree(dp); -} - static void free_ptr_op(pTHX_ void *vp) { OP **pp = vp; op_free(*pp); @@ -181,33 +185,6 @@ static int my_sv_eq_pvn(pTHX_ SV *sv, const char *p, STRLEN n) { #include "padop_on_crack.c.inc" -#if 0 -static PADOFFSET pad_add_my_sv(SV *name) { - PADOFFSET offset; - SV *namesv, *myvar; - char *p; - STRLEN len; - - p = SvPV(name, len); - myvar = *av_fetch(PL_comppad, AvFILLp(PL_comppad) + 1, 1); - offset = AvFILLp(PL_comppad); - SvPADMY_on(myvar); - if (*p == '@') { - SvUPGRADE(myvar, SVt_PVAV); - } else if (*p == '%') { - SvUPGRADE(myvar, SVt_PVHV); - } - PL_curpad = AvARRAY(PL_comppad); - namesv = newSV_type(SVt_PVMG); - sv_setpvn(namesv, p, len); - COP_SEQ_RANGE_LOW_set(namesv, PL_cop_seqmax); - COP_SEQ_RANGE_HIGH_set(namesv, PERL_PADSEQ_INTRO); - PL_cop_seqmax++; - av_store(PL_comppad_name, offset, namesv); - return offset; -} -#endif - enum { MY_ATTR_LVALUE = 0x01, MY_ATTR_METHOD = 0x02, @@ -437,21 +414,341 @@ static void my_check_prototype(pTHX_ const SV *declarator, SV *proto) { } } + +DEFSTRUCT(Param) { + SV *name; + PADOFFSET padoff; +}; + +DEFSTRUCT(ParamInit) { + Param param; + OP *init; +}; + +#define VEC(B) B ## _Vec + +#define DEFVECTOR(B) DEFSTRUCT(VEC(B)) { \ + B (*data); \ + size_t used, size; \ +} + +DEFVECTOR(Param); +DEFVECTOR(ParamInit); + +#define DEFVECTOR_INIT(N, B) static void N(VEC(B) *p) { \ + p->used = 0; \ + p->size = 23; \ + Newx(p->data, p->size, B); \ +} static void N(VEC(B) *) + +DEFSTRUCT(ParamSpec) { + Param invocant; + VEC(Param) positional_required; + VEC(ParamInit) positional_optional; + VEC(Param) named_required; + VEC(ParamInit) named_optional; + Param slurpy; +}; + +DEFVECTOR_INIT(pv_init, Param); +DEFVECTOR_INIT(piv_init, ParamInit); + +static void p_init(Param *p) { + p->name = NULL; + p->padoff = NOT_IN_PAD; +} + +static void ps_init(ParamSpec *ps) { + p_init(&ps->invocant); + pv_init(&ps->positional_required); + piv_init(&ps->positional_optional); + pv_init(&ps->named_required); + piv_init(&ps->named_optional); + p_init(&ps->slurpy); +} + +#define DEFVECTOR_EXTEND(N, B) static B (*N(VEC(B) *p)) { \ + assert(p->used <= p->size); \ + if (p->used == p->size) { \ + const size_t n = p->size / 2 * 3 + 1; \ + Renew(p->data, n, B); \ + p->size = n; \ + } \ + return &p->data[p->used]; \ +} static B (*N(VEC(B) *)) + +DEFVECTOR_EXTEND(pv_extend, Param); +DEFVECTOR_EXTEND(piv_extend, ParamInit); + +#define DEFVECTOR_CLEAR(N, B, F) static void N(pTHX_ VEC(B) *p) { \ + while (p->used) { \ + p->used--; \ + F(aTHX_ &p->data[p->used]); \ + } \ + Safefree(p->data); \ + p->data = NULL; \ + p->size = 0; \ +} static void N(pTHX_ VEC(B) *) + +static void p_clear(pTHX_ Param *p) { + p->name = NULL; + p->padoff = NOT_IN_PAD; +} + +static void pi_clear(pTHX_ ParamInit *pi) { + p_clear(aTHX_ &pi->param); + if (pi->init) { + op_free(pi->init); + pi->init = NULL; + } +} + +DEFVECTOR_CLEAR(pv_clear, Param, p_clear); +DEFVECTOR_CLEAR(piv_clear, ParamInit, pi_clear); + +static void ps_clear(pTHX_ ParamSpec *ps) { + p_clear(aTHX_ &ps->invocant); + + pv_clear(aTHX_ &ps->positional_required); + piv_clear(aTHX_ &ps->positional_optional); + + pv_clear(aTHX_ &ps->named_required); + piv_clear(aTHX_ &ps->named_optional); + + p_clear(aTHX_ &ps->slurpy); +} + +static int ps_contains(pTHX_ const ParamSpec *ps, SV *sv) { + size_t i, lim; + + if (ps->invocant.name && sv_eq(sv, ps->invocant.name)) { + return 1; + } + + for (i = 0, lim = ps->positional_required.used; i < lim; i++) { + if (sv_eq(sv, ps->positional_required.data[i].name)) { + return 1; + } + } + + for (i = 0, lim = ps->positional_optional.used; i < lim; i++) { + if (sv_eq(sv, ps->positional_optional.data[i].param.name)) { + return 1; + } + } + + for (i = 0, lim = ps->named_required.used; i < lim; i++) { + if (sv_eq(sv, ps->named_required.data[i].name)) { + return 1; + } + } + + for (i = 0, lim = ps->named_optional.used; i < lim; i++) { + if (sv_eq(sv, ps->named_optional.data[i].param.name)) { + return 1; + } + } + + return 0; +} + +static void ps_free_void(pTHX_ void *p) { + ps_clear(aTHX_ p); + Safefree(p); +} + +static int args_min(pTHX_ const ParamSpec *ps, const KWSpec *ks) { + int n = 0; + if (!ps) { + return SvTRUE(ks->shift) ? 1 : 0; + } + if (ps->invocant.name) { + n++; + } + n += ps->positional_required.used; + n += ps->named_required.used * 2; + return n; +} + +static int args_max(const ParamSpec *ps) { + int n = 0; + if (!ps) { + return -1; + } + if (ps->invocant.name) { + n++; + } + n += ps->positional_required.used; + n += ps->positional_optional.used; + if (ps->named_required.used || ps->named_optional.used || ps->slurpy.name) { + n = -1; + } + return n; +} + +static size_t count_positional_params(const ParamSpec *ps) { + return ps->positional_required.used + ps->positional_optional.used; +} + +static size_t count_named_params(const ParamSpec *ps) { + return ps->named_required.used + ps->named_optional.used; +} + +enum { + PARAM_INVOCANT = 0x01, + PARAM_NAMED = 0x02 +}; + +/* *pinit must be NULL on entry. + * caller must free *pinit on error. + */ +static PADOFFSET parse_param( + pTHX_ + const SV *declarator, const KWSpec *spec, ParamSpec *param_spec, + int *pflags, SV **pname, OP **pinit +) { + I32 c; + char sigil; + SV *name; + + assert(!*pinit); + *pflags = 0; + + c = lex_peek_unichar(0); + + if (c == ':') { + lex_read_unichar(0); + lex_read_space(0); + + *pflags |= PARAM_NAMED; + + c = lex_peek_unichar(0); + } + + if (c == -1) { + croak("In %"SVf": unterminated parameter list", SVfARG(declarator)); + } + if (!(c == '$' || c == '@' || c == '%')) { + croak("In %"SVf": unexpected '%c' in parameter list (expecting a sigil)", SVfARG(declarator), (int)c); + } + + sigil = c; + + lex_read_unichar(0); + lex_read_space(0); + + if (!(name = my_scan_word(aTHX_ FALSE))) { + croak("In %"SVf": missing identifier after '%c'", SVfARG(declarator), sigil); + } + sv_insert(name, 0, 0, &sigil, 1); + *pname = name; + + lex_read_space(0); + c = lex_peek_unichar(0); + + if (c == '=') { + lex_read_unichar(0); + lex_read_space(0); + + + if (!param_spec->invocant.name && SvTRUE(spec->shift)) { + param_spec->invocant.name = spec->shift; + param_spec->invocant.padoff = pad_add_name_sv(param_spec->invocant.name, 0, NULL, NULL); + } + + *pinit = parse_termexpr(0); + + lex_read_space(0); + c = lex_peek_unichar(0); + } + + if (c == ':') { + *pflags |= PARAM_INVOCANT; + lex_read_unichar(0); + lex_read_space(0); + } else if (c == ',') { + lex_read_unichar(0); + lex_read_space(0); + } else if (c != ')') { + if (c == -1) { + croak("In %"SVf": unterminated parameter list", SVfARG(declarator)); + } + croak("In %"SVf": unexpected '%c' in parameter list (expecting ',')", SVfARG(declarator), (int)c); + } + + return pad_add_name_sv(*pname, IF_HAVE_PERL_5_16(padadd_NO_DUP_CHECK, 0), NULL, NULL); +} + +static OP *my_var_g(pTHX_ I32 type, I32 flags, PADOFFSET padoff) { + OP *var = newOP(type, flags); + var->op_targ = padoff; + return var; +} + +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 *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 *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 *mkargselemv(pTHX_ PADOFFSET v) { + return mkargselem(aTHX_ my_var(aTHX_ 0, v)); +} + static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len, const KWSpec *spec) { + ParamSpec *param_spec; SV *declarator; I32 floor_ix; int save_ix; SV *saw_name; OP **prelude_sentinel; - int did_invocant_decl; - SV *invocant; - AV *params; - DefaultParamSpec *defaults; - int args_min, args_max; SV *proto; OP **attrs_sentinel, *body; unsigned builtin_attrs; - STRLEN len; I32 c; declarator = sv_2mortal(newSVpvn(keyword_ptr, keyword_len)); @@ -502,155 +799,142 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len SAVEDESTRUCTOR_X(free_ptr_op, prelude_sentinel); /* parameters */ - did_invocant_decl = 0; - invocant = NULL; - params = NULL; - defaults = NULL; - args_min = 0; - args_max = -1; + param_spec = NULL; c = lex_peek_unichar(0); if (c == '(') { - DefaultParamSpec **pdefaults_tail = &defaults; - SV *saw_slurpy = NULL; - int param_count = 0; - args_max = 0; + OP **init_sentinel; + + Newx(init_sentinel, 1, OP *); + *init_sentinel = NULL; + SAVEDESTRUCTOR_X(free_ptr_op, init_sentinel); + + Newx(param_spec, 1, ParamSpec); + ps_init(param_spec); + SAVEDESTRUCTOR_X(ps_free_void, param_spec); lex_read_unichar(0); lex_read_space(0); - params = newAV(); - sv_2mortal((SV *)params); + while ((c = lex_peek_unichar(0)) != ')') { + int flags; + SV *name; + char sigil; + PADOFFSET padoff; - for (;;) { - c = lex_peek_unichar(0); - if (c == '$' || c == '@' || c == '%') { - const char sigil = c; - SV *param; + padoff = parse_param(aTHX_ declarator, spec, param_spec, &flags, &name, init_sentinel); - param_count++; + S_intro_my(aTHX); - lex_read_unichar(0); - lex_read_space(0); + sigil = SvPV_nolen(name)[0]; - if (!(param = my_scan_word(aTHX_ FALSE))) { - croak("In %"SVf": missing identifier", SVfARG(declarator)); + /* internal consistency */ + if (flags & PARAM_NAMED) { + if (flags & PARAM_INVOCANT) { + croak("In %"SVf": invocant %"SVf" can't be a named parameter", SVfARG(declarator), SVfARG(name)); } - sv_insert(param, 0, 0, &sigil, 1); - if (saw_slurpy) { - croak("In %"SVf": I was expecting \")\" after \"%"SVf"\", not \"%"SVf"\"", SVfARG(declarator), SVfARG(saw_slurpy), SVfARG(param)); + if (sigil != '$') { + croak("In %"SVf": named parameter %"SVf" can't be a%s", SVfARG(declarator), SVfARG(name), sigil == '@' ? "n array" : " hash"); } - if (sigil == '$') { - args_max++; - } else { - args_max = -1; - saw_slurpy = param; + } else if (flags & PARAM_INVOCANT) { + if (*init_sentinel) { + 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) { + croak("In %"SVf": %s %"SVf" can't have a default value", SVfARG(declarator), sigil == '@' ? "array" : "hash", SVfARG(name)); + } - lex_read_space(0); - c = lex_peek_unichar(0); - - assert(param_count >= 1); - - if (c == ':') { - if (invocant) { - croak("In %"SVf": invalid double invocants %"SVf", %"SVf"", SVfARG(declarator), SVfARG(invocant), SVfARG(param)); - } - if (param_count != 1) { - croak("In %"SVf": invocant %"SVf" must be first in parameter list", SVfARG(declarator), SVfARG(param)); - } - if (!(spec->flags & FLAG_INVOCANT)) { - croak("In %"SVf": invocant %"SVf" not allowed here", SVfARG(declarator), SVfARG(param)); - } - if (sigil != '$') { - croak("In %"SVf": invocant %"SVf" can't be a %s", SVfARG(declarator), SVfARG(param), sigil == '@' ? "array" : "hash"); - } - - lex_read_unichar(0); - lex_read_space(0); - - args_max--; - param_count--; - invocant = param; - } else { - av_push(params, SvREFCNT_inc_simple_NN(param)); - - if (c == '=' && (spec->flags & FLAG_DEFAULT_ARGS)) { - DefaultParamSpec *curdef; - - if (sigil != '$') { - croak("In %"SVf": %s %"SVf" can't have a default value", SVfARG(declarator), sigil == '@' ? "array" : "hash", SVfARG(saw_slurpy)); - } - - lex_read_unichar(0); - lex_read_space(0); - - /* my $self; # in scope for default argument */ - if (!invocant && !did_invocant_decl && SvTRUE(spec->shift)) { - OP *var; - - var = newOP(OP_PADSV, OPf_MOD | (OPpLVAL_INTRO << 8)); - var->op_targ = pad_add_name_sv(spec->shift, 0, NULL, NULL); - - *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var)); - - did_invocant_decl = 1; - } - - Newx(curdef, 1, DefaultParamSpec); - curdef->next = NULL; - curdef->limit = param_count; - curdef->name = param; - curdef->init = NULL; - SAVEDESTRUCTOR_X(free_defspec, curdef); - - curdef->next = *pdefaults_tail; - *pdefaults_tail = curdef; - pdefaults_tail = &curdef->next; + /* external constraints */ + if (param_spec->slurpy.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); + param_spec->slurpy.name = name; + param_spec->slurpy.padoff = padoff; + continue; + } - /* let perl parse the default parameter value */ - curdef->init = parse_termexpr(0); + if (!(flags & PARAM_NAMED) && count_named_params(param_spec)) { + croak("In %"SVf": positional parameter %"SVf" can't appear after named parameter %"SVf"", SVfARG(declarator), SVfARG(name), SVfARG((param_spec->named_required.used ? param_spec->named_required.data[0] : param_spec->named_optional.data[0].param).name)); + } - lex_read_space(0); - c = lex_peek_unichar(0); - } else { - if (sigil == '$' && !defaults) { - args_min++; - } - } + if (flags & PARAM_INVOCANT) { + if (param_spec->invocant.name) { + croak("In %"SVf": invalid double invocants %"SVf", %"SVf"", SVfARG(declarator), SVfARG(param_spec->invocant.name), SVfARG(name)); + } + if (count_positional_params(param_spec) || count_named_params(param_spec)) { + croak("In %"SVf": invocant %"SVf" must be first in parameter list", SVfARG(declarator), SVfARG(name)); } + if (!(spec->flags & FLAG_INVOCANT)) { + croak("In %"SVf": invocant %"SVf" not allowed here", SVfARG(declarator), SVfARG(name)); + } + param_spec->invocant.name = name; + param_spec->invocant.padoff = padoff; + continue; + } - /* my $param; */ - { - OP *var; + if (*init_sentinel && !(spec->flags & FLAG_DEFAULT_ARGS)) { + croak("In %"SVf": default argument for %"SVf" not allowed here", SVfARG(declarator), SVfARG(name)); + } - var = newOP(OP_PADSV, OPf_MOD | (OPpLVAL_INTRO << 8)); - var->op_targ = pad_add_name_sv(param, 0, NULL, NULL); + if (ps_contains(aTHX_ param_spec, name)) { + croak("In %"SVf": %"SVf" can't appear twice in the same parameter list", SVfARG(declarator), SVfARG(name)); + } - *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var)); + if (flags & PARAM_NAMED) { + if (!(spec->flags & FLAG_NAMED_PARAMS)) { + croak("In %"SVf": named parameter :%"SVf" not allowed here", SVfARG(declarator), SVfARG(name)); } - if (param_count == 0) { - continue; - } + if (*init_sentinel) { + ParamInit *pi = piv_extend(¶m_spec->named_optional); + pi->param.name = name; + pi->param.padoff = padoff; + pi->init = *init_sentinel; + *init_sentinel = NULL; + param_spec->named_optional.used++; + } else { + 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)); + } - if (c == ',') { - lex_read_unichar(0); - lex_read_space(0); - continue; + Param *p = pv_extend(¶m_spec->named_required); + p->name = name; + p->padoff = padoff; + param_spec->named_required.used++; + } + } else { + if (*init_sentinel || param_spec->positional_optional.used) { + ParamInit *pi = piv_extend(¶m_spec->positional_optional); + pi->param.name = name; + pi->param.padoff = padoff; + pi->init = *init_sentinel; + *init_sentinel = NULL; + param_spec->positional_optional.used++; + } else { + Param *p = pv_extend(¶m_spec->positional_required); + p->name = name; + p->padoff = padoff; + param_spec->positional_required.used++; } } - if (c == ')') { - lex_read_unichar(0); - lex_read_space(0); - break; - } + } + lex_read_unichar(0); + lex_read_space(0); + *init_sentinel = NULL; - if (c == -1) { - croak("In %"SVf": unexpected EOF in parameter list", SVfARG(declarator)); + if (!param_spec->invocant.name && SvTRUE(spec->shift)) { + if (ps_contains(aTHX_ param_spec, spec->shift)) { + croak("In %"SVf": %"SVf" can't appear twice in the same parameter list", SVfARG(declarator), SVfARG(spec->shift)); } - croak("In %"SVf": unexpected '%c' in parameter list", SVfARG(declarator), (int)c); + + param_spec->invocant.name = spec->shift; + param_spec->invocant.padoff = pad_add_name_sv(param_spec->invocant.name, 0, NULL, NULL); } } @@ -772,131 +1056,565 @@ static int parse_fun(pTHX_ OP **pop, const char *keyword_ptr, STRLEN keyword_len CvSPECIAL_on(PL_compcv); } - if (!invocant) { - invocant = spec->shift; + /* check number of arguments */ + if (spec->flags & FLAG_CHECK_NARGS) { + int amin, amax; + size_t named; - /* my $self; # wasn't needed yet */ - if (SvTRUE(invocant) && !did_invocant_decl) { - OP *var; + amin = args_min(aTHX_ param_spec, spec); + if (amin > 0) { + OP *chk, *cond, *err, *croak; - var = newOP(OP_PADSV, OPf_MOD | (OPpLVAL_INTRO << 8)); - var->op_targ = pad_add_name_sv(invocant, 0, NULL, NULL); + 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(")"))); - *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var)); - } - } + 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)); - /* min/max argument count checks */ - if (spec->flags & FLAG_CHECK_NARGS) { - if (SvTRUE(invocant)) { - args_min++; - if (args_max != -1) { - args_max++; - } + cond = newBINOP(OP_LT, 0, + newAVREF(newGVOP(OP_GV, 0, PL_defgv)), + newSVOP(OP_CONST, 0, newSViv(amin))); + chk = newLOGOP(OP_AND, 0, cond, err); + + *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk)); } - if (args_min > 0) { + amax = args_max(param_spec); + if (amax >= 0) { OP *chk, *cond, *err, *croak; err = newSVOP(OP_CONST, 0, - newSVpvf("Not enough arguments for %"SVf, SVfARG(declarator))); + 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(")"))); 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(args_min))); + cond = newBINOP(OP_GT, 0, + newAVREF(newGVOP(OP_GV, 0, PL_defgv)), + newSVOP(OP_CONST, 0, newSViv(amax))); chk = newLOGOP(OP_AND, 0, cond, err); *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk)); } - if (args_max != -1) { + + if (param_spec && (count_named_params(param_spec) || (param_spec->slurpy.name && SvPV_nolen(param_spec->slurpy.name)[0] == '%'))) { OP *chk, *cond, *err, *croak; + const UV fixed = count_positional_params(param_spec) + !!param_spec->invocant.name; err = newSVOP(OP_CONST, 0, - newSVpvf("Too many arguments for %"SVf, SVfARG(declarator))); + 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))); + 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(args_max))); + 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))); + 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)))); chk = newLOGOP(OP_AND, 0, cond, err); *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, chk)); } } - /* $self = shift; */ - if (SvTRUE(invocant)) { - OP *var, *shift; + if (!param_spec) { + /* my $invocant = shift; */ + if (SvTRUE(spec->shift)) { + OP *var; - var = newOP(OP_PADSV, OPf_WANT_SCALAR); - var->op_targ = pad_findmy_sv(invocant, 0); + var = my_var( + aTHX_ + OPf_MOD | (OPpLVAL_INTRO << 8), + pad_add_name_sv(spec->shift, 0, NULL, NULL) + ); + var = newASSIGNOP(OPf_STACKED, var, 0, newOP(OP_SHIFT, 0)); - shift = newASSIGNOP(OPf_STACKED, var, 0, newOP(OP_SHIFT, 0)); - *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, shift)); - } + *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var)); + } + } else { + /* my $invocant = shift; */ + if (param_spec->invocant.name) { + OP *var; - /* (PARAMS) = @_; */ - if (params && av_len(params) > -1) { - SV *param; - OP *init_param, *left, *right; + var = my_var( + aTHX_ + OPf_MOD | (OPpLVAL_INTRO << 8), + param_spec->invocant.padoff + ); + var = newASSIGNOP(OPf_STACKED, var, 0, newOP(OP_SHIFT, 0)); - left = NULL; - while ((param = av_shift(params)) != &PL_sv_undef) { - OP *const var = newOP(OP_PADSV, OPf_WANT_LIST); - var->op_targ = pad_findmy_sv(param, 0); - SvREFCNT_dec(param); - left = op_append_elem(OP_LIST, left, var); + *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, newSTATEOP(0, NULL, var)); } - left->op_flags |= OPf_PARENS; - right = newAVREF(newGVOP(OP_GV, 0, PL_defgv)); - init_param = newASSIGNOP(OPf_STACKED, left, 0, right); - init_param = newSTATEOP(0, NULL, init_param); + /* my (...) = @_; */ + { + OP *lhs; + size_t i, lim; - *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, init_param); - } + lhs = NULL; - /* defaults */ - { - OP *gen = NULL; - DefaultParamSpec *dp; + for (i = 0, lim = param_spec->positional_required.used; i < lim; i++) { + OP *const var = my_var( + aTHX_ + OPf_WANT_LIST | (OPpLVAL_INTRO << 8), + param_spec->positional_required.data[i].padoff + ); + lhs = op_append_elem(OP_LIST, lhs, var); + } - for (dp = defaults; dp; dp = dp->next) { - OP *init = dp->init; - OP *var, *args, *cond; + for (i = 0, lim = param_spec->positional_optional.used; i < lim; i++) { + OP *const var = my_var( + aTHX_ + OPf_WANT_LIST | (OPpLVAL_INTRO << 8), + param_spec->positional_optional.data[i].param.padoff + ); + lhs = op_append_elem(OP_LIST, lhs, var); + } - /* var = `$,name */ - var = newOP(OP_PADSV, 0); - var->op_targ = pad_findmy_sv(dp->name, 0); + 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)); + } else { + OP *const var = my_var_g( + aTHX_ + SvPV_nolen(param_spec->slurpy.name)[0] == '@' ? OP_PADAV : OP_PADHV, + OPf_WANT_LIST | (OPpLVAL_INTRO << 8), + param_spec->slurpy.padoff + ); + lhs = op_append_elem(OP_LIST, lhs, var); + } + } - /* init = `,var = ,init */ - init = newASSIGNOP(OPf_STACKED, var, 0, init); + if (lhs) { + OP *rhs; + lhs->op_flags |= OPf_PARENS; + rhs = newAVREF(newGVOP(OP_GV, 0, PL_defgv)); + + *prelude_sentinel = op_append_list( + OP_LINESEQ, *prelude_sentinel, + newSTATEOP( + 0, NULL, + newASSIGNOP(OPf_STACKED, lhs, 0, rhs) + ) + ); + } + } - /* args = `@_ */ - args = newAVREF(newGVOP(OP_GV, 0, PL_defgv)); + /* default arguments */ + { + size_t i, lim, req; + OP *nest; - /* cond = `,args < ,index */ - cond = newBINOP(OP_LT, 0, args, newSVOP(OP_CONST, 0, newSViv(dp->limit))); + nest = NULL; - /* init = `,init if ,cond */ - init = newLOGOP(OP_AND, 0, cond, init); + req = param_spec->positional_required.used; + for (i = 0, lim = param_spec->positional_optional.used; i < lim; i++) { + ParamInit *cur = ¶m_spec->positional_optional.data[i]; + OP *var, *cond; - /* gen = `,gen ; ,init */ - gen = op_append_list(OP_LINESEQ, gen, newSTATEOP(0, NULL, init)); + cond = newBINOP( + OP_LT, 0, + newAVREF(newGVOP(OP_GV, 0, PL_defgv)), + newSVOP(OP_CONST, 0, newSViv(req + i + 1)) + ); - dp->init = NULL; + var = my_var(aTHX_ 0, cur->param.padoff); + + nest = op_append_list( + OP_LINESEQ, nest, + newASSIGNOP(OPf_STACKED, var, 0, cur->init) + ); + cur->init = NULL; + nest = newCONDOP( + 0, + cond, + nest, + NULL + ); + } + + *prelude_sentinel = op_append_list( + OP_LINESEQ, *prelude_sentinel, + nest + ); } - *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, gen); + /* named parameters */ + if (count_named_params(param_spec)) { + int nameblock_ix; + OP *nameblock; + PADOFFSET vb, vc, vi, vk; + const size_t pos = count_positional_params(param_spec); + + nameblock = NULL; + nameblock_ix = S_block_start(aTHX_ TRUE); + + { + OP *decl, *var; + + decl = NULL; + + 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, newSVpvs(""))); + decl = op_append_list(OP_LINESEQ, decl, newSTATEOP(0, NULL, var)); + } + + 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, newSVpvs(""))); + decl = op_append_list(OP_LINESEQ, decl, newSTATEOP(0, NULL, var)); + } + + 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 = 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); + } + + { + OP *loop; + + loop = NULL; + + loop = op_append_list( + OP_LINESEQ, + loop, + newSTATEOP( + 0, NULL, + newASSIGNOP( + OPf_STACKED, + my_var(aTHX_ 0, vk), + 0, + mkargselemv(aTHX_ vi) + ) + ) + ); + + { + 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 = ¶m_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 { + vec = newASSIGNOP( + OPf_STACKED, + mkvecbits(aTHX_ vc, i), + 0, + newSVOP(OP_CONST, 0, newSViv(1)) + ); + } + + 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 = param_spec->named_required.used; i--; ) { + Param *cur = ¶m_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 { + vec = newASSIGNOP( + OPf_STACKED, + mkvecbits(aTHX_ vb, i), + 0, + newSVOP(OP_CONST, 0, newSViv(1)) + ); + } + + 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 + ); + } + + loop = op_append_elem(OP_LINESEQ, loop, newSTATEOP(0, NULL, nest)); + } + + 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 + ); + + nameblock = op_append_list(OP_LINESEQ, nameblock, newSTATEOP(0, NULL, loop)); + } + + 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, + mkvecbits(aTHX_ vb, i), + newNULLLIST(), + newSVOP(OP_CONST, 0, newSVpvn_utf8(p + 1, n - 1, SvUTF8(sv))) + ); + cur->op_sibling = mid; + mid = cur; + } + + first = newSVOP(OP_CONST, 0, newSVpvs(", ")); + first->op_sibling = mid; + mid = first; + + first = newOP(OP_PUSHMARK, 0); + + join = newLISTOP(OP_JOIN, 0, first, mid); + join->op_targ = pad_alloc(OP_JOIN, SVs_PADTMP); + ((LISTOP *)join)->op_last = 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) + ); + cond = newBINOP( + OP_SNE, 0, + my_var(aTHX_ 0, vb), + newSVOP(OP_CONST, 0, mkbits1(aTHX_ param_spec->named_required.used)) + ); + err = newCONDOP( + 0, + cond, + err, + NULL + ); + + nameblock = op_append_list(OP_LINESEQ, nameblock, err); + } + + if (param_spec->named_optional.used) { + size_t i, lim; + + for (i = 0, lim = param_spec->named_optional.used; i < lim; i++) { + ParamInit *const cur = ¶m_spec->named_optional.data[i]; + OP *init, *cond; + + init = newASSIGNOP( + OPf_STACKED, + my_var(aTHX_ 0, cur->param.padoff), + 0, + cur->init + ); + cur->init = NULL; + + cond = newUNOP(OP_NOT, OPf_SPECIAL, mkvecbits(aTHX_ vc, i)); + + init = newCONDOP(0, cond, init, NULL); + + nameblock = op_append_list(OP_LINESEQ, nameblock, newSTATEOP(0, NULL, init)); + } + } + + nameblock = S_block_end(aTHX_ nameblock_ix, nameblock); + nameblock = op_scope(nameblock); + + *prelude_sentinel = op_append_list(OP_LINESEQ, *prelude_sentinel, nameblock); + } } /* finally let perl parse the actual subroutine body */ @@ -974,6 +1692,7 @@ WARNINGS_ENABLE { newCONSTSUB(stash, "FLAG_DEFAULT_ARGS", newSViv(FLAG_DEFAULT_ARGS)); newCONSTSUB(stash, "FLAG_CHECK_NARGS", newSViv(FLAG_CHECK_NARGS)); newCONSTSUB(stash, "FLAG_INVOCANT", newSViv(FLAG_INVOCANT)); + newCONSTSUB(stash, "FLAG_NAMED_PARAMS", newSViv(FLAG_NAMED_PARAMS)); newCONSTSUB(stash, "HINTK_KEYWORDS", newSVpvs(HINTK_KEYWORDS)); newCONSTSUB(stash, "HINTK_FLAGS_", newSVpvs(HINTK_FLAGS_)); newCONSTSUB(stash, "HINTK_SHIFT_", newSVpvs(HINTK_SHIFT_)); diff --git a/herp.c b/herp.c new file mode 100644 index 0000000..2b3ee49 --- /dev/null +++ b/herp.c @@ -0,0 +1,164 @@ + +#define DEFSTRUCT(T) typedef struct T T; struct T + +DEFSTRUCT(ParamInit) { + SV *name; + OP *init; +}; + +#define DEFVECTOR(T, B) DEFSTRUCT(T) { \ + B (*data); \ + size_t used, size; \ +} + +DEFVECTOR(ParamInitVec, ParamInit); +DEFVECTOR(ParamVec, SV *); + +DEFSTRUCT(ParamSpec) { + SV *invocant; + ParamVec positional_required; + ParamInitVec positional_optional; + ParamVec named_required; + ParamInitVec named_optional; + SV *slurpy; +}; + +#define DEFVECTOR_CLEAR(T, N, F) static void N(T *p) { \ + while (p->used) { \ + p->used--; \ + F(p->data[p->used]); \ + } \ + Safefree(p->data); \ + p->data =NULL; \ + p->size = 0; \ +} static void N(T *) + +static void pi_clear(ParamInit pi) { + if (pi.name) { + SvREFCNT_dec(pi.name); + } + if (pi.init) { + op_free(pi.init); + } +} + +DEFVECTOR_CLEAR(ParamVec, pv_clear, SvREFCNT_dec); +DEFVECTOR_CLEAR(ParamInitVec, piv_clear, pi_clear); + +static void ps_free(ParamSpec *ps) { + if (ps->invocant) { + SvREFCNT_dec(ps->invocant); + ps->invocant = NULL; + } + pv_clear(&ps->positional_required); + piv_clear(&ps->positional_optional); + pv_clear(&ps->named_required); + piv_clear(&ps->named_optional); + if (ps->slurpy) { + SvREFCNT_dec(ps->slurpy); + ps->slurpy = NULL; + } + Safefree(ps); +} + +static int args_min(const ParamSpec *ps) { + int n = 0; + if (ps->invocant) { + n++; + } + n += ps->positional_required.used; + n += ps->named_required.used * 2; + return n; +} + +static int args_max(const ParamSpec *ps) { + int n = 0; + if (ps->invocant) { + n++; + } + n += ps->positional_required.used; + n += ps->positional_optional.used; + if (ps->named_required.used || ps->named_optional.used || ps->slurpy) { + n = -1; + } + return n; +} + +static size_t count_positional_params(const ParamSpec *ps) { + return ps->positional_required.used + ps->positional_optional.used; +} + +static size_t count_named_params(const ParamSpec *ps) { + return ps->named_required.used + ps->named_optional.used; +} + +static void gen(ParamSpec *ps) { + int amin = args_min(ps); + if (amin > 0) { + printf("croak 'not enough' if @_ < %d;\n", amin); + } + int amax = args_max(ps); + if (amax >= 0) { + printf("croak 'too many' if @_ > %d;\n", amax); + } + size_t named_params = count_named_params(ps); + if (named_params || (ps->slurpy && SvPV_nolen(ps->slurpy)[0] == '%')) { + size_t t = named_params + !!ps->invocant; + printf("croak 'odd' if (@_ - %zu) > 0 && (@_ - %zu) % 2;\n", t, t); + } + if (ps->invocant) { + printf("%s = shift @_;\n", SvPV_nolen(ps->invocant)); + } + // XXX (...) = @_; + size_t positional_params = count_positional_params(ps); + for (size_t i = 0; i < ps->positional_optional.used; i++) { + printf("%*sif (@_ < %zu) {\n", (int)i * 2, "", positional_params - i); + } + for (size_t i = 0; i < ps->positional_optional.used; i++) { + ParamInit *pi = &ps->positional_optional.data[i]; + printf("%*s %s = %p;\n", (int)(ps->positional_optional.used - i - 1) * 2, "", SvPV_nolen(pi->name), pi->init); + printf("%*s}\n", (int)(ps->positional_optional.used - i - 1) * 2, ""); + } + if (named_params) { + printf("if (@_ > %zu) {\n", positional_params); + printf(" my $_b = '';\n"); + printf(" my $_i = %zu;\n", positional_params); + printf(" while ($_i < @_) {\n"); + printf(" my $_k = $_[$_i];\n"); + size_t req = ps->named_required.used; + for (size_t i = 0; i < named_params; i++) { + printf(" "); + if (i) { + printf("els"); + } + SV *param = i >= req ? ps->named_optional.data[i - req] : ps->named_required.data[i]; + printf("if ($_k eq '%s') {\n", SvPV_nolen(param) + 1); + printf(" %s = $_[$_i + 1];\n", SvPV_nolen(param)); + printf(" vec($_b, %zu, 1) = 1;\n", i); + printf(" }\n"); + } + printf(" else {\n"); + if (ps->slurpy) { + const char *slurpy = SvPV_nolen(ps->slurpy); + if (slurpy[0] == '%') { + printf(" $%s{$_k} = $_[$_i + 1];\n", slurpy + 1); + } else { + printf(" push %s, $_k, $_[$_i + 1];\n", slurpy); + } + } else { + printf(" croak 'no such param ' . $_k;\n"); + } + printf(" }\n"); + printf(" $_i += 2;\n"); + printf(" }\n"); + if (ps->named_required.used) { + printf(" if (($_b & pack('b*', '1' x %zu)) ne pack('b*', '1' x %zu)) {\n", ps->named_required.used, ps->named_required.used); + printf(" croak 'missing required named args';\n"); // XXX + printf(" }\n"); + } + for (size_t i = 0; i < ps->named_optional.used; i++) { + printf(" %s = %p unless vec $_k, %zu, 1;\n", SvPV_nolen(ps->named_optional[i].name), ps->named_optional[i].init, ps->named_required.used + i); + } + printf("}\n"); + } +} diff --git a/lib/Function/Parameters.pm b/lib/Function/Parameters.pm index 3b0794f..8f58d15 100644 --- a/lib/Function/Parameters.pm +++ b/lib/Function/Parameters.pm @@ -32,11 +32,13 @@ my %type_map = ( name => 'optional', default_arguments => 1, check_argument_count => 0, + named_parameters => 1, }, method => { name => 'optional', default_arguments => 1, check_argument_count => 0, + named_parameters => 1, attrs => ':method', shift => '$self', invocant => 1, @@ -45,6 +47,7 @@ my %type_map = ( name => 'optional', default_arguments => 1, check_argument_count => 0, + named_parameters => 1, attributes => ':method', shift => '$class', invocant => 1, @@ -113,6 +116,7 @@ sub import { ; $clean{check_argument_count} = !!delete $type{check_argument_count}; $clean{invocant} = !!delete $type{invocant}; + $clean{named_parameters} = !!delete $type{named_parameters}; %type and confess "Invalid keyword property: @{[keys %type]}"; @@ -130,6 +134,7 @@ sub import { $flags |= FLAG_DEFAULT_ARGS if $type->{default_arguments}; $flags |= FLAG_CHECK_NARGS if $type->{check_argument_count}; $flags |= FLAG_INVOCANT if $type->{invocant}; + $flags |= FLAG_NAMED_PARAMS if $type->{named_parameters}; $^H{HINTK_FLAGS_ . $kw} = $flags; $^H{HINTK_SHIFT_ . $kw} = $type->{shift}; $^H{HINTK_ATTRS_ . $kw} = $type->{attrs}; diff --git a/padop_on_crack.c.inc b/padop_on_crack.c.inc index 4f143b0..28078a7 100644 --- a/padop_on_crack.c.inc +++ b/padop_on_crack.c.inc @@ -684,6 +684,10 @@ static PADOFFSET S_pad_alloc(pTHX_ I32 optype, U32 tmptype) { #endif +#ifndef pad_add_name_pvs +#define pad_add_name_pvs(NAME, FLAGS, TYPESTASH, OURSTASH) S_pad_add_name_pvn(aTHX_ "" NAME "", sizeof NAME - 1, FLAGS, TYPESTASH, OURSTASH) +#endif + #ifndef pad_add_name_sv #define pad_add_name_sv(NAMESV, FLAGS, TYPESTASH, OURSTASH) \ @@ -1047,3 +1051,42 @@ static PADOFFSET S_pad_findmy(pTHX_ const char *name, U32 flags) { } #endif + +static U32 S_intro_my(pTHX) { + dVAR; + SV **svp; + I32 i; + U32 seq; + + ASSERT_CURPAD_ACTIVE("intro_my"); + if (!PL_min_intro_pending) + return PL_cop_seqmax; + + svp = AvARRAY(PL_comppad_name); + for (i = PL_min_intro_pending; i <= PL_max_intro_pending; i++) { + SV *const sv = svp[i]; + + if (sv && sv != &PL_sv_undef && !SvFAKE(sv) + && COP_SEQ_RANGE_LOW(sv) == PERL_PADSEQ_INTRO) + { + COP_SEQ_RANGE_HIGH_set(sv, PERL_PADSEQ_INTRO); /* Don't know scope end yet. */ + COP_SEQ_RANGE_LOW_set(sv, PL_cop_seqmax); + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad intromy: %ld \"%s\", (%lu,%lu)\n", + (long)i, SvPVX_const(sv), + (unsigned long)COP_SEQ_RANGE_LOW(sv), + (unsigned long)COP_SEQ_RANGE_HIGH(sv)) + ); + } + } + seq = PL_cop_seqmax; + PL_cop_seqmax++; + if (PL_cop_seqmax == PERL_PADSEQ_INTRO) /* not a legal value */ + PL_cop_seqmax++; + PL_min_intro_pending = 0; + PL_comppad_name_fill = PL_max_intro_pending; /* Needn't search higher */ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad intromy: seq -> %ld\n", (long)(PL_cop_seqmax))); + + return seq; +} diff --git a/t/defaults.t b/t/defaults.t index fc771c3..7dd885c 100644 --- a/t/defaults.t +++ b/t/defaults.t @@ -101,7 +101,7 @@ is eval('fun ($x, %y = ()) {}'), undef; like $@, qr/default value/; is eval('nofun ($x = 42) {}'), undef; -like $@, qr/nofun.*unexpected.*=.*parameter/; +like $@, qr/nofun.*default argument/; { diff --git a/t/named.t b/t/name.t similarity index 94% rename from t/named.t rename to t/name.t index b451426..2dc0134 100644 --- a/t/named.t +++ b/t/name.t @@ -38,7 +38,7 @@ is $baz->(11), 23; is $baz->(-0.5), 0; for my $fail ( - map [__DIR__ . "/named_$_->[0].fail", @$_[1 .. $#$_]], + map [__DIR__ . "/name_$_->[0].fail", @$_[1 .. $#$_]], ['1', qr/expect.*function.*name/], ['2', qr/expect.*function.*body/], ['3', qr/expect.*function.*name/], diff --git a/t/named_1.fail b/t/name_1.fail similarity index 100% rename from t/named_1.fail rename to t/name_1.fail diff --git a/t/named_2.fail b/t/name_2.fail similarity index 100% rename from t/named_2.fail rename to t/name_2.fail diff --git a/t/named_3.fail b/t/name_3.fail similarity index 100% rename from t/named_3.fail rename to t/name_3.fail diff --git a/t/named_4.fail b/t/name_4.fail similarity index 100% rename from t/named_4.fail rename to t/name_4.fail diff --git a/t/named_params.t b/t/named_params.t new file mode 100644 index 0000000..32a2bd7 --- /dev/null +++ b/t/named_params.t @@ -0,0 +1,191 @@ +#!perl +use warnings FATAL => 'all'; +use strict; + +use Test::More tests => 134; +use Test::Fatal; + +use Function::Parameters qw(:strict); + +sub compile_fail { + my ($src, $re, $name) = @_; + is eval $src, undef; + like $@, $re, $name || (); +} + + +compile_fail 'fun (:$n1, $p1) {}', qr/\bpositional\b.+\bnamed\b/; +compile_fail 'fun (@rest, :$n1) {}', qr/\@rest\b.+\$n1\b/; +compile_fail 'fun (:$n1, :$n1) {}', qr/\$n1\b.+\btwice\b/; +compile_fail 'method (:$ni:) {}', qr/\binvocant\b.+\$ni\b.+\bnamed\b/; + + +fun name_1(:$n1) { [$n1, @_] } + +like exception { name_1 }, qr/Not enough arguments/; +like exception { name_1 'n1' }, qr/Not enough arguments/; +like exception { name_1 'asdf' }, qr/Not enough arguments/; +like exception { name_1 huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply name_1(n1 => undef), [undef, n1 => undef]; +is_deeply name_1(n1 => 'a'), ['a', n1 => 'a']; +is_deeply name_1(n1 => 'a', n1 => 'b'), ['b', n1 => 'a', n1 => 'b']; +is_deeply name_1(n1 => 'a', n1 => undef), [undef, n1 => 'a', n1 => undef]; + + +fun name_0_1(:$n1 = 'd') { [$n1, @_] } + +is_deeply name_0_1, ['d']; +like exception { name_0_1 'n1' }, qr/Odd number/; +like exception { name_0_1 'asdf' }, qr/Odd number/; +like exception { name_0_1 huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply name_0_1(n1 => 'a'), ['a', n1 => 'a']; +is_deeply name_0_1(n1 => 'a', n1 => 'b'), ['b', n1 => 'a', n1 => 'b']; +is_deeply name_0_1(n1 => 'a', n1 => undef), [undef, n1 => 'a', n1 => undef]; + + +fun pos_1_name_1($p1, :$n1) { [$p1, $n1, @_] } + +like exception { pos_1_name_1 }, qr/Not enough arguments/; +like exception { pos_1_name_1 42 }, qr/Not enough arguments/; +like exception { pos_1_name_1 42, 'n1' }, qr/Not enough arguments/; +like exception { pos_1_name_1 42, 'asdf' }, qr/Not enough arguments/; +like exception { pos_1_name_1 42, huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply pos_1_name_1(42, n1 => undef), [42, undef, 42, n1 => undef]; +is_deeply pos_1_name_1(42, n1 => 'a'), [42, 'a', 42, n1 => 'a']; +is_deeply pos_1_name_1(42, n1 => 'a', n1 => 'b'), [42, 'b', 42, n1 => 'a', n1 => 'b']; +is_deeply pos_1_name_1(42, n1 => 'a', n1 => undef), [42, undef, 42, n1 => 'a', n1 => undef]; + + +compile_fail 'fun pos_0_1_name_1($p1 = "e", :$n1) { [$p1, $n1, @_] }', qr/\boptional positional\b.+\brequired named\b/; + + +fun pos_1_name_0_1($p1, :$n1 = 'd') { [$p1, $n1, @_] } + +like exception { pos_1_name_0_1 }, qr/Not enough arguments/; +is_deeply pos_1_name_0_1(42), [42, 'd', 42]; +like exception { pos_1_name_0_1 42, 'n1' }, qr/Odd number/; +like exception { pos_1_name_0_1 42, 'asdf' }, qr/Odd number/; +like exception { pos_1_name_0_1 42, huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply pos_1_name_0_1(42, n1 => undef), [42, undef, 42, n1 => undef]; +is_deeply pos_1_name_0_1(42, n1 => 'a'), [42, 'a', 42, n1 => 'a']; +is_deeply pos_1_name_0_1(42, n1 => 'a', n1 => 'b'), [42, 'b', 42, n1 => 'a', n1 => 'b']; +is_deeply pos_1_name_0_1(42, n1 => 'a', n1 => undef), [42, undef, 42, n1 => 'a', n1 => undef]; + + +fun pos_0_1_name_0_1($p1 = 'e', :$n1 = 'd') { [$p1, $n1, @_] } + +is_deeply pos_0_1_name_0_1, ['e', 'd']; +is_deeply pos_0_1_name_0_1(42), [42, 'd', 42]; +like exception { pos_0_1_name_0_1 42, 'n1' }, qr/Odd number/; +like exception { pos_0_1_name_0_1 42, 'asdf' }, qr/Odd number/; +like exception { pos_0_1_name_0_1 42, huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply pos_0_1_name_0_1(42, n1 => undef), [42, undef, 42, n1 => undef]; +is_deeply pos_0_1_name_0_1(42, n1 => 'a'), [42, 'a', 42, n1 => 'a']; +is_deeply pos_0_1_name_0_1(42, n1 => 'a', n1 => 'b'), [42, 'b', 42, n1 => 'a', n1 => 'b']; +is_deeply pos_0_1_name_0_1(42, n1 => 'a', n1 => undef), [42, undef, 42, n1 => 'a', n1 => undef]; + + +fun name_1_slurp(:$n1, @rest) { [$n1, \@rest, @_] } + +like exception { name_1_slurp }, qr/Not enough arguments/; +like exception { name_1_slurp 'n1' }, qr/Not enough arguments/; +like exception { name_1_slurp 'asdf' }, qr/Not enough arguments/; +like exception { name_1_slurp huh => 1 }, qr/Missing named\b.+\bn1\b/; +is_deeply name_1_slurp(n1 => 'a'), ['a', [], n1 => 'a']; +like exception { name_1_slurp n1 => 'a', 'n1' }, qr/Odd number/; +is_deeply name_1_slurp(n1 => 'a', foo => 'bar'), ['a', [foo => 'bar'], n1 => 'a', foo => 'bar']; +is_deeply name_1_slurp(foo => 'bar', n1 => 'a', foo => 'quux'), ['a', [foo => 'bar', foo => 'quux'], foo => 'bar', n1 => 'a', foo => 'quux']; + + +fun name_0_1_slurp(:$n1 = 'd', @rest) { [$n1, \@rest, @_] } + +is_deeply name_0_1_slurp, ['d', []]; +like exception { name_0_1_slurp 'n1' }, qr/Odd number/; +like exception { name_0_1_slurp 'asdf' }, qr/Odd number/; +is_deeply name_0_1_slurp(n1 => 'a'), ['a', [], n1 => 'a']; +like exception { name_0_1_slurp n1 => 'a', 'n1' }, qr/Odd number/; +is_deeply name_0_1_slurp(a => 'b'), ['d', [a => 'b'], a => 'b']; +is_deeply name_0_1_slurp(n1 => 'a', foo => 'bar'), ['a', [foo => 'bar'], n1 => 'a', foo => 'bar']; +is_deeply name_0_1_slurp(foo => 'bar', n1 => 'a', foo => 'quux'), ['a', [foo => 'bar', foo => 'quux'], foo => 'bar', n1 => 'a', foo => 'quux']; + + +fun name_2(:$n1, :$n2) { [$n1, $n2, @_] } + +like exception { name_2 }, qr/Not enough arguments/; +like exception { name_2 'n1' }, qr/Not enough arguments/; +like exception { name_2 'asdf' }, qr/Not enough arguments/; +like exception { name_2 huh => 1 }, qr/Not enough arguments/; +like exception { name_2 n1 => 'a' }, qr/Not enough arguments/; +like exception { name_2 n1 => 'a', n1 => 'b' }, qr/Missing named\b.+\bn2\b/; +like exception { name_2 n2 => 'a' }, qr/Not enough arguments/; +like exception { name_2 n2 => 'a', n2 => 'b' }, qr/Missing named\b.+\bn1\b/; +like exception { name_2 n1 => 'a', 'n2' }, qr/Not enough arguments/; +like exception { name_2 n1 => 'a', 'asdf' }, qr/Not enough arguments/; +like exception { name_2 n2 => 'b', n1 => 'a', huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply name_2(n2 => 42, n1 => undef), [undef, 42, n2 => 42, n1 => undef]; +is_deeply name_2(n2 => 42, n1 => 'a'), ['a', 42, n2 => 42, n1 => 'a']; +is_deeply name_2(n2 => 42, n1 => 'a', n1 => 'b'), ['b', 42, n2 => 42, n1 => 'a', n1 => 'b']; +is_deeply name_2(n2 => 42, n1 => 'a', n1 => undef), [undef, 42, n2 => 42, n1 => 'a', n1 => undef]; +is_deeply name_2(n1 => undef, n2 => 42), [undef, 42, n1 => undef, n2 => 42]; +is_deeply name_2(n1 => 'a', n2 => 42), ['a', 42, n1 => 'a', n2 => 42]; +is_deeply name_2(n1 => 'a', n1 => 'b', n2 => 42), ['b', 42, n1 => 'a', n1 => 'b', n2 => 42]; +is_deeply name_2(n1 => 'a', n2 => 42, n1 => undef), [undef, 42, n1 => 'a', n2 => 42, n1 => undef]; + + +fun name_1_2(:$n1, :$n2 = 'f') { [$n1, $n2, @_] } + +like exception { name_1_2 }, qr/Not enough arguments/; +like exception { name_1_2 'n1' }, qr/Not enough arguments/; +like exception { name_1_2 'asdf' }, qr/Not enough arguments/; +like exception { name_1_2 huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply name_1_2(n1 => 'a'), ['a', 'f', n1 => 'a']; +is_deeply name_1_2(n1 => 'a', n1 => 'b'), ['b', 'f', n1 => 'a', n1 => 'b']; +like exception { name_1_2 n2 => 'a' }, qr/Missing named\b.+\bn1\b/; +like exception { name_1_2 n2 => 'a', n2 => 'b' }, qr/Missing named\b.+\bn1\b/; +like exception { name_1_2 n1 => 'a', 'n2' }, qr/Odd number/; +like exception { name_1_2 n1 => 'a', 'asdf' }, qr/Odd number/; +like exception { name_1_2 n2 => 'b', n1 => 'a', huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply name_1_2(n2 => 42, n1 => undef), [undef, 42, n2 => 42, n1 => undef]; +is_deeply name_1_2(n2 => 42, n1 => 'a'), ['a', 42, n2 => 42, n1 => 'a']; +is_deeply name_1_2(n2 => 42, n1 => 'a', n1 => 'b'), ['b', 42, n2 => 42, n1 => 'a', n1 => 'b']; +is_deeply name_1_2(n2 => 42, n1 => 'a', n1 => undef), [undef, 42, n2 => 42, n1 => 'a', n1 => undef]; +is_deeply name_1_2(n1 => undef, n2 => 42), [undef, 42, n1 => undef, n2 => 42]; +is_deeply name_1_2(n1 => 'a', n2 => 42), ['a', 42, n1 => 'a', n2 => 42]; +is_deeply name_1_2(n1 => 'a', n1 => 'b', n2 => 42), ['b', 42, n1 => 'a', n1 => 'b', n2 => 42]; +is_deeply name_1_2(n1 => 'a', n2 => 42, n1 => undef), [undef, 42, n1 => 'a', n2 => 42, n1 => undef]; + + +fun name_0_2(:$n1 = 'd', :$n2 = 'f') { [$n1, $n2, @_] } + +is_deeply name_0_2, ['d', 'f']; +like exception { name_0_2 'n1' }, qr/Odd number/; +like exception { name_0_2 'asdf' }, qr/Odd number/; +like exception { name_0_2 huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply name_0_2(n1 => 'a'), ['a', 'f', n1 => 'a']; +is_deeply name_0_2(n1 => 'a', n1 => 'b'), ['b', 'f', n1 => 'a', n1 => 'b']; +is_deeply name_0_2(n2 => 'a'), ['d', 'a', n2 => 'a']; +is_deeply name_0_2(n2 => 'a', n2 => 'b'), ['d', 'b', n2 => 'a', n2 => 'b']; +like exception { name_0_2 n1 => 'a', 'n2' }, qr/Odd number/; +like exception { name_0_2 n1 => 'a', 'asdf' }, qr/Odd number/; +like exception { name_0_2 n2 => 'b', n1 => 'a', huh => 1 }, qr/\bnamed\b.+\bhuh\b/; +is_deeply name_0_2(n2 => 42, n1 => undef), [undef, 42, n2 => 42, n1 => undef]; +is_deeply name_0_2(n2 => 42, n1 => 'a'), ['a', 42, n2 => 42, n1 => 'a']; +is_deeply name_0_2(n2 => 42, n1 => 'a', n1 => 'b'), ['b', 42, n2 => 42, n1 => 'a', n1 => 'b']; +is_deeply name_0_2(n2 => 42, n1 => 'a', n1 => undef), [undef, 42, n2 => 42, n1 => 'a', n1 => undef]; +is_deeply name_0_2(n1 => undef, n2 => 42), [undef, 42, n1 => undef, n2 => 42]; +is_deeply name_0_2(n1 => 'a', n2 => 42), ['a', 42, n1 => 'a', n2 => 42]; +is_deeply name_0_2(n1 => 'a', n1 => 'b', n2 => 42), ['b', 42, n1 => 'a', n1 => 'b', n2 => 42]; +is_deeply name_0_2(n1 => 'a', n2 => 42, n1 => undef), [undef, 42, n1 => 'a', n2 => 42, n1 => undef]; + + +fun pos_1_2_name_0_3_slurp($p1, $p2 = 'E', :$n1 = undef, :$n2 = 'A', :$n3 = 'F', @rest) { [$p1, $p2, $n1, $n2, $n3, \@rest, @_] } + +like exception { pos_1_2_name_0_3_slurp }, qr/Not enough/; +is_deeply pos_1_2_name_0_3_slurp('a'), ['a', 'E', undef, 'A', 'F', [], 'a']; +is_deeply pos_1_2_name_0_3_slurp('a', 'b'), ['a', 'b', undef, 'A', 'F', [], 'a', 'b']; +like exception { pos_1_2_name_0_3_slurp 'a', 'b', 'c' }, qr/Odd number/; +is_deeply pos_1_2_name_0_3_slurp('a', 'b', 'c', 'd'), ['a', 'b', undef, 'A', 'F', ['c', 'd'], 'a', 'b', 'c', 'd']; +like exception { pos_1_2_name_0_3_slurp 'a', 'b', 'c', 'd', 'e' }, qr/Odd number/; +is_deeply pos_1_2_name_0_3_slurp('a', 'b', 'c', 'd', 'e', 'f'), ['a', 'b', undef, 'A', 'F', ['c', 'd', 'e', 'f'], 'a', 'b', 'c', 'd', 'e', 'f']; +is_deeply pos_1_2_name_0_3_slurp('a', 'b', n2 => 'c', n1 => 'd'), ['a', 'b', 'd', 'c', 'F', [], 'a', 'b', n2 => 'c', n1 => 'd']; +is_deeply pos_1_2_name_0_3_slurp('a', 'b', n2 => 'c', beans => 'legume', n1 => 'd'), ['a', 'b', 'd', 'c', 'F', [beans => 'legume'], 'a', 'b', n2 => 'c', beans => 'legume', n1 => 'd'];