diff options
| -rwxr-xr-x | embed.pl | 64 | ||||
| -rw-r--r-- | global.sym | 32 | ||||
| -rw-r--r-- | objXSUB.h | 128 | ||||
| -rw-r--r-- | perlapi.c | 230 | ||||
| -rwxr-xr-x | t/lib/thread.t | 2 | ||||
| -rw-r--r-- | win32/win32.c | 7 |
6 files changed, 429 insertions, 34 deletions
@@ -1376,7 +1376,7 @@ p |OP* |block_end |I32 floor|OP* seq Ap |I32 |block_gimme p |int |block_start |int full p |void |boot_core_UNIVERSAL -p |void |call_list |I32 oldscope|AV* av_list +Ap |void |call_list |I32 oldscope|AV* av_list p |bool |cando |Mode_t mode|Uid_t effective|Stat_t* statbufp Ap |U32 |cast_ulong |NV f Ap |I32 |cast_i32 |NV f @@ -1386,7 +1386,7 @@ Ap |UV |cast_uv |NV f Ap |I32 |my_chsize |int fd|Off_t length #endif #if defined(USE_THREADS) -p |MAGIC* |condpair_magic |SV *sv +Ap |MAGIC* |condpair_magic |SV *sv #endif p |OP* |convert |I32 optype|I32 flags|OP* o Afprd |void |croak |const char* pat|... @@ -1430,10 +1430,10 @@ Ap |I32 |debstackptrs Ap |char* |delimcpy |char* to|char* toend|char* from \ |char* fromend|int delim|I32* retlen p |void |deprecate |char* s -fp |OP* |die |const char* pat|... +Afp |OP* |die |const char* pat|... p |OP* |vdie |const char* pat|va_list* args p |OP* |die_where |char* message|STRLEN msglen -p |void |dounwind |I32 cxix +Ap |void |dounwind |I32 cxix p |bool |do_aexec |SV* really|SV** mark|SV** sp p |bool |do_aexec5 |SV* really|SV** mark|SV** sp|int fd|int flag Ap |int |do_binmode |PerlIO *fp|int iotype|int flag @@ -1551,7 +1551,7 @@ Ap |I32 |ibcmp |const char* a|const char* b|I32 len Ap |I32 |ibcmp_locale |const char* a|const char* b|I32 len p |bool |ingroup |Gid_t testgid|Uid_t effective p |void |init_debugger -p |void |init_stacks +Ap |void |init_stacks p |U32 |intro_my Ap |char* |instr |const char* big|const char* little p |bool |io_close |IO* io|bool not_implicit @@ -1607,7 +1607,7 @@ Ap |bool |is_utf8_xdigit |U8 *p Ap |bool |is_utf8_mark |U8 *p p |OP* |jmaybe |OP* arg p |I32 |keyword |char* d|I32 len -p |void |leave_scope |I32 base +Ap |void |leave_scope |I32 base p |void |lex_end p |void |lex_start |SV* line p |OP* |linklist |OP* o @@ -1683,7 +1683,7 @@ Apd |void |mg_magical |SV* sv Apd |int |mg_set |SV* sv Ap |I32 |mg_size |SV* sv p |OP* |mod |OP* o|I32 type -p |char* |moreswitches |char* s +Ap |char* |moreswitches |char* s p |OP* |my |OP* o Ap |NV |my_atof |const char *s #if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY) @@ -1766,12 +1766,12 @@ Ap |OP* |newUNOP |I32 type|I32 flags|OP* first Ap |OP* |newWHILEOP |I32 flags|I32 debuggable|LOOP* loop \ |I32 whileline|OP* expr|OP* block|OP* cont -p |PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems +Ap |PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems p |PerlIO*|nextargv |GV* gv Ap |char* |ninstr |const char* big|const char* bigend \ |const char* little|const char* lend p |OP* |oopsCV |OP* o -p |void |op_free |OP* arg +Ap |void |op_free |OP* arg p |void |package |OP* o p |PADOFFSET|pad_alloc |I32 optype|U32 tmptype p |PADOFFSET|pad_allocmy |char* name @@ -1779,7 +1779,7 @@ p |PADOFFSET|pad_findmy |char* name p |OP* |oopsAV |OP* o p |OP* |oopsHV |OP* o p |void |pad_leavemy |I32 fill -p |SV* |pad_sv |PADOFFSET po +Ap |SV* |pad_sv |PADOFFSET po p |void |pad_free |PADOFFSET po p |void |pad_reset p |void |pad_swipe |PADOFFSET po @@ -1806,8 +1806,8 @@ Apd |SV* |get_sv |const char* name|I32 create Apd |AV* |get_av |const char* name|I32 create Apd |HV* |get_hv |const char* name|I32 create Apd |CV* |get_cv |const char* name|I32 create -p |int |init_i18nl10n |int printwarn -p |int |init_i18nl14n |int printwarn +Ap |int |init_i18nl10n |int printwarn +Ap |int |init_i18nl14n |int printwarn Ap |void |new_collate |const char* newcoll Ap |void |new_ctype |const char* newctype Ap |void |new_numeric |const char* newcoll @@ -1816,7 +1816,7 @@ Ap |void |set_numeric_radix Ap |void |set_numeric_standard Apd |void |require_pv |const char* pv p |void |pidgone |Pid_t pid|int status -p |void |pmflag |U16* pmfl|int ch +Ap |void |pmflag |U16* pmfl|int ch p |OP* |pmruntime |OP* pm|OP* expr|OP* repl p |OP* |pmtrans |OP* o|OP* expr|OP* repl p |OP* |pop_return @@ -1830,18 +1830,18 @@ Ap |void |regdump |regexp* r p |I32 |pregexec |regexp* prog|char* stringarg \ |char* strend|char* strbeg|I32 minend \ |SV* screamer|U32 nosave -p |void |pregfree |struct regexp* r -p |regexp*|pregcomp |char* exp|char* xend|PMOP* pm -p |char* |re_intuit_start|regexp* prog|SV* sv|char* strpos \ +Ap |void |pregfree |struct regexp* r +Ap |regexp*|pregcomp |char* exp|char* xend|PMOP* pm +Ap |char* |re_intuit_start|regexp* prog|SV* sv|char* strpos \ |char* strend|U32 flags \ |struct re_scream_pos_data_s *data -p |SV* |re_intuit_string|regexp* prog -p |I32 |regexec_flags |regexp* prog|char* stringarg \ +Ap |SV* |re_intuit_string|regexp* prog +Ap |I32 |regexec_flags |regexp* prog|char* stringarg \ |char* strend|char* strbeg|I32 minend \ |SV* screamer|void* data|U32 flags -p |regnode*|regnext |regnode* p +Ap |regnode*|regnext |regnode* p p |void |regprop |SV* sv|regnode* o -p |void |repeatcpy |char* to|const char* from|I32 len|I32 count +Ap |void |repeatcpy |char* to|const char* from|I32 len|I32 count Ap |char* |rninstr |const char* big|const char* bigend \ |const char* little|const char* lend p |Sighandler_t|rsignal |int i|Sighandler_t t @@ -1896,18 +1896,18 @@ p |OP* |scalar |OP* o p |OP* |scalarkids |OP* o p |OP* |scalarseq |OP* o p |OP* |scalarvoid |OP* o -p |NV |scan_bin |char* start|I32 len|I32* retlen -p |NV |scan_hex |char* start|I32 len|I32* retlen -p |char* |scan_num |char* s -p |NV |scan_oct |char* start|I32 len|I32* retlen +Ap |NV |scan_bin |char* start|I32 len|I32* retlen +Ap |NV |scan_hex |char* start|I32 len|I32* retlen +Ap |char* |scan_num |char* s +Ap |NV |scan_oct |char* start|I32 len|I32* retlen p |OP* |scope |OP* o -p |char* |screaminstr |SV* bigsv|SV* littlesv|I32 start_shift \ +Ap |char* |screaminstr |SV* bigsv|SV* littlesv|I32 start_shift \ |I32 end_shift|I32 *state|I32 last #if !defined(VMS) p |I32 |setenv_getix |char* nam #endif p |void |setdefout |GV* gv -p |char* |sharepvn |const char* sv|I32 len|U32 hash +Ap |char* |sharepvn |const char* sv|I32 len|U32 hash p |HEK* |share_hek |const char* sv|I32 len|U32 hash np |Signal_t |sighandler |int sig Ap |SV** |stack_grow |SV** sp|SV**p|int n @@ -1947,14 +1947,14 @@ Ap |I32 |sv_cmp_locale |SV* sv1|SV* sv2 #if defined(USE_LOCALE_COLLATE) Ap |char* |sv_collxfrm |SV* sv|STRLEN* nxp #endif -p |OP* |sv_compile_2op |SV* sv|OP** startp|char* code|AV** avp +Ap |OP* |sv_compile_2op |SV* sv|OP** startp|char* code|AV** avp Apd |void |sv_dec |SV* sv Ap |void |sv_dump |SV* sv Apd |bool |sv_derived_from|SV* sv|const char* name Apd |I32 |sv_eq |SV* sv1|SV* sv2 Ap |void |sv_free |SV* sv p |void |sv_free_arenas -p |char* |sv_gets |SV* sv|PerlIO* fp|I32 append +Ap |char* |sv_gets |SV* sv|PerlIO* fp|I32 append Apd |char* |sv_grow |SV* sv|STRLEN newlen Apd |void |sv_inc |SV* sv Apd |void |sv_insert |SV* bigsv|STRLEN offset|STRLEN len \ @@ -2005,9 +2005,9 @@ Apd |void |sv_vcatpvfn |SV* sv|const char* pat|STRLEN patlen \ Apd |void |sv_vsetpvfn |SV* sv|const char* pat|STRLEN patlen \ |va_list* args|SV** svargs|I32 svmax \ |bool *maybe_tainted -p |SV* |swash_init |char* pkg|char* name|SV* listsv \ +Ap |SV* |swash_init |char* pkg|char* name|SV* listsv \ |I32 minbits|I32 none -p |UV |swash_fetch |SV *sv|U8 *ptr +Ap |UV |swash_fetch |SV *sv|U8 *ptr Ap |void |taint_env Ap |void |taint_proper |const char* f|const char* s Ap |UV |to_utf8_lower |U8 *p @@ -2017,9 +2017,9 @@ Ap |UV |to_utf8_title |U8 *p Ap |I32 |unlnk |char* f #endif #if defined(USE_THREADS) -p |void |unlock_condpair|void* svv +Ap |void |unlock_condpair|void* svv #endif -p |void |unsharepvn |const char* sv|I32 len|U32 hash +Ap |void |unsharepvn |const char* sv|I32 len|U32 hash p |void |unshare_hek |HEK* hek p |void |utilize |int aver|I32 floor|OP* version|OP* id|OP* arg Ap |U8* |utf16_to_utf8 |U16* p|U8 *d|I32 bytelen diff --git a/global.sym b/global.sym index d3d4cd6b94..72a59db2ee 100644 --- a/global.sym +++ b/global.sym @@ -42,11 +42,13 @@ Perl_av_store Perl_av_undef Perl_av_unshift Perl_block_gimme +Perl_call_list Perl_cast_ulong Perl_cast_i32 Perl_cast_iv Perl_cast_uv Perl_my_chsize +Perl_condpair_magic Perl_croak Perl_vcroak Perl_croak_nocontext @@ -76,6 +78,8 @@ Perl_debop Perl_debstack Perl_debstackptrs Perl_delimcpy +Perl_die +Perl_dounwind Perl_do_binmode Perl_do_open Perl_do_open9 @@ -136,6 +140,7 @@ Perl_hv_store_ent Perl_hv_undef Perl_ibcmp Perl_ibcmp_locale +Perl_init_stacks Perl_instr Perl_is_uni_alnum Perl_is_uni_alnumc @@ -186,6 +191,7 @@ Perl_is_utf8_print Perl_is_utf8_punct Perl_is_utf8_xdigit Perl_is_utf8_mark +Perl_leave_scope Perl_looks_like_number Perl_markstack_grow Perl_mess @@ -199,6 +205,7 @@ Perl_mg_length Perl_mg_magical Perl_mg_set Perl_mg_size +Perl_moreswitches Perl_my_atof Perl_my_bcopy Perl_my_bzero @@ -264,7 +271,10 @@ Perl_newSVrv Perl_newSVsv Perl_newUNOP Perl_newWHILEOP +Perl_new_stackinfo Perl_ninstr +Perl_op_free +Perl_pad_sv Perl_new_struct_thread Perl_call_atexit Perl_call_argv @@ -277,6 +287,8 @@ Perl_get_sv Perl_get_av Perl_get_hv Perl_get_cv +Perl_init_i18nl10n +Perl_init_i18nl14n Perl_new_collate Perl_new_ctype Perl_new_numeric @@ -284,9 +296,17 @@ Perl_set_numeric_local Perl_set_numeric_radix Perl_set_numeric_standard Perl_require_pv +Perl_pmflag Perl_pop_scope Perl_push_scope Perl_regdump +Perl_pregfree +Perl_pregcomp +Perl_re_intuit_start +Perl_re_intuit_string +Perl_regexec_flags +Perl_regnext +Perl_repeatcpy Perl_rninstr Perl_savepv Perl_savepvn @@ -323,6 +343,12 @@ Perl_save_re_context Perl_save_sptr Perl_save_svref Perl_save_threadsv +Perl_scan_bin +Perl_scan_hex +Perl_scan_num +Perl_scan_oct +Perl_screaminstr +Perl_sharepvn Perl_stack_grow Perl_start_subparse Perl_sv_2bool @@ -354,11 +380,13 @@ Perl_sv_clear Perl_sv_cmp Perl_sv_cmp_locale Perl_sv_collxfrm +Perl_sv_compile_2op Perl_sv_dec Perl_sv_dump Perl_sv_derived_from Perl_sv_eq Perl_sv_free +Perl_sv_gets Perl_sv_grow Perl_sv_inc Perl_sv_insert @@ -402,12 +430,16 @@ Perl_sv_upgrade Perl_sv_usepvn Perl_sv_vcatpvfn Perl_sv_vsetpvfn +Perl_swash_init +Perl_swash_fetch Perl_taint_env Perl_taint_proper Perl_to_utf8_lower Perl_to_utf8_upper Perl_to_utf8_title Perl_unlnk +Perl_unlock_condpair +Perl_unsharepvn Perl_utf16_to_utf8 Perl_utf16_to_utf8_reversed Perl_utf8_distance @@ -128,6 +128,10 @@ #define Perl_block_gimme pPerl->Perl_block_gimme #undef block_gimme #define block_gimme Perl_block_gimme +#undef Perl_call_list +#define Perl_call_list pPerl->Perl_call_list +#undef call_list +#define call_list Perl_call_list #undef Perl_cast_ulong #define Perl_cast_ulong pPerl->Perl_cast_ulong #undef cast_ulong @@ -151,6 +155,10 @@ #define my_chsize Perl_my_chsize #endif #if defined(USE_THREADS) +#undef Perl_condpair_magic +#define Perl_condpair_magic pPerl->Perl_condpair_magic +#undef condpair_magic +#define condpair_magic Perl_condpair_magic #endif #undef Perl_croak #define Perl_croak pPerl->Perl_croak @@ -270,6 +278,14 @@ #define Perl_delimcpy pPerl->Perl_delimcpy #undef delimcpy #define delimcpy Perl_delimcpy +#undef Perl_die +#define Perl_die pPerl->Perl_die +#undef die +#define die Perl_die +#undef Perl_dounwind +#define Perl_dounwind pPerl->Perl_dounwind +#undef dounwind +#define dounwind Perl_dounwind #undef Perl_do_binmode #define Perl_do_binmode pPerl->Perl_do_binmode #undef do_binmode @@ -520,6 +536,10 @@ #define Perl_ibcmp_locale pPerl->Perl_ibcmp_locale #undef ibcmp_locale #define ibcmp_locale Perl_ibcmp_locale +#undef Perl_init_stacks +#define Perl_init_stacks pPerl->Perl_init_stacks +#undef init_stacks +#define init_stacks Perl_init_stacks #undef Perl_instr #define Perl_instr pPerl->Perl_instr #undef instr @@ -720,6 +740,10 @@ #define Perl_is_utf8_mark pPerl->Perl_is_utf8_mark #undef is_utf8_mark #define is_utf8_mark Perl_is_utf8_mark +#undef Perl_leave_scope +#define Perl_leave_scope pPerl->Perl_leave_scope +#undef leave_scope +#define leave_scope Perl_leave_scope #undef Perl_looks_like_number #define Perl_looks_like_number pPerl->Perl_looks_like_number #undef looks_like_number @@ -778,6 +802,10 @@ #define Perl_mg_size pPerl->Perl_mg_size #undef mg_size #define mg_size Perl_mg_size +#undef Perl_moreswitches +#define Perl_moreswitches pPerl->Perl_moreswitches +#undef moreswitches +#define moreswitches Perl_moreswitches #undef Perl_my_atof #define Perl_my_atof pPerl->Perl_my_atof #undef my_atof @@ -1050,10 +1078,22 @@ #define Perl_newWHILEOP pPerl->Perl_newWHILEOP #undef newWHILEOP #define newWHILEOP Perl_newWHILEOP +#undef Perl_new_stackinfo +#define Perl_new_stackinfo pPerl->Perl_new_stackinfo +#undef new_stackinfo +#define new_stackinfo Perl_new_stackinfo #undef Perl_ninstr #define Perl_ninstr pPerl->Perl_ninstr #undef ninstr #define ninstr Perl_ninstr +#undef Perl_op_free +#define Perl_op_free pPerl->Perl_op_free +#undef op_free +#define op_free Perl_op_free +#undef Perl_pad_sv +#define Perl_pad_sv pPerl->Perl_pad_sv +#undef pad_sv +#define pad_sv Perl_pad_sv #if defined(PERL_OBJECT) #undef Perl_construct #define Perl_construct pPerl->Perl_construct @@ -1116,6 +1156,14 @@ #define Perl_get_cv pPerl->Perl_get_cv #undef get_cv #define get_cv Perl_get_cv +#undef Perl_init_i18nl10n +#define Perl_init_i18nl10n pPerl->Perl_init_i18nl10n +#undef init_i18nl10n +#define init_i18nl10n Perl_init_i18nl10n +#undef Perl_init_i18nl14n +#define Perl_init_i18nl14n pPerl->Perl_init_i18nl14n +#undef init_i18nl14n +#define init_i18nl14n Perl_init_i18nl14n #undef Perl_new_collate #define Perl_new_collate pPerl->Perl_new_collate #undef new_collate @@ -1144,6 +1192,10 @@ #define Perl_require_pv pPerl->Perl_require_pv #undef require_pv #define require_pv Perl_require_pv +#undef Perl_pmflag +#define Perl_pmflag pPerl->Perl_pmflag +#undef pmflag +#define pmflag Perl_pmflag #undef Perl_pop_scope #define Perl_pop_scope pPerl->Perl_pop_scope #undef pop_scope @@ -1156,6 +1208,34 @@ #define Perl_regdump pPerl->Perl_regdump #undef regdump #define regdump Perl_regdump +#undef Perl_pregfree +#define Perl_pregfree pPerl->Perl_pregfree +#undef pregfree +#define pregfree Perl_pregfree +#undef Perl_pregcomp +#define Perl_pregcomp pPerl->Perl_pregcomp +#undef pregcomp +#define pregcomp Perl_pregcomp +#undef Perl_re_intuit_start +#define Perl_re_intuit_start pPerl->Perl_re_intuit_start +#undef re_intuit_start +#define re_intuit_start Perl_re_intuit_start +#undef Perl_re_intuit_string +#define Perl_re_intuit_string pPerl->Perl_re_intuit_string +#undef re_intuit_string +#define re_intuit_string Perl_re_intuit_string +#undef Perl_regexec_flags +#define Perl_regexec_flags pPerl->Perl_regexec_flags +#undef regexec_flags +#define regexec_flags Perl_regexec_flags +#undef Perl_regnext +#define Perl_regnext pPerl->Perl_regnext +#undef regnext +#define regnext Perl_regnext +#undef Perl_repeatcpy +#define Perl_repeatcpy pPerl->Perl_repeatcpy +#undef repeatcpy +#define repeatcpy Perl_repeatcpy #undef Perl_rninstr #define Perl_rninstr pPerl->Perl_rninstr #undef rninstr @@ -1302,8 +1382,32 @@ #define Perl_save_threadsv pPerl->Perl_save_threadsv #undef save_threadsv #define save_threadsv Perl_save_threadsv +#undef Perl_scan_bin +#define Perl_scan_bin pPerl->Perl_scan_bin +#undef scan_bin +#define scan_bin Perl_scan_bin +#undef Perl_scan_hex +#define Perl_scan_hex pPerl->Perl_scan_hex +#undef scan_hex +#define scan_hex Perl_scan_hex +#undef Perl_scan_num +#define Perl_scan_num pPerl->Perl_scan_num +#undef scan_num +#define scan_num Perl_scan_num +#undef Perl_scan_oct +#define Perl_scan_oct pPerl->Perl_scan_oct +#undef scan_oct +#define scan_oct Perl_scan_oct +#undef Perl_screaminstr +#define Perl_screaminstr pPerl->Perl_screaminstr +#undef screaminstr +#define screaminstr Perl_screaminstr #if !defined(VMS) #endif +#undef Perl_sharepvn +#define Perl_sharepvn pPerl->Perl_sharepvn +#undef sharepvn +#define sharepvn Perl_sharepvn #undef Perl_stack_grow #define Perl_stack_grow pPerl->Perl_stack_grow #undef stack_grow @@ -1430,6 +1534,10 @@ #undef sv_collxfrm #define sv_collxfrm Perl_sv_collxfrm #endif +#undef Perl_sv_compile_2op +#define Perl_sv_compile_2op pPerl->Perl_sv_compile_2op +#undef sv_compile_2op +#define sv_compile_2op Perl_sv_compile_2op #undef Perl_sv_dec #define Perl_sv_dec pPerl->Perl_sv_dec #undef sv_dec @@ -1450,6 +1558,10 @@ #define Perl_sv_free pPerl->Perl_sv_free #undef sv_free #define sv_free Perl_sv_free +#undef Perl_sv_gets +#define Perl_sv_gets pPerl->Perl_sv_gets +#undef sv_gets +#define sv_gets Perl_sv_gets #undef Perl_sv_grow #define Perl_sv_grow pPerl->Perl_sv_grow #undef sv_grow @@ -1622,6 +1734,14 @@ #define Perl_sv_vsetpvfn pPerl->Perl_sv_vsetpvfn #undef sv_vsetpvfn #define sv_vsetpvfn Perl_sv_vsetpvfn +#undef Perl_swash_init +#define Perl_swash_init pPerl->Perl_swash_init +#undef swash_init +#define swash_init Perl_swash_init +#undef Perl_swash_fetch +#define Perl_swash_fetch pPerl->Perl_swash_fetch +#undef swash_fetch +#define swash_fetch Perl_swash_fetch #undef Perl_taint_env #define Perl_taint_env pPerl->Perl_taint_env #undef taint_env @@ -1649,7 +1769,15 @@ #define unlnk Perl_unlnk #endif #if defined(USE_THREADS) +#undef Perl_unlock_condpair +#define Perl_unlock_condpair pPerl->Perl_unlock_condpair +#undef unlock_condpair +#define unlock_condpair Perl_unlock_condpair #endif +#undef Perl_unsharepvn +#define Perl_unsharepvn pPerl->Perl_unsharepvn +#undef unsharepvn +#define unsharepvn Perl_unsharepvn #undef Perl_utf16_to_utf8 #define Perl_utf16_to_utf8 pPerl->Perl_utf16_to_utf8 #undef utf16_to_utf8 @@ -244,6 +244,13 @@ Perl_block_gimme(pTHXo) return ((CPerlObj*)pPerl)->Perl_block_gimme(); } +#undef Perl_call_list +void +Perl_call_list(pTHXo_ I32 oldscope, AV* av_list) +{ + ((CPerlObj*)pPerl)->Perl_call_list(oldscope, av_list); +} + #undef Perl_cast_ulong U32 Perl_cast_ulong(pTHXo_ NV f) @@ -281,6 +288,13 @@ Perl_my_chsize(pTHXo_ int fd, Off_t length) } #endif #if defined(USE_THREADS) + +#undef Perl_condpair_magic +MAGIC* +Perl_condpair_magic(pTHXo_ SV *sv) +{ + return ((CPerlObj*)pPerl)->Perl_condpair_magic(sv); +} #endif #undef Perl_croak @@ -549,6 +563,26 @@ Perl_delimcpy(pTHXo_ char* to, char* toend, char* from, char* fromend, int delim return ((CPerlObj*)pPerl)->Perl_delimcpy(to, toend, from, fromend, delim, retlen); } +#undef Perl_die +OP* +Perl_die(pTHXo_ const char* pat, ...) +{ + OP* retval; + va_list args; + va_start(args, pat); + retval = ((CPerlObj*)pPerl)->Perl_vdie(pat, &args); + va_end(args); + return retval; + +} + +#undef Perl_dounwind +void +Perl_dounwind(pTHXo_ I32 cxix) +{ + ((CPerlObj*)pPerl)->Perl_dounwind(cxix); +} + #undef Perl_do_binmode int Perl_do_binmode(pTHXo_ PerlIO *fp, int iotype, int flag) @@ -985,6 +1019,13 @@ Perl_ibcmp_locale(pTHXo_ const char* a, const char* b, I32 len) return ((CPerlObj*)pPerl)->Perl_ibcmp_locale(a, b, len); } +#undef Perl_init_stacks +void +Perl_init_stacks(pTHXo) +{ + ((CPerlObj*)pPerl)->Perl_init_stacks(); +} + #undef Perl_instr char* Perl_instr(pTHXo_ const char* big, const char* little) @@ -1335,6 +1376,13 @@ Perl_is_utf8_mark(pTHXo_ U8 *p) return ((CPerlObj*)pPerl)->Perl_is_utf8_mark(p); } +#undef Perl_leave_scope +void +Perl_leave_scope(pTHXo_ I32 base) +{ + ((CPerlObj*)pPerl)->Perl_leave_scope(base); +} + #undef Perl_looks_like_number I32 Perl_looks_like_number(pTHXo_ SV* sv) @@ -1438,6 +1486,13 @@ Perl_mg_size(pTHXo_ SV* sv) return ((CPerlObj*)pPerl)->Perl_mg_size(sv); } +#undef Perl_moreswitches +char* +Perl_moreswitches(pTHXo_ char* s) +{ + return ((CPerlObj*)pPerl)->Perl_moreswitches(s); +} + #undef Perl_my_atof NV Perl_my_atof(pTHXo_ const char *s) @@ -1915,12 +1970,33 @@ Perl_newWHILEOP(pTHXo_ I32 flags, I32 debuggable, LOOP* loop, I32 whileline, OP* return ((CPerlObj*)pPerl)->Perl_newWHILEOP(flags, debuggable, loop, whileline, expr, block, cont); } +#undef Perl_new_stackinfo +PERL_SI* +Perl_new_stackinfo(pTHXo_ I32 stitems, I32 cxitems) +{ + return ((CPerlObj*)pPerl)->Perl_new_stackinfo(stitems, cxitems); +} + #undef Perl_ninstr char* Perl_ninstr(pTHXo_ const char* big, const char* bigend, const char* little, const char* lend) { return ((CPerlObj*)pPerl)->Perl_ninstr(big, bigend, little, lend); } + +#undef Perl_op_free +void +Perl_op_free(pTHXo_ OP* arg) +{ + ((CPerlObj*)pPerl)->Perl_op_free(arg); +} + +#undef Perl_pad_sv +SV* +Perl_pad_sv(pTHXo_ PADOFFSET po) +{ + return ((CPerlObj*)pPerl)->Perl_pad_sv(po); +} #if defined(PERL_OBJECT) #undef Perl_construct @@ -2045,6 +2121,20 @@ Perl_get_cv(pTHXo_ const char* name, I32 create) return ((CPerlObj*)pPerl)->Perl_get_cv(name, create); } +#undef Perl_init_i18nl10n +int +Perl_init_i18nl10n(pTHXo_ int printwarn) +{ + return ((CPerlObj*)pPerl)->Perl_init_i18nl10n(printwarn); +} + +#undef Perl_init_i18nl14n +int +Perl_init_i18nl14n(pTHXo_ int printwarn) +{ + return ((CPerlObj*)pPerl)->Perl_init_i18nl14n(printwarn); +} + #undef Perl_new_collate void Perl_new_collate(pTHXo_ const char* newcoll) @@ -2094,6 +2184,13 @@ Perl_require_pv(pTHXo_ const char* pv) ((CPerlObj*)pPerl)->Perl_require_pv(pv); } +#undef Perl_pmflag +void +Perl_pmflag(pTHXo_ U16* pmfl, int ch) +{ + ((CPerlObj*)pPerl)->Perl_pmflag(pmfl, ch); +} + #undef Perl_pop_scope void Perl_pop_scope(pTHXo) @@ -2115,6 +2212,55 @@ Perl_regdump(pTHXo_ regexp* r) ((CPerlObj*)pPerl)->Perl_regdump(r); } +#undef Perl_pregfree +void +Perl_pregfree(pTHXo_ struct regexp* r) +{ + ((CPerlObj*)pPerl)->Perl_pregfree(r); +} + +#undef Perl_pregcomp +regexp* +Perl_pregcomp(pTHXo_ char* exp, char* xend, PMOP* pm) +{ + return ((CPerlObj*)pPerl)->Perl_pregcomp(exp, xend, pm); +} + +#undef Perl_re_intuit_start +char* +Perl_re_intuit_start(pTHXo_ regexp* prog, SV* sv, char* strpos, char* strend, U32 flags, struct re_scream_pos_data_s *data) +{ + return ((CPerlObj*)pPerl)->Perl_re_intuit_start(prog, sv, strpos, strend, flags, data); +} + +#undef Perl_re_intuit_string +SV* +Perl_re_intuit_string(pTHXo_ regexp* prog) +{ + return ((CPerlObj*)pPerl)->Perl_re_intuit_string(prog); +} + +#undef Perl_regexec_flags +I32 +Perl_regexec_flags(pTHXo_ regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, void* data, U32 flags) +{ + return ((CPerlObj*)pPerl)->Perl_regexec_flags(prog, stringarg, strend, strbeg, minend, screamer, data, flags); +} + +#undef Perl_regnext +regnode* +Perl_regnext(pTHXo_ regnode* p) +{ + return ((CPerlObj*)pPerl)->Perl_regnext(p); +} + +#undef Perl_repeatcpy +void +Perl_repeatcpy(pTHXo_ char* to, const char* from, I32 len, I32 count) +{ + ((CPerlObj*)pPerl)->Perl_repeatcpy(to, from, len, count); +} + #undef Perl_rninstr char* Perl_rninstr(pTHXo_ const char* big, const char* bigend, const char* little, const char* lend) @@ -2368,9 +2514,51 @@ Perl_save_threadsv(pTHXo_ PADOFFSET i) { return ((CPerlObj*)pPerl)->Perl_save_threadsv(i); } + +#undef Perl_scan_bin +NV +Perl_scan_bin(pTHXo_ char* start, I32 len, I32* retlen) +{ + return ((CPerlObj*)pPerl)->Perl_scan_bin(start, len, retlen); +} + +#undef Perl_scan_hex +NV +Perl_scan_hex(pTHXo_ char* start, I32 len, I32* retlen) +{ + return ((CPerlObj*)pPerl)->Perl_scan_hex(start, len, retlen); +} + +#undef Perl_scan_num +char* +Perl_scan_num(pTHXo_ char* s) +{ + return ((CPerlObj*)pPerl)->Perl_scan_num(s); +} + +#undef Perl_scan_oct +NV +Perl_scan_oct(pTHXo_ char* start, I32 len, I32* retlen) +{ + return ((CPerlObj*)pPerl)->Perl_scan_oct(start, len, retlen); +} + +#undef Perl_screaminstr +char* +Perl_screaminstr(pTHXo_ SV* bigsv, SV* littlesv, I32 start_shift, I32 end_shift, I32 *state, I32 last) +{ + return ((CPerlObj*)pPerl)->Perl_screaminstr(bigsv, littlesv, start_shift, end_shift, state, last); +} #if !defined(VMS) #endif +#undef Perl_sharepvn +char* +Perl_sharepvn(pTHXo_ const char* sv, I32 len, U32 hash) +{ + return ((CPerlObj*)pPerl)->Perl_sharepvn(sv, len, hash); +} + #undef Perl_stack_grow SV** Perl_stack_grow(pTHXo_ SV** sp, SV**p, int n) @@ -2593,6 +2781,13 @@ Perl_sv_collxfrm(pTHXo_ SV* sv, STRLEN* nxp) } #endif +#undef Perl_sv_compile_2op +OP* +Perl_sv_compile_2op(pTHXo_ SV* sv, OP** startp, char* code, AV** avp) +{ + return ((CPerlObj*)pPerl)->Perl_sv_compile_2op(sv, startp, code, avp); +} + #undef Perl_sv_dec void Perl_sv_dec(pTHXo_ SV* sv) @@ -2628,6 +2823,13 @@ Perl_sv_free(pTHXo_ SV* sv) ((CPerlObj*)pPerl)->Perl_sv_free(sv); } +#undef Perl_sv_gets +char* +Perl_sv_gets(pTHXo_ SV* sv, PerlIO* fp, I32 append) +{ + return ((CPerlObj*)pPerl)->Perl_sv_gets(sv, fp, append); +} + #undef Perl_sv_grow char* Perl_sv_grow(pTHXo_ SV* sv, STRLEN newlen) @@ -2932,6 +3134,20 @@ Perl_sv_vsetpvfn(pTHXo_ SV* sv, const char* pat, STRLEN patlen, va_list* args, S ((CPerlObj*)pPerl)->Perl_sv_vsetpvfn(sv, pat, patlen, args, svargs, svmax, maybe_tainted); } +#undef Perl_swash_init +SV* +Perl_swash_init(pTHXo_ char* pkg, char* name, SV* listsv, I32 minbits, I32 none) +{ + return ((CPerlObj*)pPerl)->Perl_swash_init(pkg, name, listsv, minbits, none); +} + +#undef Perl_swash_fetch +UV +Perl_swash_fetch(pTHXo_ SV *sv, U8 *ptr) +{ + return ((CPerlObj*)pPerl)->Perl_swash_fetch(sv, ptr); +} + #undef Perl_taint_env void Perl_taint_env(pTHXo) @@ -2976,8 +3192,22 @@ Perl_unlnk(pTHXo_ char* f) } #endif #if defined(USE_THREADS) + +#undef Perl_unlock_condpair +void +Perl_unlock_condpair(pTHXo_ void* svv) +{ + ((CPerlObj*)pPerl)->Perl_unlock_condpair(svv); +} #endif +#undef Perl_unsharepvn +void +Perl_unsharepvn(pTHXo_ const char* sv, I32 len, U32 hash) +{ + ((CPerlObj*)pPerl)->Perl_unsharepvn(sv, len, hash); +} + #undef Perl_utf16_to_utf8 U8* Perl_utf16_to_utf8(pTHXo_ U16* p, U8 *d, I32 bytelen) diff --git a/t/lib/thread.t b/t/lib/thread.t index edfb443fc8..6b3c800f9b 100755 --- a/t/lib/thread.t +++ b/t/lib/thread.t @@ -72,7 +72,7 @@ $t->join->join; { package Loch::Ness; sub new { bless [], shift } - sub monster : locked, method { + sub monster : locked : method { my($s, $m) = @_; print "ok $m\n"; } diff --git a/win32/win32.c b/win32/win32.c index af5e454f27..a50e8db0b0 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1690,6 +1690,8 @@ FAILED: return -1; } +#ifndef PERL_OBJECT + static UINT timerid = 0; static VOID CALLBACK TimerProc(HWND win, UINT msg, UINT id, DWORD time) @@ -1699,10 +1701,12 @@ static VOID CALLBACK TimerProc(HWND win, UINT msg, UINT id, DWORD time) timerid=0; sighandler(14); } +#endif /* !PERL_OBJECT */ DllExport unsigned int win32_alarm(unsigned int sec) { +#ifndef PERL_OBJECT /* * the 'obvious' implentation is SetTimer() with a callback * which does whatever receiving SIGALRM would do @@ -1727,6 +1731,7 @@ win32_alarm(unsigned int sec) timerid=0; } } +#endif /* !PERL_OBJECT */ return 0; } @@ -2454,7 +2459,7 @@ win32_link(const char *oldname, const char *newname) WCHAR wNewName[MAX_PATH+1]; if (IsWin95()) - Perl_die(aTHX_ PL_no_func, "link"); + Perl_croak(aTHX_ PL_no_func, "link"); pfnCreateHardLinkW = (BOOL (__stdcall *)(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES)) |