X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/2a75250ad0daba19f395626b2b1174bd43ecddc0..922adc668bd1a29348ad2aeea3363752c3bab137:/embed.h diff --git a/embed.h b/embed.h index cfb43fe..40d24c5 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, 2006, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 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. @@ -117,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 @@ -187,6 +188,11 @@ #ifdef PERL_CORE #define do_execfree Perl_do_execfree #endif +#ifdef PERL_IN_DOIO_C +#ifdef PERL_CORE +#define exec_failed S_exec_failed +#endif +#endif #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) #ifdef PERL_CORE #define do_ipcctl Perl_do_ipcctl @@ -541,6 +547,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 @@ -673,12 +680,20 @@ #define regclass_swash Perl_regclass_swash #define pregexec Perl_pregexec #define pregfree Perl_pregfree +#define regfree_internal Perl_regfree_internal +#define reg_stringify Perl_reg_stringify +#if defined(USE_ITHREADS) +#define regdupe_internal Perl_regdupe_internal +#endif #define pregcomp Perl_pregcomp +#define re_compile Perl_re_compile #define re_intuit_start Perl_re_intuit_start #define re_intuit_string Perl_re_intuit_string #define regexec_flags Perl_regexec_flags #define regnext Perl_regnext #if defined(PERL_CORE) || defined(PERL_EXT) +#define reg_named_buff_get Perl_reg_named_buff_get +#define reg_numbered_buff_get Perl_reg_numbered_buff_get #define regprop Perl_regprop #endif #define repeatcpy Perl_repeatcpy @@ -792,7 +807,8 @@ #define sv_2io Perl_sv_2io #ifdef PERL_IN_SV_C #ifdef PERL_CORE -#define glob_2inpuv S_glob_2inpuv +#define glob_2number S_glob_2number +#define glob_2pv S_glob_2pv #endif #endif #define sv_2iv_flags Perl_sv_2iv_flags @@ -834,6 +850,7 @@ #define sv_dec Perl_sv_dec #define sv_dump Perl_sv_dump #define sv_derived_from Perl_sv_derived_from +#define sv_does Perl_sv_does #define sv_eq Perl_sv_eq #define sv_free Perl_sv_free #ifdef PERL_CORE @@ -881,7 +898,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 @@ -900,7 +917,7 @@ #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 @@ -960,6 +977,8 @@ #define yyerror Perl_yyerror #define yylex Perl_yylex #define yyparse Perl_yyparse +#define parser_free Perl_parser_free +#define parser_dup Perl_parser_dup #define yywarn Perl_yywarn #endif #if defined(MYMALLOC) @@ -989,9 +1008,10 @@ #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 pv_escape Perl_pv_escape +#define pv_pretty Perl_pv_pretty #define dump_indent Perl_dump_indent #define dump_vindent Perl_dump_vindent #define do_gv_dump Perl_do_gv_dump @@ -1037,12 +1057,14 @@ #define mg_dup Perl_mg_dup #define sv_dup Perl_sv_dup #define rvpv_dup Perl_rvpv_dup +#endif #define ptr_table_new Perl_ptr_table_new #define ptr_table_fetch Perl_ptr_table_fetch #define ptr_table_store Perl_ptr_table_store #define ptr_table_split Perl_ptr_table_split #define ptr_table_clear Perl_ptr_table_clear #define ptr_table_free Perl_ptr_table_free +#if defined(USE_ITHREADS) # if defined(HAVE_INTERP_INTERN) #define sys_intern_dup Perl_sys_intern_dup # endif @@ -1077,7 +1099,7 @@ #if defined(PERL_IN_GV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define gv_init_sv S_gv_init_sv -#define require_errno S_require_errno +#define require_tie_mod S_require_tie_mod #endif #endif #if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT) @@ -1089,11 +1111,13 @@ #define hv_magic_check S_hv_magic_check #define unshare_hek_or_pvn S_unshare_hek_or_pvn #define share_hek_flags S_share_hek_flags +#define hv_magic_uvar_xkey S_hv_magic_uvar_xkey #define hv_notallowed S_hv_notallowed #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 +#define refcounted_he_value S_refcounted_he_value #endif #endif #if defined(PERL_IN_MG_C) || defined(PERL_DECL_PROT) @@ -1138,7 +1162,6 @@ #define ck_rfun Perl_ck_rfun #define ck_rvconst Perl_ck_rvconst #define ck_sassign Perl_ck_sassign -#define ck_say Perl_ck_say #define ck_select Perl_ck_select #define ck_shift Perl_ck_shift #define ck_sort Perl_ck_sort @@ -1203,8 +1226,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 @@ -1227,6 +1248,7 @@ #define need_utf8 S_need_utf8 #define first_symbol S_first_symbol #define sv_exp_grow S_sv_exp_grow +#define bytes_to_uni S_bytes_to_uni #endif #endif #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) @@ -1258,7 +1280,6 @@ #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define do_oddball S_do_oddball -#define get_db_sub S_get_db_sub #define method_common S_method_common #endif #endif @@ -1273,6 +1294,7 @@ #define sortcv S_sortcv #define sortcv_xsub S_sortcv_xsub #define sortcv_stacked S_sortcv_stacked +#define qsortsvu S_qsortsvu #endif #endif #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT) @@ -1299,20 +1321,15 @@ #define regclass S_regclass #define regcurly S_regcurly #define reg_node S_reg_node +#define reg_recode S_reg_recode #define regpiece S_regpiece +#define reg_namedseq S_reg_namedseq #define reginsert S_reginsert -#define regoptail S_regoptail #define regtail S_regtail +#define reg_scan_name S_reg_scan_name +#define join_exact S_join_exact #define regwhite S_regwhite #define nextchar S_nextchar -#endif -# ifdef DEBUGGING -#if defined(PERL_CORE) || defined(PERL_EXT) -#define dumpuntil S_dumpuntil -#define put_byte S_put_byte -#endif -# endif -#if defined(PERL_CORE) || defined(PERL_EXT) #define scan_commit S_scan_commit #define cl_anything S_cl_anything #define cl_is_anything S_cl_is_anything @@ -1329,10 +1346,19 @@ #if defined(PERL_CORE) || defined(PERL_EXT) #define regpposixcc S_regpposixcc #define checkposixcc S_checkposixcc +#define make_trie S_make_trie +#define make_trie_failtable S_make_trie_failtable #endif +# ifdef DEBUGGING #if defined(PERL_CORE) || defined(PERL_EXT) -#define make_trie S_make_trie +#define dumpuntil S_dumpuntil +#define put_byte S_put_byte +#define dump_trie S_dump_trie +#define dump_trie_interim_list S_dump_trie_interim_list +#define dump_trie_interim_table S_dump_trie_interim_table +#define regtail_study S_regtail_study #endif +# endif #endif #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT) #if defined(PERL_CORE) || defined(PERL_EXT) @@ -1343,18 +1369,34 @@ #define regcppush S_regcppush #define regcppop S_regcppop #define reghop3 S_reghop3 +#endif +#ifdef XXX_dmq +#if defined(PERL_CORE) || defined(PERL_EXT) +#define reghop4 S_reghop4 +#endif +#endif +#if defined(PERL_CORE) || defined(PERL_EXT) #define reghopmaybe3 S_reghopmaybe3 #define find_byclass S_find_byclass #define to_utf8_substr S_to_utf8_substr #define to_byte_substr S_to_byte_substr +#define reg_check_named_buff_matched S_reg_check_named_buff_matched #endif +# ifdef DEBUGGING +#if defined(PERL_CORE) || defined(PERL_EXT) +#define dump_exec_pos S_dump_exec_pos +#define debug_start_match S_debug_start_match +#endif +# endif #endif #if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #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) @@ -1393,9 +1435,7 @@ #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) @@ -1409,17 +1449,8 @@ #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) #ifdef PERL_CORE @@ -1428,7 +1459,7 @@ #define force_version S_force_version #define force_word S_force_word #define tokeq S_tokeq -#define pending_ident S_pending_ident +#define readpipe_override S_readpipe_override #define scan_const S_scan_const #define scan_formline S_scan_formline #define scan_heredoc S_scan_heredoc @@ -1439,6 +1470,8 @@ #define scan_subst S_scan_subst #define scan_trans S_scan_trans #define scan_word S_scan_word +#define update_debugger_info_pv S_update_debugger_info_pv +#define update_debugger_info_sv S_update_debugger_info_sv #define skipspace S_skipspace #define swallow_bom S_swallow_bom #define checkcomma S_checkcomma @@ -1470,6 +1503,7 @@ # if defined(DEBUGGING) #ifdef PERL_CORE #define tokereport S_tokereport +#define printbuf S_printbuf #endif # endif #endif @@ -1601,8 +1635,10 @@ #ifdef PERL_CORE #define magic_scalarpack Perl_magic_scalarpack #endif -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #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 @@ -1752,6 +1788,13 @@ #define my_clearenv Perl_my_clearenv #endif #ifdef PERL_IMPLICIT_CONTEXT +#ifdef PERL_GLOBAL_STRUCT_PRIVATE +#else +#endif +#endif +#ifndef HAS_STRLCAT +#endif +#ifndef HAS_STRLCPY #endif #ifdef PERL_MAD #ifdef PERL_CORE @@ -1836,7 +1879,6 @@ #define ck_rfun Perl_ck_rfun #define ck_rvconst Perl_ck_rvconst #define ck_sassign Perl_ck_sassign -#define ck_say Perl_ck_say #define ck_select Perl_ck_select #define ck_shift Perl_ck_shift #define ck_smartmatch Perl_ck_smartmatch @@ -2181,7 +2223,6 @@ #define pp_syswrite Perl_pp_syswrite #define pp_tell Perl_pp_tell #define pp_telldir Perl_pp_telldir -#define pp_threadsv Perl_pp_threadsv #define pp_tie Perl_pp_tie #define pp_tied Perl_pp_tied #define pp_time Perl_pp_time @@ -2281,6 +2322,7 @@ #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) @@ -2351,6 +2393,11 @@ #ifdef PERL_CORE #define do_execfree() Perl_do_execfree(aTHX) #endif +#ifdef PERL_IN_DOIO_C +#ifdef PERL_CORE +#define exec_failed(a,b,c) S_exec_failed(aTHX_ a,b,c) +#endif +#endif #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) #ifdef PERL_CORE #define do_ipcctl(a,b,c) Perl_do_ipcctl(aTHX_ a,b,c) @@ -2413,6 +2460,8 @@ #define getenv_len(a,b) Perl_getenv_len(aTHX_ a,b) #endif #endif +#ifdef PERL_CORE +#endif #define gp_free(a) Perl_gp_free(aTHX_ a) #define gp_ref(a) Perl_gp_ref(aTHX_ a) #define gv_AVadd(a) Perl_gv_AVadd(aTHX_ a) @@ -2429,6 +2478,8 @@ #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) @@ -2452,8 +2503,12 @@ #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) +#if defined(PERL_CORE) || defined(PERL_EXT) +#endif #ifdef PERL_CORE #endif +#if defined(PERL_CORE) || defined(PERL_EXT) +#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) @@ -2534,7 +2589,7 @@ #define is_utf8_mark(a) Perl_is_utf8_mark(aTHX_ a) #ifdef PERL_CORE #define jmaybe(a) Perl_jmaybe(aTHX_ a) -#define keyword(a,b) Perl_keyword(aTHX_ a,b) +#define keyword(a,b,c) Perl_keyword(aTHX_ a,b,c) #endif #define leave_scope(a) Perl_leave_scope(aTHX_ a) #ifdef PERL_CORE @@ -2706,6 +2761,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) @@ -2833,16 +2889,24 @@ #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 regfree_internal(a) Perl_regfree_internal(aTHX_ a) +#define reg_stringify(a,b,c,d) Perl_reg_stringify(aTHX_ a,b,c,d) +#if defined(USE_ITHREADS) +#define regdupe_internal(a,b) Perl_regdupe_internal(aTHX_ a,b) +#endif #define pregcomp(a,b,c) Perl_pregcomp(aTHX_ a,b,c) +#define re_compile(a,b,c) Perl_re_compile(aTHX_ a,b,c) #define re_intuit_start(a,b,c,d,e,f) Perl_re_intuit_start(aTHX_ a,b,c,d,e,f) #define re_intuit_string(a) Perl_re_intuit_string(aTHX_ a) #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 reg_named_buff_get(a,b,c) Perl_reg_named_buff_get(aTHX_ a,b,c) +#define reg_numbered_buff_get(a,b,c,d) Perl_reg_numbered_buff_get(aTHX_ a,b,c,d) +#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) @@ -2953,7 +3017,8 @@ #define sv_2io(a) Perl_sv_2io(aTHX_ a) #ifdef PERL_IN_SV_C #ifdef PERL_CORE -#define glob_2inpuv(a,b,c) S_glob_2inpuv(aTHX_ a,b,c) +#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) @@ -2994,6 +3059,7 @@ #define sv_dec(a) Perl_sv_dec(aTHX_ a) #define sv_dump(a) Perl_sv_dump(aTHX_ a) #define sv_derived_from(a,b) Perl_sv_derived_from(aTHX_ a,b) +#define sv_does(a,b) Perl_sv_does(aTHX_ a,b) #define sv_eq(a,b) Perl_sv_eq(aTHX_ a,b) #define sv_free(a) Perl_sv_free(aTHX_ a) #ifdef PERL_CORE @@ -3040,7 +3106,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) @@ -3059,7 +3125,7 @@ #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 @@ -3117,6 +3183,8 @@ #define yyerror(a) Perl_yyerror(aTHX_ a) #define yylex() Perl_yylex(aTHX) #define yyparse() Perl_yyparse(aTHX) +#define parser_free(a) Perl_parser_free(aTHX_ a) +#define parser_dup(a,b) Perl_parser_dup(aTHX_ a,b) #define yywarn(a) Perl_yywarn(aTHX_ a) #endif #if defined(MYMALLOC) @@ -3144,9 +3212,10 @@ #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 pv_escape(a,b,c,d,e,f) Perl_pv_escape(aTHX_ a,b,c,d,e,f) +#define pv_pretty(a,b,c,d,e,f,g) Perl_pv_pretty(aTHX_ a,b,c,d,e,f,g) #define dump_vindent(a,b,c,d) Perl_dump_vindent(aTHX_ a,b,c,d) #define do_gv_dump(a,b,c,d) Perl_do_gv_dump(aTHX_ a,b,c,d) #define do_gvgv_dump(a,b,c,d) Perl_do_gvgv_dump(aTHX_ a,b,c,d) @@ -3191,12 +3260,14 @@ #define mg_dup(a,b) Perl_mg_dup(aTHX_ a,b) #define sv_dup(a,b) Perl_sv_dup(aTHX_ a,b) #define rvpv_dup(a,b,c) Perl_rvpv_dup(aTHX_ a,b,c) +#endif #define ptr_table_new() Perl_ptr_table_new(aTHX) #define ptr_table_fetch(a,b) Perl_ptr_table_fetch(aTHX_ a,b) #define ptr_table_store(a,b,c) Perl_ptr_table_store(aTHX_ a,b,c) #define ptr_table_split(a) Perl_ptr_table_split(aTHX_ a) #define ptr_table_clear(a) Perl_ptr_table_clear(aTHX_ a) #define ptr_table_free(a) Perl_ptr_table_free(aTHX_ a) +#if defined(USE_ITHREADS) # if defined(HAVE_INTERP_INTERN) #define sys_intern_dup(a,b) Perl_sys_intern_dup(aTHX_ a,b) # endif @@ -3231,7 +3302,7 @@ #if defined(PERL_IN_GV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define gv_init_sv(a,b) S_gv_init_sv(aTHX_ a,b) -#define require_errno(a) S_require_errno(aTHX_ a) +#define require_tie_mod(a,b,c,d,e) S_require_tie_mod(aTHX_ a,b,c,d,e) #endif #endif #ifdef PERL_CORE @@ -3245,11 +3316,13 @@ #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_magic_uvar_xkey(a,b,c) S_hv_magic_uvar_xkey(aTHX_ a,b,c) #define hv_notallowed(a,b,c,d) S_hv_notallowed(aTHX_ a,b,c,d) #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) +#define refcounted_he_value(a) S_refcounted_he_value(aTHX_ a) #endif #endif #if defined(PERL_IN_MG_C) || defined(PERL_DECL_PROT) @@ -3294,7 +3367,6 @@ #define ck_rfun(a) Perl_ck_rfun(aTHX_ a) #define ck_rvconst(a) Perl_ck_rvconst(aTHX_ a) #define ck_sassign(a) Perl_ck_sassign(aTHX_ a) -#define ck_say(a) Perl_ck_say(aTHX_ a) #define ck_select(a) Perl_ck_select(aTHX_ a) #define ck_shift(a) Perl_ck_shift(aTHX_ a) #define ck_sort(a) Perl_ck_sort(aTHX_ a) @@ -3359,8 +3431,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 @@ -3383,6 +3453,7 @@ #define need_utf8 S_need_utf8 #define first_symbol S_first_symbol #define sv_exp_grow(a,b) S_sv_exp_grow(aTHX_ a,b) +#define bytes_to_uni S_bytes_to_uni #endif #endif #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) @@ -3414,7 +3485,6 @@ #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define do_oddball(a,b,c) S_do_oddball(aTHX_ a,b,c) -#define get_db_sub(a,b) S_get_db_sub(aTHX_ a,b) #define method_common(a,b) S_method_common(aTHX_ a,b) #endif #endif @@ -3429,6 +3499,7 @@ #define sortcv(a,b) S_sortcv(aTHX_ a,b) #define sortcv_xsub(a,b) S_sortcv_xsub(aTHX_ a,b) #define sortcv_stacked(a,b) S_sortcv_stacked(aTHX_ a,b) +#define qsortsvu(a,b,c) S_qsortsvu(aTHX_ a,b,c) #endif #endif #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT) @@ -3447,36 +3518,31 @@ #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT) #if defined(PERL_CORE) || defined(PERL_EXT) -#define reg(a,b,c) S_reg(aTHX_ a,b,c) +#define reg(a,b,c,d) S_reg(aTHX_ a,b,c,d) #define reganode(a,b,c) S_reganode(aTHX_ a,b,c) -#define regatom(a,b) S_regatom(aTHX_ a,b) -#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 regatom(a,b,c) S_regatom(aTHX_ a,b,c) +#define regbranch(a,b,c,d) S_regbranch(aTHX_ a,b,c,d) +#define reguni(a,b,c) S_reguni(aTHX_ a,b,c) +#define regclass(a,b) S_regclass(aTHX_ a,b) #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 reg_recode(a,b) S_reg_recode(aTHX_ a,b) +#define regpiece(a,b,c) S_regpiece(aTHX_ a,b,c) +#define reg_namedseq(a,b) S_reg_namedseq(aTHX_ a,b) +#define reginsert(a,b,c,d) S_reginsert(aTHX_ a,b,c,d) +#define regtail(a,b,c,d) S_regtail(aTHX_ a,b,c,d) +#define reg_scan_name(a,b) S_reg_scan_name(aTHX_ a,b) +#define join_exact(a,b,c,d,e,f) S_join_exact(aTHX_ a,b,c,d,e,f) #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,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 scan_commit(a,b,c,d) S_scan_commit(aTHX_ a,b,c,d) #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 study_chunk(a,b,c,d,e,f,g,h,i,j,k) S_study_chunk(aTHX_ a,b,c,d,e,f,g,h,i,j,k) #define add_data S_add_data #endif #ifdef PERL_CORE @@ -3484,32 +3550,57 @@ #if defined(PERL_CORE) || defined(PERL_EXT) #define regpposixcc(a,b) S_regpposixcc(aTHX_ a,b) #define checkposixcc(a) S_checkposixcc(aTHX_ a) +#define make_trie(a,b,c,d,e,f,g,h) S_make_trie(aTHX_ a,b,c,d,e,f,g,h) +#define make_trie_failtable(a,b,c,d) S_make_trie_failtable(aTHX_ a,b,c,d) #endif +# ifdef DEBUGGING #if defined(PERL_CORE) || defined(PERL_EXT) -#define make_trie(a,b,c,d,e,f) S_make_trie(aTHX_ a,b,c,d,e,f) +#define dumpuntil(a,b,c,d,e,f,g,h) S_dumpuntil(aTHX_ a,b,c,d,e,f,g,h) +#define put_byte(a,b) S_put_byte(aTHX_ a,b) +#define dump_trie(a,b,c,d) S_dump_trie(aTHX_ a,b,c,d) +#define dump_trie_interim_list(a,b,c,d,e) S_dump_trie_interim_list(aTHX_ a,b,c,d,e) +#define dump_trie_interim_table(a,b,c,d,e) S_dump_trie_interim_table(aTHX_ a,b,c,d,e) +#define regtail_study(a,b,c,d) S_regtail_study(aTHX_ a,b,c,d) #endif +# endif #endif #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT) #if defined(PERL_CORE) || defined(PERL_EXT) #define regmatch(a,b) S_regmatch(aTHX_ a,b) -#define regrepeat(a,b) S_regrepeat(aTHX_ a,b) +#define regrepeat(a,b,c,d) S_regrepeat(aTHX_ a,b,c,d) #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(a) S_regcppop(aTHX_ a) #define reghop3 S_reghop3 +#endif +#ifdef XXX_dmq +#if defined(PERL_CORE) || defined(PERL_EXT) +#define reghop4 S_reghop4 +#endif +#endif +#if defined(PERL_CORE) || defined(PERL_EXT) #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) +#define reg_check_named_buff_matched(a,b) S_reg_check_named_buff_matched(aTHX_ a,b) #endif +# ifdef DEBUGGING +#if defined(PERL_CORE) || defined(PERL_EXT) +#define dump_exec_pos(a,b,c,d,e,f) S_dump_exec_pos(aTHX_ a,b,c,d,e,f) +#define debug_start_match(a,b,c,d,e) S_debug_start_match(aTHX_ a,b,c,d,e) +#endif +# endif #endif #if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #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) @@ -3548,13 +3639,11 @@ #define expect_number(a) S_expect_number(aTHX_ a) #endif #ifdef PERL_CORE -#define sv_pos_u2b_forwards(a,b,c) S_sv_pos_u2b_forwards(aTHX_ a,b,c) -#define sv_pos_u2b_midway(a,b,c,d) S_sv_pos_u2b_midway(aTHX_ a,b,c,d) +#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) @@ -3568,17 +3657,8 @@ #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) #ifdef PERL_CORE @@ -3587,7 +3667,7 @@ #define force_version(a,b) S_force_version(aTHX_ a,b) #define force_word(a,b,c,d,e) S_force_word(aTHX_ a,b,c,d,e) #define tokeq(a) S_tokeq(aTHX_ a) -#define pending_ident() S_pending_ident(aTHX) +#define readpipe_override() S_readpipe_override(aTHX) #define scan_const(a) S_scan_const(aTHX_ a) #define scan_formline(a) S_scan_formline(aTHX_ a) #define scan_heredoc(a) S_scan_heredoc(aTHX_ a) @@ -3598,6 +3678,8 @@ #define scan_subst(a) S_scan_subst(aTHX_ a) #define scan_trans(a) S_scan_trans(aTHX_ a) #define scan_word(a,b,c,d,e) S_scan_word(aTHX_ a,b,c,d,e) +#define update_debugger_info_pv(a,b) S_update_debugger_info_pv(aTHX_ a,b) +#define update_debugger_info_sv(a) S_update_debugger_info_sv(aTHX_ a) #define skipspace(a) S_skipspace(aTHX_ a) #define swallow_bom(a) S_swallow_bom(aTHX_ a) #define checkcomma(a,b,c) S_checkcomma(aTHX_ a,b,c) @@ -3629,6 +3711,7 @@ # if defined(DEBUGGING) #ifdef PERL_CORE #define tokereport(a) S_tokereport(aTHX_ a) +#define printbuf(a,b) S_printbuf(aTHX_ a,b) #endif # endif #endif @@ -3713,7 +3796,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 @@ -3764,8 +3847,10 @@ #ifdef PERL_CORE #define magic_scalarpack(a,b) Perl_magic_scalarpack(aTHX_ a,b) #endif -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #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 @@ -3906,6 +3991,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 @@ -3915,6 +4002,13 @@ #define my_clearenv() Perl_my_clearenv(aTHX) #endif #ifdef PERL_IMPLICIT_CONTEXT +#ifdef PERL_GLOBAL_STRUCT_PRIVATE +#else +#endif +#endif +#ifndef HAS_STRLCAT +#endif +#ifndef HAS_STRLCPY #endif #ifdef PERL_MAD #ifdef PERL_CORE @@ -3997,7 +4091,6 @@ #define ck_rfun(a) Perl_ck_rfun(aTHX_ a) #define ck_rvconst(a) Perl_ck_rvconst(aTHX_ a) #define ck_sassign(a) Perl_ck_sassign(aTHX_ a) -#define ck_say(a) Perl_ck_say(aTHX_ a) #define ck_select(a) Perl_ck_select(aTHX_ a) #define ck_shift(a) Perl_ck_shift(aTHX_ a) #define ck_smartmatch(a) Perl_ck_smartmatch(aTHX_ a) @@ -4342,7 +4435,6 @@ #define pp_syswrite() Perl_pp_syswrite(aTHX) #define pp_tell() Perl_pp_tell(aTHX) #define pp_telldir() Perl_pp_telldir(aTHX) -#define pp_threadsv() Perl_pp_threadsv(aTHX) #define pp_tie() Perl_pp_tie(aTHX) #define pp_tied() Perl_pp_tied(aTHX) #define pp_time() Perl_pp_time(aTHX)