X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=dcffdaf800f7c7b3c11eb90b74bc62068c709178;hb=77004dee2553ce034a8a58b2b2849e3656df46c3;hp=6bd5955649b6bbe990c886b35cccb9fed5266dc9;hpb=52657f304589f1061955524e1c3f71ab033cd3d4;p=p5sagit%2Fp5-mst-13.2.git diff --git a/proto.h b/proto.h index 6bd5955..dcffdaf 100644 --- a/proto.h +++ b/proto.h @@ -304,6 +304,9 @@ PERL_CALLCONV int Perl_printf_nocontext(const char* fmt, ...) PERL_CALLCONV void Perl_cv_ckproto(pTHX_ const CV* cv, const GV* gv, const char* p) __attribute__nonnull__(pTHX_1); +PERL_CALLCONV void Perl_cv_ckproto_len(pTHX_ const CV* cv, const GV* gv, const char* p, const STRLEN len) + __attribute__nonnull__(pTHX_1); + PERL_CALLCONV CV* Perl_cv_clone(pTHX_ CV* proto) __attribute__nonnull__(pTHX_1); @@ -642,12 +645,16 @@ PERL_CALLCONV void Perl_gv_fullname4(pTHX_ SV* sv, const GV* gv, const char* pre __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); +PERL_CALLCONV GP * Perl_newGP(pTHX_ GV *const gv) + __attribute__nonnull__(pTHX_1); + PERL_CALLCONV void Perl_gv_init(pTHX_ GV* gv, HV* stash, const char* name, STRLEN len, int multi) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_3); PERL_CALLCONV void Perl_gv_name_set(pTHX_ GV* gv, const char *name, U32 len, U32 flags) - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(pTHX_1) + __attribute__nonnull__(pTHX_2); PERL_CALLCONV HV* Perl_gv_stashpv(pTHX_ const char* name, I32 create) __attribute__nonnull__(pTHX_1); @@ -657,6 +664,9 @@ PERL_CALLCONV HV* Perl_gv_stashpvn(pTHX_ const char* name, U32 namelen, I32 crea PERL_CALLCONV HV* Perl_gv_stashsv(pTHX_ SV* sv, I32 create); PERL_CALLCONV void Perl_hv_clear(pTHX_ HV* tb); +PERL_CALLCONV HV * Perl_hv_copy_hints_hv(pTHX_ HV *const ohv) + __attribute__nonnull__(pTHX_1); + PERL_CALLCONV void Perl_hv_delayfree_ent(pTHX_ HV* hv, HE* entry) __attribute__nonnull__(pTHX_1); @@ -720,6 +730,9 @@ PERL_CALLCONV void Perl_hv_ksplit(pTHX_ HV* hv, IV newmax) /* PERL_CALLCONV void Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how) __attribute__nonnull__(pTHX_1); */ +PERL_CALLCONV HV * Perl_refcounted_he_chain_2hv(pTHX_ const struct refcounted_he *c); +PERL_CALLCONV void Perl_refcounted_he_free(pTHX_ struct refcounted_he *he); +PERL_CALLCONV struct refcounted_he * Perl_refcounted_he_new(pTHX_ struct refcounted_he *const parent, SV *const key, SV *const value); PERL_CALLCONV SV** Perl_hv_store(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash); PERL_CALLCONV HE* Perl_hv_store_ent(pTHX_ HV* tb, SV* key, SV* val, U32 hash); PERL_CALLCONV SV** Perl_hv_store_flags(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash, int flags); @@ -1054,6 +1067,10 @@ PERL_CALLCONV int Perl_magic_clear_all_env(pTHX_ SV* sv, MAGIC* mg) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); +PERL_CALLCONV int Perl_magic_clearhint(pTHX_ SV* sv, MAGIC* mg) + __attribute__nonnull__(pTHX_1) + __attribute__nonnull__(pTHX_2); + PERL_CALLCONV int Perl_magic_clearpack(pTHX_ SV* sv, MAGIC* mg) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); @@ -1176,6 +1193,10 @@ PERL_CALLCONV int Perl_magic_setfm(pTHX_ SV* sv, MAGIC* mg) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); +PERL_CALLCONV int Perl_magic_sethint(pTHX_ SV* sv, MAGIC* mg) + __attribute__nonnull__(pTHX_1) + __attribute__nonnull__(pTHX_2); + PERL_CALLCONV int Perl_magic_setisa(pTHX_ SV* sv, MAGIC* mg) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); @@ -1460,6 +1481,10 @@ PERL_CALLCONV OP* Perl_newSTATEOP(pTHX_ I32 flags, char* label, OP* o) __attribute__warn_unused_result__; PERL_CALLCONV CV* Perl_newSUB(pTHX_ I32 floor, OP* o, OP* proto, OP* block); +PERL_CALLCONV CV * Perl_newXS_flags(pTHX_ const char *name, XSUBADDR_t subaddr, const char *const filename, const char *const proto, U32 flags) + __attribute__nonnull__(pTHX_2) + __attribute__nonnull__(pTHX_3); + PERL_CALLCONV CV* Perl_newXS(pTHX_ const char* name, XSUBADDR_t f, const char* filename) __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_3); @@ -1788,11 +1813,11 @@ PERL_CALLCONV OP* Perl_prepend_elem(pTHX_ I32 optype, OP* head, OP* tail); PERL_CALLCONV void Perl_push_scope(pTHX); /* PERL_CALLCONV OP* ref(pTHX_ OP* o, I32 type); */ PERL_CALLCONV OP* Perl_refkids(pTHX_ OP* o, I32 type); -PERL_CALLCONV void Perl_regdump(pTHX_ regexp* r) +PERL_CALLCONV void Perl_regdump(pTHX_ const regexp* r) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV SV* Perl_regclass_swash(pTHX_ const struct regnode *n, bool doinit, SV **listsvp, SV **altsvp) - __attribute__nonnull__(pTHX_1); +PERL_CALLCONV SV* Perl_regclass_swash(pTHX_ const regexp *prog, const struct regnode *n, bool doinit, SV **listsvp, SV **altsvp) + __attribute__nonnull__(pTHX_2); PERL_CALLCONV I32 Perl_pregexec(pTHX_ regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, U32 nosave) __attribute__nonnull__(pTHX_1) @@ -1826,9 +1851,9 @@ PERL_CALLCONV regnode* Perl_regnext(pTHX_ regnode* p) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -PERL_CALLCONV void Perl_regprop(pTHX_ SV* sv, const regnode* o) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); +PERL_CALLCONV void Perl_regprop(pTHX_ const regexp *prog, SV* sv, const regnode* o) + __attribute__nonnull__(pTHX_2) + __attribute__nonnull__(pTHX_3); PERL_CALLCONV void Perl_repeatcpy(pTHX_ char* to, const char* from, I32 len, I32 count) __attribute__nonnull__(pTHX_1) @@ -2047,9 +2072,13 @@ PERL_CALLCONV IO* Perl_sv_2io(pTHX_ SV* sv) __attribute__nonnull__(pTHX_1); #ifdef PERL_IN_SV_C -STATIC char* S_glob_2inpuv(pTHX_ GV* gv, STRLEN *len, bool want_number) +STATIC bool S_glob_2number(pTHX_ GV* const gv) __attribute__nonnull__(pTHX_1); +STATIC char* S_glob_2pv(pTHX_ GV* const gv, STRLEN * const len) + __attribute__nonnull__(pTHX_1) + __attribute__nonnull__(pTHX_2); + #endif /* PERL_CALLCONV IV sv_2iv(pTHX_ SV* sv) __attribute__nonnull__(pTHX_1); */ @@ -2323,7 +2352,10 @@ PERL_CALLCONV void Perl_sv_untaint(pTHX_ SV* sv) PERL_CALLCONV void Perl_sv_upgrade(pTHX_ SV* sv, U32 mt) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV void Perl_sv_usepvn(pTHX_ SV* sv, char* ptr, STRLEN len) +/* PERL_CALLCONV void Perl_sv_usepvn(pTHX_ SV* sv, char* ptr, STRLEN len) + __attribute__nonnull__(pTHX_1); */ + +PERL_CALLCONV void Perl_sv_usepvn_flags(pTHX_ SV* sv, char* ptr, STRLEN len, U32 flags) __attribute__nonnull__(pTHX_1); PERL_CALLCONV void Perl_sv_vcatpvfn(pTHX_ SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *maybe_tainted) @@ -2620,8 +2652,8 @@ PERL_CALLCONV void Perl_sv_setpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len) PERL_CALLCONV void Perl_sv_setsv_mg(pTHX_ SV *dstr, SV *sstr) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV void Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV void Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV MGVTBL* Perl_get_vtbl(pTHX_ int vtbl_id) __attribute__warn_unused_result__; @@ -2845,27 +2877,27 @@ PERL_CALLCONV int Perl_nothreadhook(pTHX); END_EXTERN_C #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT) -STATIC I32 S_do_trans_simple(pTHX_ SV *sv) +STATIC I32 S_do_trans_simple(pTHX_ SV * const sv) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -STATIC I32 S_do_trans_count(pTHX_ SV *sv) +STATIC I32 S_do_trans_count(pTHX_ SV * const sv) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -STATIC I32 S_do_trans_complex(pTHX_ SV *sv) +STATIC I32 S_do_trans_complex(pTHX_ SV * const sv) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -STATIC I32 S_do_trans_simple_utf8(pTHX_ SV *sv) +STATIC I32 S_do_trans_simple_utf8(pTHX_ SV * const sv) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -STATIC I32 S_do_trans_count_utf8(pTHX_ SV *sv) +STATIC I32 S_do_trans_count_utf8(pTHX_ SV * const sv) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -STATIC I32 S_do_trans_complex_utf8(pTHX_ SV *sv) +STATIC I32 S_do_trans_complex_utf8(pTHX_ SV * const sv) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); @@ -2921,6 +2953,9 @@ STATIC struct xpvhv_aux* S_hv_auxinit(HV *hv) STATIC SV* S_hv_delete_common(pTHX_ HV* tb, SV* keysv, const char* key, STRLEN klen, int k_flags, I32 d_flags, U32 hash); STATIC HE* S_hv_fetch_common(pTHX_ HV* tb, SV* keysv, const char* key, STRLEN klen, int flags, int action, SV* val, U32 hash); +STATIC void S_clear_placeholders(pTHX_ HV* hb, U32 items) + __attribute__nonnull__(pTHX_1); + #endif #if defined(PERL_IN_MG_C) || defined(PERL_DECL_PROT) @@ -3238,12 +3273,6 @@ STATIC void* S_parse_body(pTHX_ char **env, XSINIT_t xsinit); STATIC void S_run_body(pTHX_ I32 oldscope) __attribute__noreturn__; -STATIC void S_call_body(pTHX_ const OP *myop, bool is_eval) - __attribute__nonnull__(pTHX_1); - -STATIC void* S_call_list_body(pTHX_ CV *cv) - __attribute__nonnull__(pTHX_1); - STATIC SV * S_incpush_if_exists(pTHX_ SV *dir) __attribute__nonnull__(pTHX_1); @@ -3506,12 +3535,12 @@ STATIC void S_reginsert(pTHX_ struct RExC_state_t *state, U8 op, regnode *opnd) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_3); -STATIC void S_regoptail(pTHX_ struct RExC_state_t *state, regnode *p, regnode *val) +STATIC void S_regoptail(pTHX_ const struct RExC_state_t *state, regnode *p, const regnode *val) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_3); -STATIC void S_regtail(pTHX_ struct RExC_state_t *state, regnode *p, regnode *val) +STATIC void S_regtail(pTHX_ const struct RExC_state_t *state, regnode *p, const regnode *val) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_3); @@ -3525,20 +3554,21 @@ STATIC char* S_nextchar(pTHX_ struct RExC_state_t *state) __attribute__nonnull__(pTHX_1); # ifdef DEBUGGING -STATIC regnode* S_dumpuntil(pTHX_ regnode *start, regnode *node, regnode *last, SV* sv, I32 l) +STATIC const regnode* S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, const regnode *last, SV* sv, I32 l) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2) - __attribute__nonnull__(pTHX_4); + __attribute__nonnull__(pTHX_3) + __attribute__nonnull__(pTHX_5); STATIC void S_put_byte(pTHX_ SV* sv, int c) __attribute__nonnull__(pTHX_1); # endif -STATIC void S_scan_commit(pTHX_ struct RExC_state_t* state, struct scan_data_t *data) +STATIC void S_scan_commit(pTHX_ const struct RExC_state_t* state, struct scan_data_t *data) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); -STATIC void S_cl_anything(struct RExC_state_t* state, struct regnode_charclass_class *cl) +STATIC void S_cl_anything(const struct RExC_state_t* state, struct regnode_charclass_class *cl) __attribute__nonnull__(1) __attribute__nonnull__(2); @@ -3546,11 +3576,11 @@ STATIC int S_cl_is_anything(const struct regnode_charclass_class *cl) __attribute__warn_unused_result__ __attribute__nonnull__(1); -STATIC void S_cl_init(struct RExC_state_t* state, struct regnode_charclass_class *cl) +STATIC void S_cl_init(const struct RExC_state_t* state, struct regnode_charclass_class *cl) __attribute__nonnull__(1) __attribute__nonnull__(2); -STATIC void S_cl_init_zero(struct RExC_state_t* state, struct regnode_charclass_class *cl) +STATIC void S_cl_init_zero(const struct RExC_state_t* state, struct regnode_charclass_class *cl) __attribute__nonnull__(1) __attribute__nonnull__(2); @@ -3558,7 +3588,7 @@ STATIC void S_cl_and(struct regnode_charclass_class *cl, const struct regnode_ch __attribute__nonnull__(1) __attribute__nonnull__(2); -STATIC void S_cl_or(struct RExC_state_t* state, struct regnode_charclass_class *cl, const struct regnode_charclass_class *or_with) +STATIC void S_cl_or(const struct RExC_state_t* state, struct regnode_charclass_class *cl, const struct regnode_charclass_class *or_with) __attribute__nonnull__(1) __attribute__nonnull__(2) __attribute__nonnull__(3); @@ -3596,27 +3626,28 @@ STATIC I32 S_make_trie(pTHX_ struct RExC_state_t* state, regnode *startbranch, r #endif #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT) -STATIC I32 S_regmatch(pTHX_ regnode *prog) +STATIC I32 S_regmatch(pTHX_ const regmatch_info *reginfo, regnode *prog) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); - -STATIC I32 S_regrepeat(pTHX_ const regnode *p, I32 max) - __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(pTHX_1) + __attribute__nonnull__(pTHX_2); -STATIC I32 S_regtry(pTHX_ regexp *prog, char *startpos) +STATIC I32 S_regrepeat(pTHX_ const regexp *prog, const regnode *p, I32 max) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); -STATIC bool S_reginclass(pTHX_ const regnode *n, const U8 *p, STRLEN *lenp, bool do_utf8sv_is_utf8) +STATIC I32 S_regtry(pTHX_ const regmatch_info *reginfo, char *startpos) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); +STATIC bool S_reginclass(pTHX_ const regexp *prog, const regnode *n, const U8 *p, STRLEN *lenp, bool do_utf8sv_is_utf8) + __attribute__warn_unused_result__ + __attribute__nonnull__(pTHX_2) + __attribute__nonnull__(pTHX_3); + STATIC CHECKPOINT S_regcppush(pTHX_ I32 parenfloor); -STATIC char* S_regcppop(pTHX); -STATIC void S_cache_re(pTHX_ regexp *prog) +STATIC char* S_regcppop(pTHX_ const regexp *rex) __attribute__nonnull__(pTHX_1); STATIC U8* S_reghop3(U8 *pos, I32 off, U8 *lim) @@ -3629,7 +3660,7 @@ STATIC U8* S_reghopmaybe3(U8 *pos, I32 off, U8 *lim) __attribute__nonnull__(1) __attribute__nonnull__(3); -STATIC char* S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, const char *strend, I32 norun) +STATIC char* S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, const char *strend, const regmatch_info *reginfo) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2) @@ -3651,6 +3682,9 @@ STATIC void S_debprof(pTHX_ const OP *o) STATIC void S_sequence(pTHX_ const OP *o); STATIC UV S_sequence_num(pTHX_ const OP *o); +STATIC SV* S_pm_description(pTHX_ const PMOP *pm) + __attribute__nonnull__(pTHX_1); + #endif #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT) @@ -3710,13 +3744,13 @@ STATIC I32 S_expect_number(pTHX_ char** pattern) __attribute__nonnull__(pTHX_1); # -STATIC STRLEN S_sv_pos_u2b_forwards(pTHX_ const U8 *const start, const U8 *const send, STRLEN uoffset) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); +STATIC STRLEN S_sv_pos_u2b_forwards(const U8 *const start, const U8 *const send, STRLEN uoffset) + __attribute__nonnull__(1) + __attribute__nonnull__(2); -STATIC STRLEN S_sv_pos_u2b_midway(pTHX_ const U8 *const start, const U8 *const send, STRLEN uoffset, STRLEN uend) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); +STATIC STRLEN S_sv_pos_u2b_midway(const U8 *const start, const U8 *send, STRLEN uoffset, STRLEN uend) + __attribute__nonnull__(1) + __attribute__nonnull__(2); STATIC STRLEN S_sv_pos_u2b_cached(pTHX_ SV *sv, MAGIC **mgp, const U8 *const start, const U8 *const send, STRLEN uoffset, STRLEN uoffset0, STRLEN boffset0) __attribute__nonnull__(pTHX_1) @@ -3849,7 +3883,7 @@ STATIC void S_checkcomma(pTHX_ const char *s, const char *name, const char *what __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_3); -STATIC bool S_feature_is_enabled(pTHX_ char* name, STRLEN namelen) +STATIC bool S_feature_is_enabled(pTHX_ const char* name, STRLEN namelen) __attribute__nonnull__(pTHX_1); STATIC void S_force_ident(pTHX_ const char *s, int kind) @@ -4275,6 +4309,11 @@ PERL_CALLCONV GV* Perl_gv_SVadd(pTHX_ GV* gv) #endif PERL_CALLCONV bool Perl_ckwarn(pTHX_ U32 w); PERL_CALLCONV bool Perl_ckwarn_d(pTHX_ U32 w); +PERL_CALLCONV STRLEN * Perl_new_warnings_bitfield(pTHX_ STRLEN *buffer, const char *const bits, STRLEN size) + __attribute__malloc__ + __attribute__warn_unused_result__ + __attribute__nonnull__(pTHX_2); + PERL_CALLCONV void Perl_offer_nice_chunk(pTHX_ void *chunk, U32 chunk_size) __attribute__nonnull__(pTHX_1);