X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=5edf4bad0899473f14ad257870b92ad16301e710;hb=952306aca140c014b38ba5eb2ed71dffaa548f0f;hp=52dc7d16e03a6392fcb6df69dd416e5683098e85;hpb=86f5593612e0fa4d1eddfb78098731af1f9f4548;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 52dc7d1..5edf4ba 100644 --- a/embed.h +++ b/embed.h @@ -3,7 +3,7 @@ * embed.h * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 2005, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -94,6 +94,7 @@ #endif #ifdef PERL_CORE #define convert Perl_convert +#define create_eval_scope Perl_create_eval_scope #endif #define croak Perl_croak #define vcroak Perl_vcroak @@ -116,6 +117,7 @@ #endif #ifdef PERL_CORE #define cv_ckproto Perl_cv_ckproto +#define cv_ckproto_len Perl_cv_ckproto_len #define cv_clone Perl_cv_clone #endif #define gv_const_sv Perl_gv_const_sv @@ -146,6 +148,7 @@ #define debstackptrs Perl_debstackptrs #define delimcpy Perl_delimcpy #ifdef PERL_CORE +#define delete_eval_scope Perl_delete_eval_scope #define deprecate Perl_deprecate #define deprecate_old Perl_deprecate_old #endif @@ -265,6 +268,7 @@ #define gv_fullname Perl_gv_fullname #define gv_fullname4 Perl_gv_fullname4 #define gv_init Perl_gv_init +#define gv_name_set Perl_gv_name_set #define gv_stashpv Perl_gv_stashpv #define gv_stashpvn Perl_gv_stashpvn #define gv_stashsv Perl_gv_stashsv @@ -396,6 +400,7 @@ #ifdef PERL_CORE #define magic_clearenv Perl_magic_clearenv #define magic_clear_all_env Perl_magic_clear_all_env +#define magic_clearhint Perl_magic_clearhint #define magic_clearpack Perl_magic_clearpack #define magic_clearsig Perl_magic_clearsig #define magic_existspack Perl_magic_existspack @@ -404,7 +409,6 @@ #define magic_get Perl_magic_get #define magic_getarylen Perl_magic_getarylen #define magic_getdefelem Perl_magic_getdefelem -#define magic_getglob Perl_magic_getglob #define magic_getnkeys Perl_magic_getnkeys #define magic_getpack Perl_magic_getpack #define magic_getpos Perl_magic_getpos @@ -427,6 +431,7 @@ #define magic_setdefelem Perl_magic_setdefelem #define magic_setenv Perl_magic_setenv #define magic_setfm Perl_magic_setfm +#define magic_sethint Perl_magic_sethint #define magic_setisa Perl_magic_setisa #define magic_setglob Perl_magic_setglob #define magic_setmglob Perl_magic_setmglob @@ -520,7 +525,11 @@ #define newASSIGNOP Perl_newASSIGNOP #define newCONDOP Perl_newCONDOP #define newCONSTSUB Perl_newCONSTSUB +#ifdef PERL_MAD #define newFORM Perl_newFORM +#else +#define newFORM Perl_newFORM +#endif #define newFOROP Perl_newFOROP #define newGIVENOP Perl_newGIVENOP #define newLOGOP Perl_newLOGOP @@ -533,6 +542,7 @@ #define newSLICEOP Perl_newSLICEOP #define newSTATEOP Perl_newSTATEOP #define newSUB Perl_newSUB +#define newXS_flags Perl_newXS_flags #define newXS Perl_newXS #define newAV Perl_newAV #define newAVREF Perl_newAVREF @@ -586,8 +596,16 @@ #define oopsCV Perl_oopsCV #endif #define op_free Perl_op_free +#ifdef PERL_MAD #ifdef PERL_CORE #define package Perl_package +#endif +#else +#ifdef PERL_CORE +#define package Perl_package +#endif +#endif +#ifdef PERL_CORE #define pad_alloc Perl_pad_alloc #define allocmy Perl_allocmy #define pad_findmy Perl_pad_findmy @@ -731,7 +749,6 @@ #define save_padsv Perl_save_padsv #define save_sptr Perl_save_sptr #define save_svref Perl_save_svref -#define save_threadsv Perl_save_threadsv #ifdef PERL_CORE #define sawparens Perl_sawparens #define scalar Perl_scalar @@ -775,6 +792,12 @@ #define sv_2bool Perl_sv_2bool #define sv_2cv Perl_sv_2cv #define sv_2io Perl_sv_2io +#ifdef PERL_IN_SV_C +#ifdef PERL_CORE +#define glob_2number S_glob_2number +#define glob_2pv S_glob_2pv +#endif +#endif #define sv_2iv_flags Perl_sv_2iv_flags #define sv_2mortal Perl_sv_2mortal #define sv_2nv Perl_sv_2nv @@ -861,7 +884,7 @@ #define sv_unref_flags Perl_sv_unref_flags #define sv_untaint Perl_sv_untaint #define sv_upgrade Perl_sv_upgrade -#define sv_usepvn Perl_sv_usepvn +#define sv_usepvn_flags Perl_sv_usepvn_flags #define sv_vcatpvfn Perl_sv_vcatpvfn #define sv_vsetpvfn Perl_sv_vsetpvfn #define str_to_version Perl_str_to_version @@ -880,10 +903,18 @@ #define unpack_str Perl_unpack_str #define unpackstring Perl_unpackstring #define unsharepvn Perl_unsharepvn -#ifdef PERL_CORE +#if defined(PERL_CORE) || defined(PERL_EXT) #define unshare_hek Perl_unshare_hek +#endif +#ifdef PERL_MAD +#ifdef PERL_CORE +#define utilize Perl_utilize +#endif +#else +#ifdef PERL_CORE #define utilize Perl_utilize #endif +#endif #define utf16_to_utf8 Perl_utf16_to_utf8 #define utf16_to_utf8_reversed Perl_utf16_to_utf8_reversed #define utf8_length Perl_utf8_length @@ -961,7 +992,6 @@ #define sv_setpv_mg Perl_sv_setpv_mg #define sv_setpvn_mg Perl_sv_setpvn_mg #define sv_setsv_mg Perl_sv_setsv_mg -#define sv_usepvn_mg Perl_sv_usepvn_mg #define get_vtbl Perl_get_vtbl #define pv_display Perl_pv_display #define dump_indent Perl_dump_indent @@ -986,7 +1016,11 @@ #endif #define newANONATTRSUB Perl_newANONATTRSUB #define newATTRSUB Perl_newATTRSUB +#ifdef PERL_MAD +#define newMYSUB Perl_newMYSUB +#else #define newMYSUB Perl_newMYSUB +#endif #ifdef PERL_CORE #define my_attrs Perl_my_attrs #define boot_core_xsutils Perl_boot_core_xsutils @@ -1027,6 +1061,10 @@ #endif #endif #define sv_nosharing Perl_sv_nosharing +#ifdef NO_MATHOMS +#else +#define sv_nounlocking Perl_sv_nounlocking +#endif #define nothreadhook Perl_nothreadhook #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE @@ -1057,6 +1095,7 @@ #define hv_auxinit S_hv_auxinit #define hv_delete_common S_hv_delete_common #define hv_fetch_common S_hv_fetch_common +#define clear_placeholders S_clear_placeholders #endif #endif #if defined(PERL_IN_MG_C) || defined(PERL_DECL_PROT) @@ -1166,8 +1205,6 @@ #ifdef PERL_CORE #define parse_body S_parse_body #define run_body S_run_body -#define call_body S_call_body -#define call_list_body S_call_list_body #define incpush_if_exists S_incpush_if_exists #endif #endif @@ -1248,6 +1285,9 @@ #define dooneliner S_dooneliner #endif # endif +#ifdef PERL_CORE +#define space_join_names_mortal S_space_join_names_mortal +#endif #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT) #if defined(PERL_CORE) || defined(PERL_EXT) @@ -1298,16 +1338,11 @@ #if defined(PERL_CORE) || defined(PERL_EXT) #define regmatch S_regmatch #define regrepeat S_regrepeat -#define regrepeat_hard S_regrepeat_hard #define regtry S_regtry #define reginclass S_reginclass #define regcppush S_regcppush #define regcppop S_regcppop -#define regcp_set_to S_regcp_set_to -#define cache_re S_cache_re -#define reghop S_reghop #define reghop3 S_reghop3 -#define reghopmaybe S_reghopmaybe #define reghopmaybe3 S_reghopmaybe3 #define find_byclass S_find_byclass #define to_utf8_substr S_to_utf8_substr @@ -1319,7 +1354,9 @@ #define deb_curcv S_deb_curcv #define debprof S_debprof #define sequence S_sequence +#define sequence_tail S_sequence_tail #define sequence_num S_sequence_num +#define pm_description S_pm_description #endif #endif #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT) @@ -1354,15 +1391,36 @@ #define expect_number S_expect_number #endif #ifdef PERL_CORE -#define utf8_mg_pos S_utf8_mg_pos -#define utf8_mg_pos_init S_utf8_mg_pos_init +#define sv_pos_u2b_forwards S_sv_pos_u2b_forwards +#define sv_pos_u2b_midway S_sv_pos_u2b_midway +#define sv_pos_u2b_cached S_sv_pos_u2b_cached +#define utf8_mg_pos_cache_update S_utf8_mg_pos_cache_update +#define sv_pos_b2u_forwards S_sv_pos_b2u_forwards +#define sv_pos_b2u_midway S_sv_pos_b2u_midway #define stringify_regexp S_stringify_regexp #define F0convert S_F0convert #endif -#if defined(PERL_OLD_COPY_ON_WRITE) +# if defined(PERL_OLD_COPY_ON_WRITE) #ifdef PERL_CORE #define sv_release_COW S_sv_release_COW #endif +# endif +#ifdef PERL_CORE +#define more_sv S_more_sv +#define more_bodies S_more_bodies +#define sv_2iuv_common S_sv_2iuv_common +#define glob_assign_glob S_glob_assign_glob +#define glob_assign_ref S_glob_assign_ref +#endif +# if defined(USE_ITHREADS) +#ifdef PERL_CORE +#define ptr_table_find S_ptr_table_find +#endif +# endif +#ifdef PERL_CORE +#define find_hash_subscript S_find_hash_subscript +#define find_array_subscript S_find_array_subscript +#define find_uninit_var S_find_uninit_var #endif #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) @@ -1697,8 +1755,61 @@ #endif #ifdef PERL_IMPLICIT_CONTEXT #endif +#ifdef PERL_MAD +#ifdef PERL_CORE +#define pad_peg Perl_pad_peg +#endif +#if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define xmldump_attr S_xmldump_attr +#endif +#endif +#ifdef PERL_CORE +#define xmldump_indent Perl_xmldump_indent +#define xmldump_vindent Perl_xmldump_vindent +#define xmldump_all Perl_xmldump_all +#define xmldump_packsubs Perl_xmldump_packsubs +#define xmldump_sub Perl_xmldump_sub +#define xmldump_form Perl_xmldump_form +#define xmldump_eval Perl_xmldump_eval +#define sv_catxmlsv Perl_sv_catxmlsv +#define sv_catxmlpvn Perl_sv_catxmlpvn +#define sv_xmlpeek Perl_sv_xmlpeek +#define do_pmop_xmldump Perl_do_pmop_xmldump +#define pmop_xmldump Perl_pmop_xmldump +#define do_op_xmldump Perl_do_op_xmldump +#define op_xmldump Perl_op_xmldump +#endif +#ifdef PERL_CORE +#define newTOKEN Perl_newTOKEN +#define token_free Perl_token_free +#define token_getmad Perl_token_getmad +#define op_getmad_weak Perl_op_getmad_weak +#define op_getmad Perl_op_getmad +#define prepend_madprops Perl_prepend_madprops +#define append_madprops Perl_append_madprops +#define addmad Perl_addmad +#define newMADsv Perl_newMADsv +#define newMADPROP Perl_newMADPROP +#define mad_free Perl_mad_free +#endif +# if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define skipspace0 S_skipspace0 +#define skipspace1 S_skipspace1 +#define skipspace2 S_skipspace2 +#define start_force S_start_force +#define curmad S_curmad +#endif +# endif +#ifdef PERL_CORE +#define madlex Perl_madlex +#define madparse Perl_madparse +#endif +#endif #define ck_anoncode Perl_ck_anoncode #define ck_bitop Perl_ck_bitop +#define ck_chdir Perl_ck_chdir #define ck_concat Perl_ck_concat #define ck_defined Perl_ck_defined #define ck_delete Perl_ck_delete @@ -2165,12 +2276,14 @@ #endif #ifdef PERL_CORE #define convert(a,b,c) Perl_convert(aTHX_ a,b,c) +#define create_eval_scope(a) Perl_create_eval_scope(aTHX_ a) #endif #define vcroak(a,b) Perl_vcroak(aTHX_ a,b) #if defined(PERL_IMPLICIT_CONTEXT) #endif #ifdef PERL_CORE #define cv_ckproto(a,b,c) Perl_cv_ckproto(aTHX_ a,b,c) +#define cv_ckproto_len(a,b,c,d) Perl_cv_ckproto_len(aTHX_ a,b,c,d) #define cv_clone(a) Perl_cv_clone(aTHX_ a) #endif #define gv_const_sv(a) Perl_gv_const_sv(aTHX_ a) @@ -2200,6 +2313,7 @@ #define debstackptrs() Perl_debstackptrs(aTHX) #define delimcpy(a,b,c,d,e,f) Perl_delimcpy(aTHX_ a,b,c,d,e,f) #ifdef PERL_CORE +#define delete_eval_scope() Perl_delete_eval_scope(aTHX) #define deprecate(a) Perl_deprecate(aTHX_ a) #define deprecate_old(a) Perl_deprecate_old(aTHX_ a) #endif @@ -2318,11 +2432,16 @@ #define gv_fetchpv(a,b,c) Perl_gv_fetchpv(aTHX_ a,b,c) #define gv_fullname(a,b) Perl_gv_fullname(aTHX_ a,b) #define gv_fullname4(a,b,c,d) Perl_gv_fullname4(aTHX_ a,b,c,d) +#ifdef PERL_CORE +#endif #define gv_init(a,b,c,d,e) Perl_gv_init(aTHX_ a,b,c,d,e) +#define gv_name_set(a,b,c,d) Perl_gv_name_set(aTHX_ a,b,c,d) #define gv_stashpv(a,b) Perl_gv_stashpv(aTHX_ a,b) #define gv_stashpvn(a,b,c) Perl_gv_stashpvn(aTHX_ a,b,c) #define gv_stashsv(a,b) Perl_gv_stashsv(aTHX_ a,b) #define hv_clear(a) Perl_hv_clear(aTHX_ a) +#ifdef PERL_CORE +#endif #define hv_delayfree_ent(a,b) Perl_hv_delayfree_ent(aTHX_ a,b) #define hv_delete(a,b,c,d) Perl_hv_delete(aTHX_ a,b,c,d) #define hv_delete_ent(a,b,c,d) Perl_hv_delete_ent(aTHX_ a,b,c,d) @@ -2338,6 +2457,8 @@ #define hv_iternext_flags(a,b) Perl_hv_iternext_flags(aTHX_ a,b) #define hv_iterval(a,b) Perl_hv_iterval(aTHX_ a,b) #define hv_ksplit(a,b) Perl_hv_ksplit(aTHX_ a,b) +#ifdef PERL_CORE +#endif #define hv_store(a,b,c,d,e) Perl_hv_store(aTHX_ a,b,c,d,e) #define hv_store_ent(a,b,c,d) Perl_hv_store_ent(aTHX_ a,b,c,d) #define hv_store_flags(a,b,c,d,e,f) Perl_hv_store_flags(aTHX_ a,b,c,d,e,f) @@ -2449,6 +2570,7 @@ #ifdef PERL_CORE #define magic_clearenv(a,b) Perl_magic_clearenv(aTHX_ a,b) #define magic_clear_all_env(a,b) Perl_magic_clear_all_env(aTHX_ a,b) +#define magic_clearhint(a,b) Perl_magic_clearhint(aTHX_ a,b) #define magic_clearpack(a,b) Perl_magic_clearpack(aTHX_ a,b) #define magic_clearsig(a,b) Perl_magic_clearsig(aTHX_ a,b) #define magic_existspack(a,b) Perl_magic_existspack(aTHX_ a,b) @@ -2457,7 +2579,6 @@ #define magic_get(a,b) Perl_magic_get(aTHX_ a,b) #define magic_getarylen(a,b) Perl_magic_getarylen(aTHX_ a,b) #define magic_getdefelem(a,b) Perl_magic_getdefelem(aTHX_ a,b) -#define magic_getglob(a,b) Perl_magic_getglob(aTHX_ a,b) #define magic_getnkeys(a,b) Perl_magic_getnkeys(aTHX_ a,b) #define magic_getpack(a,b) Perl_magic_getpack(aTHX_ a,b) #define magic_getpos(a,b) Perl_magic_getpos(aTHX_ a,b) @@ -2480,6 +2601,7 @@ #define magic_setdefelem(a,b) Perl_magic_setdefelem(aTHX_ a,b) #define magic_setenv(a,b) Perl_magic_setenv(aTHX_ a,b) #define magic_setfm(a,b) Perl_magic_setfm(aTHX_ a,b) +#define magic_sethint(a,b) Perl_magic_sethint(aTHX_ a,b) #define magic_setisa(a,b) Perl_magic_setisa(aTHX_ a,b) #define magic_setglob(a,b) Perl_magic_setglob(aTHX_ a,b) #define magic_setmglob(a,b) Perl_magic_setmglob(aTHX_ a,b) @@ -2572,7 +2694,11 @@ #define newASSIGNOP(a,b,c,d) Perl_newASSIGNOP(aTHX_ a,b,c,d) #define newCONDOP(a,b,c,d) Perl_newCONDOP(aTHX_ a,b,c,d) #define newCONSTSUB(a,b,c) Perl_newCONSTSUB(aTHX_ a,b,c) +#ifdef PERL_MAD #define newFORM(a,b,c) Perl_newFORM(aTHX_ a,b,c) +#else +#define newFORM(a,b,c) Perl_newFORM(aTHX_ a,b,c) +#endif #define newFOROP(a,b,c,d,e,f,g) Perl_newFOROP(aTHX_ a,b,c,d,e,f,g) #define newGIVENOP(a,b,c) Perl_newGIVENOP(aTHX_ a,b,c) #define newLOGOP(a,b,c,d) Perl_newLOGOP(aTHX_ a,b,c,d) @@ -2585,6 +2711,7 @@ #define newSLICEOP(a,b,c) Perl_newSLICEOP(aTHX_ a,b,c) #define newSTATEOP(a,b,c) Perl_newSTATEOP(aTHX_ a,b,c) #define newSUB(a,b,c,d) Perl_newSUB(aTHX_ a,b,c,d) +#define newXS_flags(a,b,c,d,e) Perl_newXS_flags(aTHX_ a,b,c,d,e) #define newXS(a,b,c) Perl_newXS(aTHX_ a,b,c) #define newAV() Perl_newAV(aTHX) #define newAVREF(a) Perl_newAVREF(aTHX_ a) @@ -2637,8 +2764,16 @@ #define oopsCV(a) Perl_oopsCV(aTHX_ a) #endif #define op_free(a) Perl_op_free(aTHX_ a) +#ifdef PERL_MAD +#ifdef PERL_CORE +#define package(a) Perl_package(aTHX_ a) +#endif +#else #ifdef PERL_CORE #define package(a) Perl_package(aTHX_ a) +#endif +#endif +#ifdef PERL_CORE #define pad_alloc(a,b) Perl_pad_alloc(aTHX_ a,b) #define allocmy(a) Perl_allocmy(aTHX_ a) #define pad_findmy(a) Perl_pad_findmy(aTHX_ a) @@ -2704,7 +2839,7 @@ #define refkids(a,b) Perl_refkids(aTHX_ a,b) #endif #define regdump(a) Perl_regdump(aTHX_ a) -#define regclass_swash(a,b,c,d) Perl_regclass_swash(aTHX_ a,b,c,d) +#define regclass_swash(a,b,c,d,e) Perl_regclass_swash(aTHX_ a,b,c,d,e) #define pregexec(a,b,c,d,e,f,g) Perl_pregexec(aTHX_ a,b,c,d,e,f,g) #define pregfree(a) Perl_pregfree(aTHX_ a) #define pregcomp(a,b,c) Perl_pregcomp(aTHX_ a,b,c) @@ -2713,7 +2848,7 @@ #define regexec_flags(a,b,c,d,e,f,g,h) Perl_regexec_flags(aTHX_ a,b,c,d,e,f,g,h) #define regnext(a) Perl_regnext(aTHX_ a) #if defined(PERL_CORE) || defined(PERL_EXT) -#define regprop(a,b) Perl_regprop(aTHX_ a,b) +#define regprop(a,b,c) Perl_regprop(aTHX_ a,b,c) #endif #define repeatcpy(a,b,c,d) Perl_repeatcpy(aTHX_ a,b,c,d) #define rninstr(a,b,c,d) Perl_rninstr(aTHX_ a,b,c,d) @@ -2781,7 +2916,6 @@ #define save_padsv(a) Perl_save_padsv(aTHX_ a) #define save_sptr(a) Perl_save_sptr(aTHX_ a) #define save_svref(a) Perl_save_svref(aTHX_ a) -#define save_threadsv(a) Perl_save_threadsv(aTHX_ a) #ifdef PERL_CORE #define sawparens(a) Perl_sawparens(aTHX_ a) #define scalar(a) Perl_scalar(aTHX_ a) @@ -2823,6 +2957,12 @@ #define sv_2bool(a) Perl_sv_2bool(aTHX_ a) #define sv_2cv(a,b,c,d) Perl_sv_2cv(aTHX_ a,b,c,d) #define sv_2io(a) Perl_sv_2io(aTHX_ a) +#ifdef PERL_IN_SV_C +#ifdef PERL_CORE +#define glob_2number(a) S_glob_2number(aTHX_ a) +#define glob_2pv(a,b) S_glob_2pv(aTHX_ a,b) +#endif +#endif #define sv_2iv_flags(a,b) Perl_sv_2iv_flags(aTHX_ a,b) #define sv_2mortal(a) Perl_sv_2mortal(aTHX_ a) #define sv_2nv(a) Perl_sv_2nv(aTHX_ a) @@ -2907,7 +3047,7 @@ #define sv_unref_flags(a,b) Perl_sv_unref_flags(aTHX_ a,b) #define sv_untaint(a) Perl_sv_untaint(aTHX_ a) #define sv_upgrade(a,b) Perl_sv_upgrade(aTHX_ a,b) -#define sv_usepvn(a,b,c) Perl_sv_usepvn(aTHX_ a,b,c) +#define sv_usepvn_flags(a,b,c,d) Perl_sv_usepvn_flags(aTHX_ a,b,c,d) #define sv_vcatpvfn(a,b,c,d,e,f,g) Perl_sv_vcatpvfn(aTHX_ a,b,c,d,e,f,g) #define sv_vsetpvfn(a,b,c,d,e,f,g) Perl_sv_vsetpvfn(aTHX_ a,b,c,d,e,f,g) #define str_to_version(a) Perl_str_to_version(aTHX_ a) @@ -2926,10 +3066,18 @@ #define unpack_str(a,b,c,d,e,f,g,h) Perl_unpack_str(aTHX_ a,b,c,d,e,f,g,h) #define unpackstring(a,b,c,d,e) Perl_unpackstring(aTHX_ a,b,c,d,e) #define unsharepvn(a,b,c) Perl_unsharepvn(aTHX_ a,b,c) -#ifdef PERL_CORE +#if defined(PERL_CORE) || defined(PERL_EXT) #define unshare_hek(a) Perl_unshare_hek(aTHX_ a) +#endif +#ifdef PERL_MAD +#ifdef PERL_CORE #define utilize(a,b,c,d,e) Perl_utilize(aTHX_ a,b,c,d,e) #endif +#else +#ifdef PERL_CORE +#define utilize(a,b,c,d,e) Perl_utilize(aTHX_ a,b,c,d,e) +#endif +#endif #define utf16_to_utf8(a,b,c,d) Perl_utf16_to_utf8(aTHX_ a,b,c,d) #define utf16_to_utf8_reversed(a,b,c,d) Perl_utf16_to_utf8_reversed(aTHX_ a,b,c,d) #define utf8_length(a,b) Perl_utf8_length(aTHX_ a,b) @@ -3003,7 +3151,6 @@ #define sv_setpv_mg(a,b) Perl_sv_setpv_mg(aTHX_ a,b) #define sv_setpvn_mg(a,b,c) Perl_sv_setpvn_mg(aTHX_ a,b,c) #define sv_setsv_mg(a,b) Perl_sv_setsv_mg(aTHX_ a,b) -#define sv_usepvn_mg(a,b,c) Perl_sv_usepvn_mg(aTHX_ a,b,c) #define get_vtbl(a) Perl_get_vtbl(aTHX_ a) #define pv_display(a,b,c,d,e) Perl_pv_display(aTHX_ a,b,c,d,e) #define dump_vindent(a,b,c,d) Perl_dump_vindent(aTHX_ a,b,c,d) @@ -3027,7 +3174,11 @@ #endif #define newANONATTRSUB(a,b,c,d) Perl_newANONATTRSUB(aTHX_ a,b,c,d) #define newATTRSUB(a,b,c,d,e) Perl_newATTRSUB(aTHX_ a,b,c,d,e) +#ifdef PERL_MAD +#define newMYSUB(a,b,c,d,e) Perl_newMYSUB(aTHX_ a,b,c,d,e) +#else #define newMYSUB(a,b,c,d,e) Perl_newMYSUB(aTHX_ a,b,c,d,e) +#endif #ifdef PERL_CORE #define my_attrs(a,b) Perl_my_attrs(aTHX_ a,b) #define boot_core_xsutils() Perl_boot_core_xsutils(aTHX) @@ -3068,6 +3219,10 @@ #endif #endif #define sv_nosharing(a) Perl_sv_nosharing(aTHX_ a) +#ifdef NO_MATHOMS +#else +#define sv_nounlocking(a) Perl_sv_nounlocking(aTHX_ a) +#endif #define nothreadhook() Perl_nothreadhook(aTHX) #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE @@ -3085,19 +3240,22 @@ #define require_errno(a) S_require_errno(aTHX_ a) #endif #endif +#ifdef PERL_CORE +#endif #if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define hsplit(a) S_hsplit(aTHX_ a) #define hfreeentries(a) S_hfreeentries(aTHX_ a) #define new_he() S_new_he(aTHX) -#define save_hek_flags(a,b,c,d) S_save_hek_flags(aTHX_ a,b,c,d) -#define hv_magic_check(a,b,c) S_hv_magic_check(aTHX_ a,b,c) +#define save_hek_flags S_save_hek_flags +#define hv_magic_check S_hv_magic_check #define unshare_hek_or_pvn(a,b,c,d) S_unshare_hek_or_pvn(aTHX_ a,b,c,d) #define share_hek_flags(a,b,c,d) S_share_hek_flags(aTHX_ a,b,c,d) #define hv_notallowed(a,b,c,d) S_hv_notallowed(aTHX_ a,b,c,d) -#define hv_auxinit(a) S_hv_auxinit(aTHX_ a) +#define hv_auxinit S_hv_auxinit #define hv_delete_common(a,b,c,d,e,f,g) S_hv_delete_common(aTHX_ a,b,c,d,e,f,g) #define hv_fetch_common(a,b,c,d,e,f,g,h) S_hv_fetch_common(aTHX_ a,b,c,d,e,f,g,h) +#define clear_placeholders(a,b) S_clear_placeholders(aTHX_ a,b) #endif #endif #if defined(PERL_IN_MG_C) || defined(PERL_DECL_PROT) @@ -3153,7 +3311,7 @@ #define ck_svconst(a) Perl_ck_svconst(aTHX_ a) #define ck_trunc(a) Perl_ck_trunc(aTHX_ a) #define ck_unpack(a) Perl_ck_unpack(aTHX_ a) -#define is_handle_constructor(a,b) S_is_handle_constructor(aTHX_ a,b) +#define is_handle_constructor S_is_handle_constructor #define is_list_assignment(a) S_is_list_assignment(aTHX_ a) #define cop_free(a) S_cop_free(aTHX_ a) #define modkids(a,b) S_modkids(aTHX_ a,b) @@ -3162,7 +3320,7 @@ #define new_logop(a,b,c,d) S_new_logop(aTHX_ a,b,c,d) #define simplify_sort(a) S_simplify_sort(aTHX_ a) #define gv_ename(a) S_gv_ename(aTHX_ a) -#define scalar_mod_type(a,b) S_scalar_mod_type(aTHX_ a,b) +#define scalar_mod_type S_scalar_mod_type #define my_kid(a,b,c) S_my_kid(aTHX_ a,b,c) #define dup_attrlist(a) S_dup_attrlist(aTHX_ a) #define apply_attrs(a,b,c,d) S_apply_attrs(aTHX_ a,b,c,d) @@ -3184,7 +3342,7 @@ #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define find_beginning() S_find_beginning(aTHX) -#define forbid_setid(a) S_forbid_setid(aTHX_ a) +#define forbid_setid(a,b) S_forbid_setid(aTHX_ a,b) #define incpush(a,b,c,d,e) S_incpush(aTHX_ a,b,c,d,e) #define init_interp() S_init_interp(aTHX) #define init_ids() S_init_ids(aTHX) @@ -3195,9 +3353,9 @@ #define init_predump_symbols() S_init_predump_symbols(aTHX) #define my_exit_jump() S_my_exit_jump(aTHX) #define nuke_stacks() S_nuke_stacks(aTHX) -#define open_script(a,b,c) S_open_script(aTHX_ a,b,c) +#define open_script(a,b,c,d) S_open_script(aTHX_ a,b,c,d) #define usage(a) S_usage(aTHX_ a) -#define validate_suid(a,b) S_validate_suid(aTHX_ a,b) +#define validate_suid(a,b,c,d) S_validate_suid(aTHX_ a,b,c,d) #endif # if defined(IAMSUID) #ifdef PERL_CORE @@ -3207,8 +3365,6 @@ #ifdef PERL_CORE #define parse_body(a,b) S_parse_body(aTHX_ a,b) #define run_body(a) S_run_body(aTHX_ a) -#define call_body(a,b) S_call_body(aTHX_ a,b) -#define call_list_body(a) S_call_list_body(aTHX_ a) #define incpush_if_exists(a) S_incpush_if_exists(aTHX_ a) #endif #endif @@ -3251,7 +3407,7 @@ #define doeval(a,b,c,d) S_doeval(aTHX_ a,b,c,d) #define check_type_and_open(a,b) S_check_type_and_open(aTHX_ a,b) #define doopen_pm(a,b) S_doopen_pm(aTHX_ a,b) -#define path_is_absolute(a) S_path_is_absolute(aTHX_ a) +#define path_is_absolute S_path_is_absolute #define run_user_filter(a,b,c) S_run_user_filter(aTHX_ a,b,c) #define make_matcher(a) S_make_matcher(aTHX_ a) #define matcher_matches_sv(a,b) S_matcher_matches_sv(aTHX_ a,b) @@ -3289,6 +3445,9 @@ #define dooneliner(a,b) S_dooneliner(aTHX_ a,b) #endif # endif +#ifdef PERL_CORE +#define space_join_names_mortal(a) S_space_join_names_mortal(aTHX_ a) +#endif #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT) #if defined(PERL_CORE) || defined(PERL_EXT) @@ -3298,31 +3457,31 @@ #define regbranch(a,b,c) S_regbranch(aTHX_ a,b,c) #define reguni(a,b,c,d) S_reguni(aTHX_ a,b,c,d) #define regclass(a) S_regclass(aTHX_ a) -#define regcurly(a) S_regcurly(aTHX_ a) +#define regcurly S_regcurly #define reg_node(a,b) S_reg_node(aTHX_ a,b) #define regpiece(a,b) S_regpiece(aTHX_ a,b) #define reginsert(a,b,c) S_reginsert(aTHX_ a,b,c) #define regoptail(a,b,c) S_regoptail(aTHX_ a,b,c) #define regtail(a,b,c) S_regtail(aTHX_ a,b,c) -#define regwhite(a,b) S_regwhite(aTHX_ a,b) +#define regwhite S_regwhite #define nextchar(a) S_nextchar(aTHX_ a) #endif # ifdef DEBUGGING #if defined(PERL_CORE) || defined(PERL_EXT) -#define dumpuntil(a,b,c,d,e) S_dumpuntil(aTHX_ a,b,c,d,e) +#define dumpuntil(a,b,c,d,e,f) S_dumpuntil(aTHX_ a,b,c,d,e,f) #define put_byte(a,b) S_put_byte(aTHX_ a,b) #endif # endif #if defined(PERL_CORE) || defined(PERL_EXT) #define scan_commit(a,b) S_scan_commit(aTHX_ a,b) -#define cl_anything(a,b) S_cl_anything(aTHX_ a,b) -#define cl_is_anything(a) S_cl_is_anything(aTHX_ a) -#define cl_init(a,b) S_cl_init(aTHX_ a,b) -#define cl_init_zero(a,b) S_cl_init_zero(aTHX_ a,b) -#define cl_and(a,b) S_cl_and(aTHX_ a,b) -#define cl_or(a,b,c) S_cl_or(aTHX_ a,b,c) +#define cl_anything S_cl_anything +#define cl_is_anything S_cl_is_anything +#define cl_init S_cl_init +#define cl_init_zero S_cl_init_zero +#define cl_and S_cl_and +#define cl_or S_cl_or #define study_chunk(a,b,c,d,e,f,g) S_study_chunk(aTHX_ a,b,c,d,e,f,g) -#define add_data(a,b,c) S_add_data(aTHX_ a,b,c) +#define add_data S_add_data #endif #ifdef PERL_CORE #endif @@ -3336,19 +3495,14 @@ #endif #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT) #if defined(PERL_CORE) || defined(PERL_EXT) -#define regmatch(a) S_regmatch(aTHX_ a) -#define regrepeat(a,b) S_regrepeat(aTHX_ a,b) -#define regrepeat_hard(a,b,c) S_regrepeat_hard(aTHX_ a,b,c) +#define regmatch(a,b) S_regmatch(aTHX_ a,b) +#define regrepeat(a,b,c) S_regrepeat(aTHX_ a,b,c) #define regtry(a,b) S_regtry(aTHX_ a,b) -#define reginclass(a,b,c,d) S_reginclass(aTHX_ a,b,c,d) +#define reginclass(a,b,c,d,e) S_reginclass(aTHX_ a,b,c,d,e) #define regcppush(a) S_regcppush(aTHX_ a) -#define regcppop() S_regcppop(aTHX) -#define regcp_set_to(a) S_regcp_set_to(aTHX_ a) -#define cache_re(a) S_cache_re(aTHX_ a) -#define reghop(a,b) S_reghop(aTHX_ a,b) -#define reghop3(a,b,c) S_reghop3(aTHX_ a,b,c) -#define reghopmaybe(a,b) S_reghopmaybe(aTHX_ a,b) -#define reghopmaybe3(a,b,c) S_reghopmaybe3(aTHX_ a,b,c) +#define regcppop(a) S_regcppop(aTHX_ a) +#define reghop3 S_reghop3 +#define reghopmaybe3 S_reghopmaybe3 #define find_byclass(a,b,c,d,e) S_find_byclass(aTHX_ a,b,c,d,e) #define to_utf8_substr(a) S_to_utf8_substr(aTHX_ a) #define to_byte_substr(a) S_to_byte_substr(aTHX_ a) @@ -3359,7 +3513,9 @@ #define deb_curcv(a) S_deb_curcv(aTHX_ a) #define debprof(a) S_debprof(aTHX_ a) #define sequence(a) S_sequence(aTHX_ a) +#define sequence_tail(a) S_sequence_tail(aTHX_ a) #define sequence_num(a) S_sequence_num(aTHX_ a) +#define pm_description(a) S_pm_description(aTHX_ a) #endif #endif #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT) @@ -3398,15 +3554,36 @@ #define expect_number(a) S_expect_number(aTHX_ a) #endif #ifdef PERL_CORE -#define utf8_mg_pos(a,b,c,d,e,f,g,h,i) S_utf8_mg_pos(aTHX_ a,b,c,d,e,f,g,h,i) -#define utf8_mg_pos_init(a,b,c,d,e,f,g) S_utf8_mg_pos_init(aTHX_ a,b,c,d,e,f,g) +#define sv_pos_u2b_forwards S_sv_pos_u2b_forwards +#define sv_pos_u2b_midway S_sv_pos_u2b_midway +#define sv_pos_u2b_cached(a,b,c,d,e,f,g) S_sv_pos_u2b_cached(aTHX_ a,b,c,d,e,f,g) +#define utf8_mg_pos_cache_update(a,b,c,d,e) S_utf8_mg_pos_cache_update(aTHX_ a,b,c,d,e) +#define sv_pos_b2u_forwards(a,b) S_sv_pos_b2u_forwards(aTHX_ a,b) +#define sv_pos_b2u_midway(a,b,c,d) S_sv_pos_b2u_midway(aTHX_ a,b,c,d) #define stringify_regexp(a,b,c) S_stringify_regexp(aTHX_ a,b,c) #define F0convert S_F0convert #endif -#if defined(PERL_OLD_COPY_ON_WRITE) +# if defined(PERL_OLD_COPY_ON_WRITE) #ifdef PERL_CORE #define sv_release_COW(a,b,c,d) S_sv_release_COW(aTHX_ a,b,c,d) #endif +# endif +#ifdef PERL_CORE +#define more_sv() S_more_sv(aTHX) +#define more_bodies(a) S_more_bodies(aTHX_ a) +#define sv_2iuv_common(a) S_sv_2iuv_common(aTHX_ a) +#define glob_assign_glob(a,b,c) S_glob_assign_glob(aTHX_ a,b,c) +#define glob_assign_ref(a,b) S_glob_assign_ref(aTHX_ a,b) +#endif +# if defined(USE_ITHREADS) +#ifdef PERL_CORE +#define ptr_table_find S_ptr_table_find +#endif +# endif +#ifdef PERL_CORE +#define find_hash_subscript(a,b) S_find_hash_subscript(aTHX_ a,b) +#define find_array_subscript(a,b) S_find_array_subscript(aTHX_ a,b) +#define find_uninit_var(a,b,c) S_find_uninit_var(aTHX_ a,b,c) #endif #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) @@ -3478,7 +3655,7 @@ #define closest_cop(a,b) S_closest_cop(aTHX_ a,b) #define mess_alloc() S_mess_alloc(aTHX) #define vdie_croak_common(a,b,c,d) S_vdie_croak_common(aTHX_ a,b,c,d) -#define vdie_common(a,b,c) S_vdie_common(aTHX_ a,b,c) +#define vdie_common(a,b,c,d) S_vdie_common(aTHX_ a,b,c,d) #define write_no_mem() S_write_no_mem(aTHX) #endif #endif @@ -3489,7 +3666,7 @@ #endif #if defined(PERL_IN_UTF8_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define is_utf8_char_slow(a,b) S_is_utf8_char_slow(aTHX_ a,b) +#define is_utf8_char_slow S_is_utf8_char_slow #define is_utf8_common(a,b,c) S_is_utf8_common(aTHX_ a,b,c) #define swash_get(a,b,c) S_swash_get(aTHX_ a,b,c) #endif @@ -3542,7 +3719,7 @@ #ifdef PERL_CORE #define pad_new(a) Perl_pad_new(aTHX_ a) #define pad_undef(a) Perl_pad_undef(aTHX_ a) -#define pad_add_name(a,b,c,d) Perl_pad_add_name(aTHX_ a,b,c,d) +#define pad_add_name(a,b,c,d,e) Perl_pad_add_name(aTHX_ a,b,c,d,e) #define pad_add_anon(a,b) Perl_pad_add_anon(aTHX_ a,b) #define pad_check_dup(a,b,c) Perl_pad_check_dup(aTHX_ a,b,c) #endif @@ -3735,6 +3912,8 @@ #ifdef PERL_DONT_CREATE_GVSV #define gv_SVadd(a) Perl_gv_SVadd(aTHX_ a) #endif +#if defined(PERL_CORE) || defined(PERL_EXT) +#endif #ifdef PERL_CORE #define offer_nice_chunk(a,b) Perl_offer_nice_chunk(aTHX_ a,b) #endif @@ -3745,8 +3924,59 @@ #endif #ifdef PERL_IMPLICIT_CONTEXT #endif +#ifdef PERL_MAD +#ifdef PERL_CORE +#define pad_peg Perl_pad_peg +#endif +#if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#endif +#endif +#ifdef PERL_CORE +#define xmldump_vindent(a,b,c,d) Perl_xmldump_vindent(aTHX_ a,b,c,d) +#define xmldump_all() Perl_xmldump_all(aTHX) +#define xmldump_packsubs(a) Perl_xmldump_packsubs(aTHX_ a) +#define xmldump_sub(a) Perl_xmldump_sub(aTHX_ a) +#define xmldump_form(a) Perl_xmldump_form(aTHX_ a) +#define xmldump_eval() Perl_xmldump_eval(aTHX) +#define sv_catxmlsv(a,b) Perl_sv_catxmlsv(aTHX_ a,b) +#define sv_catxmlpvn(a,b,c,d) Perl_sv_catxmlpvn(aTHX_ a,b,c,d) +#define sv_xmlpeek(a) Perl_sv_xmlpeek(aTHX_ a) +#define do_pmop_xmldump(a,b,c) Perl_do_pmop_xmldump(aTHX_ a,b,c) +#define pmop_xmldump(a) Perl_pmop_xmldump(aTHX_ a) +#define do_op_xmldump(a,b,c) Perl_do_op_xmldump(aTHX_ a,b,c) +#define op_xmldump(a) Perl_op_xmldump(aTHX_ a) +#endif +#ifdef PERL_CORE +#define newTOKEN(a,b,c) Perl_newTOKEN(aTHX_ a,b,c) +#define token_free(a) Perl_token_free(aTHX_ a) +#define token_getmad(a,b,c) Perl_token_getmad(aTHX_ a,b,c) +#define op_getmad_weak(a,b,c) Perl_op_getmad_weak(aTHX_ a,b,c) +#define op_getmad(a,b,c) Perl_op_getmad(aTHX_ a,b,c) +#define prepend_madprops(a,b,c) Perl_prepend_madprops(aTHX_ a,b,c) +#define append_madprops(a,b,c) Perl_append_madprops(aTHX_ a,b,c) +#define addmad(a,b,c) Perl_addmad(aTHX_ a,b,c) +#define newMADsv(a,b) Perl_newMADsv(aTHX_ a,b) +#define newMADPROP(a,b,c,d) Perl_newMADPROP(aTHX_ a,b,c,d) +#define mad_free(a) Perl_mad_free(aTHX_ a) +#endif +# if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define skipspace0(a) S_skipspace0(aTHX_ a) +#define skipspace1(a) S_skipspace1(aTHX_ a) +#define skipspace2(a,b) S_skipspace2(aTHX_ a,b) +#define start_force(a) S_start_force(aTHX_ a) +#define curmad(a,b) S_curmad(aTHX_ a,b) +#endif +# endif +#ifdef PERL_CORE +#define madlex() Perl_madlex(aTHX) +#define madparse() Perl_madparse(aTHX) +#endif +#endif #define ck_anoncode(a) Perl_ck_anoncode(aTHX_ a) #define ck_bitop(a) Perl_ck_bitop(aTHX_ a) +#define ck_chdir(a) Perl_ck_chdir(aTHX_ a) #define ck_concat(a) Perl_ck_concat(aTHX_ a) #define ck_defined(a) Perl_ck_defined(aTHX_ a) #define ck_delete(a) Perl_ck_delete(aTHX_ a) @@ -4156,7 +4386,7 @@ #if !defined(PERL_CORE) # define sv_setptrobj(rv,ptr,name) sv_setref_iv(rv,name,PTR2IV(ptr)) -# define sv_setptrref(rv,ptr) sv_setref_iv(rv,Nullch,PTR2IV(ptr)) +# define sv_setptrref(rv,ptr) sv_setref_iv(rv,NULL,PTR2IV(ptr)) #endif #if !defined(PERL_CORE) && !defined(PERL_NOCOMPAT)