diff options
| -rw-r--r-- | NetWare/interface.c | 8 | ||||
| -rw-r--r-- | NetWare/interface.cpp | 8 | ||||
| -rw-r--r-- | cpan/Devel-PPPort/parts/inc/variables | 2 | ||||
| -rw-r--r-- | embedvar.h | 369 | ||||
| -rw-r--r-- | ext/B/B.pm | 2 | ||||
| -rw-r--r-- | ext/B/B.xs | 32 | ||||
| -rw-r--r-- | intrpvar.h | 657 | ||||
| -rw-r--r-- | makedef.pl | 2 | ||||
| -rw-r--r-- | perl.c | 20 | ||||
| -rw-r--r-- | perl.h | 16 | ||||
| -rw-r--r-- | perlapi.c | 10 | ||||
| -rw-r--r-- | perlapi.h | 18 | ||||
| -rw-r--r-- | perlvars.h | 68 | ||||
| -rw-r--r-- | pod/perldelta.pod | 14 | ||||
| -rwxr-xr-x | regen/embed.pl | 63 | ||||
| -rw-r--r-- | util.c | 8 | ||||
| -rw-r--r-- | win32/perllib.c | 8 |
17 files changed, 459 insertions, 846 deletions
diff --git a/NetWare/interface.c b/NetWare/interface.c index 0788e3aab8..2cdadca2fa 100644 --- a/NetWare/interface.c +++ b/NetWare/interface.c @@ -126,10 +126,10 @@ int RunPerl(int argc, char **argv, char **env) PerlInterpreter *new_perl = NULL; // defined in Perl.h #ifdef PERL_GLOBAL_STRUCT - #define PERLVAR(var,type) - #define PERLVARA(var,type) - #define PERLVARI(var,type,init) PL_Vars.var = init; - #define PERLVARIC(var,type,init) PL_Vars.var = init; + #define PERLVAR(prefix,var,type) + #define PERLVARA(prefix,var,type) + #define PERLVARI(prefix,var,type,init) PL_Vars.prefix##var = init; + #define PERLVARIC(prefix,var,type,init) PL_Vars.prefix##var = init; #include "perlvars.h" diff --git a/NetWare/interface.cpp b/NetWare/interface.cpp index b0f3cb3328..47fef6709c 100644 --- a/NetWare/interface.cpp +++ b/NetWare/interface.cpp @@ -120,10 +120,10 @@ int RunPerl(int argc, char **argv, char **env) //__asm{int 3}; #ifdef PERL_GLOBAL_STRUCT - #define PERLVAR(var,type) - #define PERLVARA(var,type) - #define PERLVARI(var,type,init) PL_Vars.var = init; - #define PERLVARIC(var,type,init) PL_Vars.var = init; + #define PERLVAR(prefix,var,type) + #define PERLVARA(prefix,var,type) + #define PERLVARI(prefix,var,type,init) PL_Vars.prefix##var = init; + #define PERLVARIC(prefix,var,type,init) PL_Vars.prefix##var = init; #include "perlvars.h" diff --git a/cpan/Devel-PPPort/parts/inc/variables b/cpan/Devel-PPPort/parts/inc/variables index 77b088ef58..3fbb566a98 100644 --- a/cpan/Devel-PPPort/parts/inc/variables +++ b/cpan/Devel-PPPort/parts/inc/variables @@ -383,7 +383,7 @@ other_variables() ppp_TESTVAR(PL_debstash); ppp_TESTVAR(PL_defgv); ppp_TESTVAR(PL_diehook); -#if defined(PL_phase) || defined(PL_Iphase) +#if PERL_VERSION >= 14 ppp_PARSERVAR_dummy; #else ppp_TESTVAR(PL_dirty); diff --git a/embedvar.h b/embedvar.h index 2405ee58e3..575e2e2aca 100644 --- a/embedvar.h +++ b/embedvar.h @@ -366,337 +366,6 @@ #define PL_watchok (vTHX->Iwatchok) #define PL_xmlfp (vTHX->Ixmlfp) -#else /* !MULTIPLICITY */ - -/* case 1 above */ - -#define PL_IArgv PL_Argv -#define PL_ICmd PL_Cmd -#define PL_IDBcv PL_DBcv -#define PL_IDBgv PL_DBgv -#define PL_IDBline PL_DBline -#define PL_IDBsignal PL_DBsignal -#define PL_IDBsingle PL_DBsingle -#define PL_IDBsub PL_DBsub -#define PL_IDBtrace PL_DBtrace -#define PL_IDir PL_Dir -#define PL_IEnv PL_Env -#define PL_ILIO PL_LIO -#define PL_IMem PL_Mem -#define PL_IMemParse PL_MemParse -#define PL_IMemShared PL_MemShared -#define PL_IOpPtr PL_OpPtr -#define PL_IOpSlab PL_OpSlab -#define PL_IOpSpace PL_OpSpace -#define PL_IProc PL_Proc -#define PL_ISock PL_Sock -#define PL_IStdIO PL_StdIO -#define PL_ISv PL_Sv -#define PL_IXpv PL_Xpv -#define PL_Iamagic_generation PL_amagic_generation -#define PL_Ian PL_an -#define PL_Iapiversion PL_apiversion -#define PL_Iargvgv PL_argvgv -#define PL_Iargvout_stack PL_argvout_stack -#define PL_Iargvoutgv PL_argvoutgv -#define PL_Ibasetime PL_basetime -#define PL_Ibeginav PL_beginav -#define PL_Ibeginav_save PL_beginav_save -#define PL_Iblockhooks PL_blockhooks -#define PL_Ibody_arenas PL_body_arenas -#define PL_Ibody_roots PL_body_roots -#define PL_Ibodytarget PL_bodytarget -#define PL_Ibreakable_sub_gen PL_breakable_sub_gen -#define PL_Icheckav PL_checkav -#define PL_Icheckav_save PL_checkav_save -#define PL_Ichopset PL_chopset -#define PL_Iclocktick PL_clocktick -#define PL_Icollation_ix PL_collation_ix -#define PL_Icollation_name PL_collation_name -#define PL_Icollation_standard PL_collation_standard -#define PL_Icollxfrm_base PL_collxfrm_base -#define PL_Icollxfrm_mult PL_collxfrm_mult -#define PL_Icolors PL_colors -#define PL_Icolorset PL_colorset -#define PL_Icompcv PL_compcv -#define PL_Icompiling PL_compiling -#define PL_Icomppad PL_comppad -#define PL_Icomppad_name PL_comppad_name -#define PL_Icomppad_name_fill PL_comppad_name_fill -#define PL_Icomppad_name_floor PL_comppad_name_floor -#define PL_Icop_seqmax PL_cop_seqmax -#define PL_Icryptseen PL_cryptseen -#define PL_Icurcop PL_curcop -#define PL_Icurcopdb PL_curcopdb -#define PL_Icurpad PL_curpad -#define PL_Icurpm PL_curpm -#define PL_Icurstack PL_curstack -#define PL_Icurstackinfo PL_curstackinfo -#define PL_Icurstash PL_curstash -#define PL_Icurstname PL_curstname -#define PL_Icustom_op_descs PL_custom_op_descs -#define PL_Icustom_op_names PL_custom_op_names -#define PL_Icustom_ops PL_custom_ops -#define PL_Icv_has_eval PL_cv_has_eval -#define PL_Idbargs PL_dbargs -#define PL_Idebstash PL_debstash -#define PL_Idebug PL_debug -#define PL_Idebug_pad PL_debug_pad -#define PL_Idef_layerlist PL_def_layerlist -#define PL_Idefgv PL_defgv -#define PL_Idefoutgv PL_defoutgv -#define PL_Idefstash PL_defstash -#define PL_Idelaymagic PL_delaymagic -#define PL_Idestroyhook PL_destroyhook -#define PL_Idiehook PL_diehook -#define PL_Idoswitches PL_doswitches -#define PL_Idowarn PL_dowarn -#define PL_Idumper_fd PL_dumper_fd -#define PL_Idumpindent PL_dumpindent -#define PL_Ie_script PL_e_script -#define PL_Iefloatbuf PL_efloatbuf -#define PL_Iefloatsize PL_efloatsize -#define PL_Iegid PL_egid -#define PL_Iencoding PL_encoding -#define PL_Iendav PL_endav -#define PL_Ienvgv PL_envgv -#define PL_Ierrgv PL_errgv -#define PL_Ierrors PL_errors -#define PL_Ieuid PL_euid -#define PL_Ieval_root PL_eval_root -#define PL_Ieval_start PL_eval_start -#define PL_Ievalseq PL_evalseq -#define PL_Iexit_flags PL_exit_flags -#define PL_Iexitlist PL_exitlist -#define PL_Iexitlistlen PL_exitlistlen -#define PL_Ifdpid PL_fdpid -#define PL_Ifilemode PL_filemode -#define PL_Ifirstgv PL_firstgv -#define PL_Iforkprocess PL_forkprocess -#define PL_Iformfeed PL_formfeed -#define PL_Iformtarget PL_formtarget -#define PL_Igeneration PL_generation -#define PL_Igensym PL_gensym -#define PL_Igid PL_gid -#define PL_Iglob_index PL_glob_index -#define PL_Iglobalstash PL_globalstash -#define PL_Ihash_seed PL_hash_seed -#define PL_Ihintgv PL_hintgv -#define PL_Ihints PL_hints -#define PL_Ihv_fetch_ent_mh PL_hv_fetch_ent_mh -#define PL_Iin_clean_all PL_in_clean_all -#define PL_Iin_clean_objs PL_in_clean_objs -#define PL_Iin_eval PL_in_eval -#define PL_Iin_load_module PL_in_load_module -#define PL_Iincgv PL_incgv -#define PL_Iinitav PL_initav -#define PL_Iinplace PL_inplace -#define PL_Iisarev PL_isarev -#define PL_Iknown_layers PL_known_layers -#define PL_Ilast_in_gv PL_last_in_gv -#define PL_Ilast_swash_hv PL_last_swash_hv -#define PL_Ilast_swash_key PL_last_swash_key -#define PL_Ilast_swash_klen PL_last_swash_klen -#define PL_Ilast_swash_slen PL_last_swash_slen -#define PL_Ilast_swash_tmps PL_last_swash_tmps -#define PL_Ilastfd PL_lastfd -#define PL_Ilastgotoprobe PL_lastgotoprobe -#define PL_Ilaststatval PL_laststatval -#define PL_Ilaststype PL_laststype -#define PL_Ilocalizing PL_localizing -#define PL_Ilocalpatches PL_localpatches -#define PL_Ilockhook PL_lockhook -#define PL_Imadskills PL_madskills -#define PL_Imain_cv PL_main_cv -#define PL_Imain_root PL_main_root -#define PL_Imain_start PL_main_start -#define PL_Imainstack PL_mainstack -#define PL_Imarkstack PL_markstack -#define PL_Imarkstack_max PL_markstack_max -#define PL_Imarkstack_ptr PL_markstack_ptr -#define PL_Imax_intro_pending PL_max_intro_pending -#define PL_Imaxo PL_maxo -#define PL_Imaxsysfd PL_maxsysfd -#define PL_Imemory_debug_header PL_memory_debug_header -#define PL_Imess_sv PL_mess_sv -#define PL_Imin_intro_pending PL_min_intro_pending -#define PL_Iminus_E PL_minus_E -#define PL_Iminus_F PL_minus_F -#define PL_Iminus_a PL_minus_a -#define PL_Iminus_c PL_minus_c -#define PL_Iminus_l PL_minus_l -#define PL_Iminus_n PL_minus_n -#define PL_Iminus_p PL_minus_p -#define PL_Imodcount PL_modcount -#define PL_Imodglobal PL_modglobal -#define PL_Imy_cxt_keys PL_my_cxt_keys -#define PL_Imy_cxt_list PL_my_cxt_list -#define PL_Imy_cxt_size PL_my_cxt_size -#define PL_Ina PL_na -#define PL_Inomemok PL_nomemok -#define PL_Inumeric_local PL_numeric_local -#define PL_Inumeric_name PL_numeric_name -#define PL_Inumeric_radix_sv PL_numeric_radix_sv -#define PL_Inumeric_standard PL_numeric_standard -#define PL_Iofsgv PL_ofsgv -#define PL_Ioldname PL_oldname -#define PL_Iop PL_op -#define PL_Iop_mask PL_op_mask -#define PL_Iopfreehook PL_opfreehook -#define PL_Iopsave PL_opsave -#define PL_Iorigalen PL_origalen -#define PL_Iorigargc PL_origargc -#define PL_Iorigargv PL_origargv -#define PL_Iorigenviron PL_origenviron -#define PL_Iorigfilename PL_origfilename -#define PL_Iors_sv PL_ors_sv -#define PL_Iosname PL_osname -#define PL_Ipad_reset_pending PL_pad_reset_pending -#define PL_Ipadix PL_padix -#define PL_Ipadix_floor PL_padix_floor -#define PL_Iparser PL_parser -#define PL_Ipatchlevel PL_patchlevel -#define PL_Ipeepp PL_peepp -#define PL_Iperl_destruct_level PL_perl_destruct_level -#define PL_Iperldb PL_perldb -#define PL_Iperlio PL_perlio -#define PL_Iphase PL_phase -#define PL_Ipidstatus PL_pidstatus -#define PL_Ippid PL_ppid -#define PL_Ipreambleav PL_preambleav -#define PL_Iprofiledata PL_profiledata -#define PL_Ipsig_name PL_psig_name -#define PL_Ipsig_pend PL_psig_pend -#define PL_Ipsig_ptr PL_psig_ptr -#define PL_Iptr_table PL_ptr_table -#define PL_Ireentrant_buffer PL_reentrant_buffer -#define PL_Ireentrant_retint PL_reentrant_retint -#define PL_Ireg_state PL_reg_state -#define PL_Iregdummy PL_regdummy -#define PL_Iregex_pad PL_regex_pad -#define PL_Iregex_padav PL_regex_padav -#define PL_Ireginterp_cnt PL_reginterp_cnt -#define PL_Iregistered_mros PL_registered_mros -#define PL_Iregmatch_slab PL_regmatch_slab -#define PL_Iregmatch_state PL_regmatch_state -#define PL_Irehash_seed PL_rehash_seed -#define PL_Irehash_seed_set PL_rehash_seed_set -#define PL_Ireplgv PL_replgv -#define PL_Irestartjmpenv PL_restartjmpenv -#define PL_Irestartop PL_restartop -#define PL_Irpeepp PL_rpeepp -#define PL_Irs PL_rs -#define PL_Irunops PL_runops -#define PL_Isavebegin PL_savebegin -#define PL_Isavestack PL_savestack -#define PL_Isavestack_ix PL_savestack_ix -#define PL_Isavestack_max PL_savestack_max -#define PL_Isawampersand PL_sawampersand -#define PL_Iscopestack PL_scopestack -#define PL_Iscopestack_ix PL_scopestack_ix -#define PL_Iscopestack_max PL_scopestack_max -#define PL_Iscopestack_name PL_scopestack_name -#define PL_Isecondgv PL_secondgv -#define PL_Isharehook PL_sharehook -#define PL_Isig_pending PL_sig_pending -#define PL_Isighandlerp PL_sighandlerp -#define PL_Isignalhook PL_signalhook -#define PL_Isignals PL_signals -#define PL_Islab_count PL_slab_count -#define PL_Islabs PL_slabs -#define PL_Isort_RealCmp PL_sort_RealCmp -#define PL_Isortcop PL_sortcop -#define PL_Isortstash PL_sortstash -#define PL_Isplitstr PL_splitstr -#define PL_Isrand_called PL_srand_called -#define PL_Istack_base PL_stack_base -#define PL_Istack_max PL_stack_max -#define PL_Istack_sp PL_stack_sp -#define PL_Istart_env PL_start_env -#define PL_Istashcache PL_stashcache -#define PL_Istatbuf PL_statbuf -#define PL_Istatcache PL_statcache -#define PL_Istatgv PL_statgv -#define PL_Istatname PL_statname -#define PL_Istatusvalue PL_statusvalue -#define PL_Istatusvalue_posix PL_statusvalue_posix -#define PL_Istatusvalue_vms PL_statusvalue_vms -#define PL_Istderrgv PL_stderrgv -#define PL_Istdingv PL_stdingv -#define PL_Istrtab PL_strtab -#define PL_Isub_generation PL_sub_generation -#define PL_Isubline PL_subline -#define PL_Isubname PL_subname -#define PL_Isv_arenaroot PL_sv_arenaroot -#define PL_Isv_count PL_sv_count -#define PL_Isv_no PL_sv_no -#define PL_Isv_objcount PL_sv_objcount -#define PL_Isv_root PL_sv_root -#define PL_Isv_serial PL_sv_serial -#define PL_Isv_undef PL_sv_undef -#define PL_Isv_yes PL_sv_yes -#define PL_Isys_intern PL_sys_intern -#define PL_Itaint_warn PL_taint_warn -#define PL_Itainted PL_tainted -#define PL_Itainting PL_tainting -#define PL_Ithreadhook PL_threadhook -#define PL_Itimesbuf PL_timesbuf -#define PL_Itmps_floor PL_tmps_floor -#define PL_Itmps_ix PL_tmps_ix -#define PL_Itmps_max PL_tmps_max -#define PL_Itmps_stack PL_tmps_stack -#define PL_Itop_env PL_top_env -#define PL_Itoptarget PL_toptarget -#define PL_Iuid PL_uid -#define PL_Iunicode PL_unicode -#define PL_Iunitcheckav PL_unitcheckav -#define PL_Iunitcheckav_save PL_unitcheckav_save -#define PL_Iunlockhook PL_unlockhook -#define PL_Iunsafe PL_unsafe -#define PL_Iutf8_X_L PL_utf8_X_L -#define PL_Iutf8_X_LV PL_utf8_X_LV -#define PL_Iutf8_X_LVT PL_utf8_X_LVT -#define PL_Iutf8_X_LV_LVT_V PL_utf8_X_LV_LVT_V -#define PL_Iutf8_X_T PL_utf8_X_T -#define PL_Iutf8_X_V PL_utf8_X_V -#define PL_Iutf8_X_begin PL_utf8_X_begin -#define PL_Iutf8_X_extend PL_utf8_X_extend -#define PL_Iutf8_X_non_hangul PL_utf8_X_non_hangul -#define PL_Iutf8_X_prepend PL_utf8_X_prepend -#define PL_Iutf8_alnum PL_utf8_alnum -#define PL_Iutf8_alpha PL_utf8_alpha -#define PL_Iutf8_ascii PL_utf8_ascii -#define PL_Iutf8_cntrl PL_utf8_cntrl -#define PL_Iutf8_digit PL_utf8_digit -#define PL_Iutf8_foldable PL_utf8_foldable -#define PL_Iutf8_foldclosures PL_utf8_foldclosures -#define PL_Iutf8_graph PL_utf8_graph -#define PL_Iutf8_idcont PL_utf8_idcont -#define PL_Iutf8_idstart PL_utf8_idstart -#define PL_Iutf8_lower PL_utf8_lower -#define PL_Iutf8_mark PL_utf8_mark -#define PL_Iutf8_perl_space PL_utf8_perl_space -#define PL_Iutf8_perl_word PL_utf8_perl_word -#define PL_Iutf8_posix_digit PL_utf8_posix_digit -#define PL_Iutf8_print PL_utf8_print -#define PL_Iutf8_punct PL_utf8_punct -#define PL_Iutf8_space PL_utf8_space -#define PL_Iutf8_tofold PL_utf8_tofold -#define PL_Iutf8_tolower PL_utf8_tolower -#define PL_Iutf8_totitle PL_utf8_totitle -#define PL_Iutf8_toupper PL_utf8_toupper -#define PL_Iutf8_upper PL_utf8_upper -#define PL_Iutf8_xdigit PL_utf8_xdigit -#define PL_Iutf8_xidcont PL_utf8_xidcont -#define PL_Iutf8_xidstart PL_utf8_xidstart -#define PL_Iutf8cache PL_utf8cache -#define PL_Iutf8locale PL_utf8locale -#define PL_Iwarnhook PL_warnhook -#define PL_Iwatchaddr PL_watchaddr -#define PL_Iwatchok PL_watchok -#define PL_Ixmlfp PL_xmlfp - - #endif /* MULTIPLICITY */ #if defined(PERL_GLOBAL_STRUCT) @@ -770,44 +439,6 @@ #define PL_watch_pvx (my_vars->Gwatch_pvx) #define PL_Gwatch_pvx (my_vars->Gwatch_pvx) -#else /* !PERL_GLOBAL_STRUCT */ - -#define PL_Gappctx PL_appctx -#define PL_Gcheck PL_check -#define PL_Gcsighandlerp PL_csighandlerp -#define PL_Gcurinterp PL_curinterp -#define PL_Gdo_undump PL_do_undump -#define PL_Gdollarzero_mutex PL_dollarzero_mutex -#define PL_Gfold_locale PL_fold_locale -#define PL_Ghints_mutex PL_hints_mutex -#define PL_Gkeyword_plugin PL_keyword_plugin -#define PL_Gmalloc_mutex PL_malloc_mutex -#define PL_Gmmap_page_size PL_mmap_page_size -#define PL_Gmy_ctx_mutex PL_my_ctx_mutex -#define PL_Gmy_cxt_index PL_my_cxt_index -#define PL_Gop_mutex PL_op_mutex -#define PL_Gop_seq PL_op_seq -#define PL_Gop_sequence PL_op_sequence -#define PL_Gperlio_debug_fd PL_perlio_debug_fd -#define PL_Gperlio_fd_refcnt PL_perlio_fd_refcnt -#define PL_Gperlio_fd_refcnt_size PL_perlio_fd_refcnt_size -#define PL_Gperlio_mutex PL_perlio_mutex -#define PL_Gppaddr PL_ppaddr -#ifdef OS2 -#define PL_Gsh_path PL_sh_path -#endif -#define PL_Gsig_defaulting PL_sig_defaulting -#define PL_Gsig_handlers_initted PL_sig_handlers_initted -#define PL_Gsig_ignoring PL_sig_ignoring -#define PL_Gsig_trapped PL_sig_trapped -#define PL_Gsigfpe_saved PL_sigfpe_saved -#define PL_Gsv_placeholder PL_sv_placeholder -#define PL_Gthr_key PL_thr_key -#define PL_Gtimesbase PL_timesbase -#define PL_Guse_safe_putenv PL_use_safe_putenv -#define PL_Gveto_cleanup PL_veto_cleanup -#define PL_Gwatch_pvx PL_watch_pvx - #endif /* PERL_GLOBAL_STRUCT */ /* ex: set ro: */ diff --git a/ext/B/B.pm b/ext/B/B.pm index da20925ae5..2f18065e4a 100644 --- a/ext/B/B.pm +++ b/ext/B/B.pm @@ -15,7 +15,7 @@ require Exporter; # walkoptree comes from B.xs BEGIN { - $B::VERSION = '1.30'; + $B::VERSION = '1.31'; @B::EXPORT_OK = (); # Our BOOT code needs $VERSION set, and will append to @EXPORT_OK. diff --git a/ext/B/B.xs b/ext/B/B.xs index 901554968f..0c44e45bad 100644 --- a/ext/B/B.xs +++ b/ext/B/B.xs @@ -609,10 +609,10 @@ typedef struct refcounted_he *B__RHE; #endif #ifdef MULTIPLICITY -# define ASSIGN_COMMON_ALIAS(var) \ - STMT_START { XSANY.any_i32 = offsetof(struct interpreter, var); } STMT_END +# define ASSIGN_COMMON_ALIAS(prefix, var) \ + STMT_START { XSANY.any_i32 = offsetof(struct interpreter, prefix##var); } STMT_END #else -# define ASSIGN_COMMON_ALIAS(var) \ +# define ASSIGN_COMMON_ALIAS(prefix, var) \ STMT_START { XSANY.any_ptr = (void *)&PL_##var; } STMT_END #endif @@ -657,35 +657,35 @@ BOOT: specialsv_list[6] = (SV *) pWARN_STD; cv = newXS("B::init_av", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Iinitav); + ASSIGN_COMMON_ALIAS(I, initav); cv = newXS("B::check_av", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Icheckav_save); + ASSIGN_COMMON_ALIAS(I, checkav_save); #if PERL_VERSION >= 9 cv = newXS("B::unitcheck_av", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Iunitcheckav_save); + ASSIGN_COMMON_ALIAS(I, unitcheckav_save); #endif cv = newXS("B::begin_av", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Ibeginav_save); + ASSIGN_COMMON_ALIAS(I, beginav_save); cv = newXS("B::end_av", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Iendav); + ASSIGN_COMMON_ALIAS(I, endav); cv = newXS("B::main_cv", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Imain_cv); + ASSIGN_COMMON_ALIAS(I, main_cv); cv = newXS("B::inc_gv", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Iincgv); + ASSIGN_COMMON_ALIAS(I, incgv); cv = newXS("B::defstash", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Idefstash); + ASSIGN_COMMON_ALIAS(I, defstash); cv = newXS("B::curstash", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Icurstash); + ASSIGN_COMMON_ALIAS(I, curstash); cv = newXS("B::formfeed", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Iformfeed); + ASSIGN_COMMON_ALIAS(I, formfeed); #ifdef USE_ITHREADS cv = newXS("B::regex_padav", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Iregex_padav); + ASSIGN_COMMON_ALIAS(I, regex_padav); #endif cv = newXS("B::warnhook", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Iwarnhook); + ASSIGN_COMMON_ALIAS(I, warnhook); cv = newXS("B::diehook", intrpvar_sv_common, file); - ASSIGN_COMMON_ALIAS(Idiehook); + ASSIGN_COMMON_ALIAS(I, diehook); } long diff --git a/intrpvar.h b/intrpvar.h index 4a6122faa1..84534c94c1 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -32,43 +32,43 @@ * * Important ones in the first cache line (if alignment is done right) */ -PERLVAR(Istack_sp, SV **) /* top of the stack */ +PERLVAR(I, stack_sp, SV **) /* top of the stack */ #ifdef OP_IN_REGISTER -PERLVAR(Iopsave, OP *) +PERLVAR(I, opsave, OP *) #else -PERLVAR(Iop, OP *) /* currently executing op */ +PERLVAR(I, op, OP *) /* currently executing op */ #endif -PERLVAR(Icurpad, SV **) /* active pad (lexicals+tmps) */ +PERLVAR(I, curpad, SV **) /* active pad (lexicals+tmps) */ -PERLVAR(Istack_base, SV **) -PERLVAR(Istack_max, SV **) +PERLVAR(I, stack_base, SV **) +PERLVAR(I, stack_max, SV **) -PERLVAR(Iscopestack, I32 *) /* scopes we've ENTERed */ +PERLVAR(I, scopestack, I32 *) /* scopes we've ENTERed */ /* name of the scopes we've ENTERed. Only used with -DDEBUGGING, but needs to be present always, as -DDEUBGGING must be binary compatible with non. */ -PERLVARI(Iscopestack_name, const char * *, NULL) -PERLVAR(Iscopestack_ix, I32) -PERLVAR(Iscopestack_max,I32) +PERLVARI(I, scopestack_name, const char * *, NULL) +PERLVAR(I, scopestack_ix, I32) +PERLVAR(I, scopestack_max, I32) -PERLVAR(Isavestack, ANY *) /* items that need to be restored when +PERLVAR(I, savestack, ANY *) /* items that need to be restored when LEAVEing scopes we've ENTERed */ -PERLVAR(Isavestack_ix, I32) -PERLVAR(Isavestack_max, I32) - -PERLVAR(Itmps_stack, SV **) /* mortals we've made */ -PERLVARI(Itmps_ix, I32, -1) -PERLVARI(Itmps_floor, I32, -1) -PERLVAR(Itmps_max, I32) -PERLVAR(Imodcount, I32) /* how much op_lvalue()ification in +PERLVAR(I, savestack_ix, I32) +PERLVAR(I, savestack_max, I32) + +PERLVAR(I, tmps_stack, SV **) /* mortals we've made */ +PERLVARI(I, tmps_ix, I32, -1) +PERLVARI(I, tmps_floor, I32, -1) +PERLVAR(I, tmps_max, I32) +PERLVAR(I, modcount, I32) /* how much op_lvalue()ification in assignment? */ -PERLVAR(Imarkstack, I32 *) /* stack_sp locations we're +PERLVAR(I, markstack, I32 *) /* stack_sp locations we're remembering */ -PERLVAR(Imarkstack_ptr, I32 *) -PERLVAR(Imarkstack_max, I32 *) +PERLVAR(I, markstack_ptr, I32 *) +PERLVAR(I, markstack_max, I32 *) -PERLVAR(ISv, SV *) /* used to hold temporary values */ -PERLVAR(IXpv, XPV *) /* used to hold temporary values */ +PERLVAR(I, Sv, SV *) /* used to hold temporary values */ +PERLVAR(I, Xpv, XPV *) /* used to hold temporary values */ /* =for apidoc Amn|STRLEN|PL_na @@ -81,21 +81,21 @@ C<SvPV_nolen> macro. =cut */ -PERLVAR(Ina, STRLEN) /* for use in SvPV when length is +PERLVAR(I, na, STRLEN) /* for use in SvPV when length is Not Applicable */ /* stat stuff */ -PERLVAR(Istatbuf, Stat_t) -PERLVAR(Istatcache, Stat_t) /* _ */ -PERLVAR(Istatgv, GV *) -PERLVARI(Istatname, SV *, NULL) +PERLVAR(I, statbuf, Stat_t) +PERLVAR(I, statcache, Stat_t) /* _ */ +PERLVAR(I, statgv, GV *) +PERLVARI(I, statname, SV *, NULL) #ifdef HAS_TIMES -PERLVAR(Itimesbuf, struct tms) +PERLVAR(I, timesbuf, struct tms) #endif /* Fields used by magic variables such as $@, $/ and so on */ -PERLVAR(Icurpm, PMOP *) /* what to do \ interps in REs from */ +PERLVAR(I, curpm, PMOP *) /* what to do \ interps in REs from */ /* =for apidoc mn|SV*|PL_rs @@ -113,60 +113,60 @@ The glob containing the output field separator - C<*,> in Perl space. =cut */ -PERLVAR(Irs, SV *) /* input record separator $/ */ -PERLVAR(Ilast_in_gv, GV *) /* GV used in last <FH> */ -PERLVAR(Iofsgv, GV *) /* GV of output field separator *, */ -PERLVAR(Idefoutgv, GV *) /* default FH for output */ -PERLVARI(Ichopset, const char *, " \n-") /* $: */ -PERLVAR(Iformtarget, SV *) -PERLVAR(Ibodytarget, SV *) -PERLVAR(Itoptarget, SV *) +PERLVAR(I, rs, SV *) /* input record separator $/ */ +PERLVAR(I, last_in_gv, GV *) /* GV used in last <FH> */ +PERLVAR(I, ofsgv, GV *) /* GV of output field separator *, */ +PERLVAR(I, defoutgv, GV *) /* default FH for output */ +PERLVARI(I, chopset, const char *, " \n-") /* $: */ +PERLVAR(I, formtarget, SV *) +PERLVAR(I, bodytarget, SV *) +PERLVAR(I, toptarget, SV *) /* Stashes */ -PERLVAR(Idefstash, HV *) /* main symbol table */ -PERLVAR(Icurstash, HV *) /* symbol table for current package */ - -PERLVAR(Irestartop, OP *) /* propagating an error from croak? */ -PERLVAR(Irestartjmpenv, JMPENV *) /* target frame for longjmp in die */ -PERLVAR(Icurcop, COP *) -PERLVAR(Icurstack, AV *) /* THE STACK */ -PERLVAR(Icurstackinfo, PERL_SI *) /* current stack + context */ -PERLVAR(Imainstack, AV *) /* the stack when nothing funny is +PERLVAR(I, defstash, HV *) /* main symbol table */ +PERLVAR(I, curstash, HV *) /* symbol table for current package */ + +PERLVAR(I, restartop, OP *) /* propagating an error from croak? */ +PERLVAR(I, restartjmpenv, JMPENV *) /* target frame for longjmp in die */ +PERLVAR(I, curcop, COP *) +PERLVAR(I, curstack, AV *) /* THE STACK */ +PERLVAR(I, curstackinfo, PERL_SI *) /* current stack + context */ +PERLVAR(I, mainstack, AV *) /* the stack when nothing funny is happening */ -PERLVAR(Itop_env, JMPENV *) /* ptr to current sigjmp environment */ -PERLVAR(Istart_env, JMPENV) /* empty startup sigjmp environment */ -PERLVARI(Ierrors, SV *, NULL) /* outstanding queued errors */ +PERLVAR(I, top_env, JMPENV *) /* ptr to current sigjmp environment */ +PERLVAR(I, start_env, JMPENV) /* empty startup sigjmp environment */ +PERLVARI(I, errors, SV *, NULL) /* outstanding queued errors */ /* statics "owned" by various functions */ -PERLVAR(Ihv_fetch_ent_mh, HE*) /* owned by hv_fetch_ent() */ +PERLVAR(I, hv_fetch_ent_mh, HE*) /* owned by hv_fetch_ent() */ -PERLVAR(Ilastgotoprobe, OP*) /* from pp_ctl.c */ +PERLVAR(I, lastgotoprobe, OP*) /* from pp_ctl.c */ /* sort stuff */ -PERLVAR(Isortcop, OP *) /* user defined sort routine */ -PERLVAR(Isortstash, HV *) /* which is in some package or other */ -PERLVAR(Ifirstgv, GV *) /* $a */ -PERLVAR(Isecondgv, GV *) /* $b */ +PERLVAR(I, sortcop, OP *) /* user defined sort routine */ +PERLVAR(I, sortstash, HV *) /* which is in some package or other */ +PERLVAR(I, firstgv, GV *) /* $a */ +PERLVAR(I, secondgv, GV *) /* $b */ /* float buffer */ -PERLVAR(Iefloatbuf, char *) -PERLVAR(Iefloatsize, STRLEN) +PERLVAR(I, efloatbuf, char *) +PERLVAR(I, efloatsize, STRLEN) /* regex stuff */ -PERLVAR(Ireg_state, struct re_save_state) +PERLVAR(I, reg_state, struct re_save_state) -PERLVAR(Iregdummy, regnode) /* from regcomp.c */ +PERLVAR(I, regdummy, regnode) /* from regcomp.c */ -PERLVARI(Idumpindent, U16, 4) /* number of blanks per dump +PERLVARI(I, dumpindent, U16, 4) /* number of blanks per dump indentation level */ -PERLVAR(Iutf8locale, bool) /* utf8 locale detected */ -PERLVARI(Irehash_seed_set, bool, FALSE) /* 582 hash initialized? */ +PERLVAR(I, utf8locale, bool) /* utf8 locale detected */ +PERLVARI(I, rehash_seed_set, bool, FALSE) /* 582 hash initialized? */ -PERLVARA(Icolors,6, char *) /* from regcomp.c */ +PERLVARA(I, colors,6, char *) /* from regcomp.c */ /* =for apidoc Amn|peep_t|PL_peepp @@ -189,7 +189,7 @@ convenient to wrap the L</PL_rpeepp> hook. =cut */ -PERLVARI(Ipeepp, peep_t, Perl_peep) +PERLVARI(I, peepp, peep_t, Perl_peep) /* =for apidoc Amn|peep_t|PL_rpeepp @@ -213,7 +213,7 @@ to wrap the L</PL_peepp> hook. =cut */ -PERLVARI(Irpeepp, peep_t, Perl_rpeep) +PERLVARI(I, rpeepp, peep_t, Perl_rpeep) /* =for apidoc Amn|Perl_ophook_t|PL_opfreehook @@ -227,64 +227,64 @@ When you replace this variable, it is considered a good practice to store the po =cut */ -PERLVARI(Iopfreehook, Perl_ophook_t, 0) /* op_free() hook */ +PERLVARI(I, opfreehook, Perl_ophook_t, 0) /* op_free() hook */ /* Space for U32 */ -PERLVARI(Ireginterp_cnt,I32, 0) /* Whether "Regexp" was interpolated. */ -PERLVARI(Iwatchaddr, char **, 0) -PERLVAR(Iwatchok, char *) +PERLVARI(I, reginterp_cnt,I32, 0) /* Whether "Regexp" was interpolated. */ +PERLVARI(I, watchaddr, char **, 0) +PERLVAR(I, watchok, char *) /* the currently active slab in a chain of slabs of regmatch states, * and the currently active state within that slab */ -PERLVARI(Iregmatch_slab, regmatch_slab *, NULL) -PERLVAR(Iregmatch_state, regmatch_state *) +PERLVARI(I, regmatch_slab, regmatch_slab *, NULL) +PERLVAR(I, regmatch_state, regmatch_state *) /* Put anything new that is pointer aligned here. */ -PERLVAR(Idelaymagic, U16) /* ($<,$>) = ... */ -PERLVAR(Ilocalizing, U8) /* are we processing a local() list? */ -PERLVAR(Icolorset, bool) /* from regcomp.c */ -PERLVAR(Iin_eval, U8) /* trap "fatal" errors? */ -PERLVAR(Itainted, bool) /* using variables controlled by $< */ -PERLVAR(Itainting, bool) /* doing taint checks */ +PERLVAR(I, delaymagic, U16) /* ($<,$>) = ... */ +PERLVAR(I, localizing, U8) /* are we processing a local() list? */ +PERLVAR(I, colorset, bool) /* from regcomp.c */ +PERLVAR(I, in_eval, U8) /* trap "fatal" errors? */ +PERLVAR(I, tainted, bool) /* using variables controlled by $< */ +PERLVAR(I, tainting, bool) /* doing taint checks */ /* This value may be set when embedding for full cleanup */ /* 0=none, 1=full, 2=full with checks */ /* mod_perl is special, and also assigns a meaning -1 */ -PERLVARI(Iperl_destruct_level, signed char, 0) +PERLVARI(I, perl_destruct_level, signed char, 0) /* current phase the interpreter is in */ -PERLVARI(Iphase, enum perl_phase, PERL_PHASE_CONSTRUCT) +PERLVARI(I, phase, enum perl_phase, PERL_PHASE_CONSTRUCT) -PERLVAR(Iperldb, U32) +PERLVAR(I, perldb, U32) -PERLVAR(Isignals, U32) /* Using which pre-5.8 signals */ +PERLVAR(I, signals, U32) /* Using which pre-5.8 signals */ /* pseudo environmental stuff */ -PERLVAR(Iorigargc, int) -PERLVAR(Iorigargv, char **) -PERLVAR(Ienvgv, GV *) -PERLVAR(Iincgv, GV *) -PERLVAR(Ihintgv, GV *) -PERLVAR(Iorigfilename, char *) -PERLVAR(Idiehook, SV *) -PERLVAR(Iwarnhook, SV *) +PERLVAR(I, origargc, int) +PERLVAR(I, origargv, char **) +PERLVAR(I, envgv, GV *) +PERLVAR(I, incgv, GV *) +PERLVAR(I, hintgv, GV *) +PERLVAR(I, origfilename, char *) +PERLVAR(I, diehook, SV *) +PERLVAR(I, warnhook, SV *) /* switches */ -PERLVAR(Ipatchlevel, SV *) -PERLVAR(Iapiversion, SV *) -PERLVAR(Ilocalpatches, const char * const *) -PERLVARI(Isplitstr, const char *, " ") - -PERLVAR(Iminus_c, bool) -PERLVAR(Iminus_n, bool) -PERLVAR(Iminus_p, bool) -PERLVAR(Iminus_l, bool) -PERLVAR(Iminus_a, bool) -PERLVAR(Iminus_F, bool) -PERLVAR(Idoswitches, bool) -PERLVAR(Iminus_E, bool) +PERLVAR(I, patchlevel, SV *) +PERLVAR(I, apiversion, SV *) +PERLVAR(I, localpatches, const char * const *) +PERLVARI(I, splitstr, const char *, " ") + +PERLVAR(I, minus_c, bool) +PERLVAR(I, minus_n, bool) +PERLVAR(I, minus_p, bool) +PERLVAR(I, minus_l, bool) +PERLVAR(I, minus_a, bool) +PERLVAR(I, minus_F, bool) +PERLVAR(I, doswitches, bool) +PERLVAR(I, minus_E, bool) /* @@ -295,50 +295,50 @@ The C variable which corresponds to Perl's $^W warning variable. =cut */ -PERLVAR(Idowarn, U8) -PERLVAR(Isawampersand, bool) /* must save all match strings */ -PERLVAR(Iunsafe, bool) -PERLVAR(Iexit_flags, U8) /* was exit() unexpected, etc. */ -PERLVAR(Isrand_called, bool) -PERLVARI(Iin_load_module, bool, FALSE) /* to prevent recursions in PerlIO_find_layer */ +PERLVAR(I, dowarn, U8) +PERLVAR(I, sawampersand, bool) /* must save all match strings */ +PERLVAR(I, unsafe, bool) +PERLVAR(I, exit_flags, U8) /* was exit() unexpected, etc. */ +PERLVAR(I, srand_called, bool) +PERLVARI(I, in_load_module, bool, FALSE) /* to prevent recursions in PerlIO_find_layer */ /* Space for a U16 */ -PERLVAR(Iinplace, char *) -PERLVAR(Ie_script, SV *) +PERLVAR(I, inplace, char *) +PERLVAR(I, e_script, SV *) /* magical thingies */ -PERLVAR(Ibasetime, Time_t) /* $^T */ -PERLVAR(Iformfeed, SV *) /* $^L */ +PERLVAR(I, basetime, Time_t) /* $^T */ +PERLVAR(I, formfeed, SV *) /* $^L */ -PERLVARI(Imaxsysfd, I32, MAXSYSFD) +PERLVARI(I, maxsysfd, I32, MAXSYSFD) /* top fd to pass to subprocesses */ -PERLVAR(Istatusvalue, I32) /* $? */ +PERLVAR(I, statusvalue, I32) /* $? */ #ifdef VMS -PERLVAR(Istatusvalue_vms,U32) +PERLVAR(I, statusvalue_vms, U32) #else -PERLVAR(Istatusvalue_posix,I32) +PERLVAR(I, statusvalue_posix, I32) #endif -PERLVARI(Isig_pending, int,0) /* Number if highest signal pending */ -PERLVAR(Ipsig_pend, int *) /* per-signal "count" of pending */ +PERLVARI(I, sig_pending, int, 0) /* Number if highest signal pending */ +PERLVAR(I, psig_pend, int *) /* per-signal "count" of pending */ /* shortcuts to various I/O objects */ -PERLVAR(Istdingv, GV *) /* *STDIN */ -PERLVAR(Istderrgv, GV *) /* *STDERR */ -PERLVAR(Idefgv, GV *) -PERLVAR(Iargvgv, GV *) /* *ARGV */ -PERLVAR(Iargvoutgv, GV *) /* *ARGVOUT */ -PERLVAR(Iargvout_stack, AV *) +PERLVAR(I, stdingv, GV *) /* *STDIN */ +PERLVAR(I, stderrgv, GV *) /* *STDERR */ +PERLVAR(I, defgv, GV *) +PERLVAR(I, argvgv, GV *) /* *ARGV */ +PERLVAR(I, argvoutgv, GV *) /* *ARGVOUT */ +PERLVAR(I, argvout_stack, AV *) /* shortcuts to regexp stuff */ -PERLVAR(Ireplgv, GV *) /* *^R */ +PERLVAR(I, replgv, GV *) /* *^R */ /* shortcuts to misc objects */ -PERLVAR(Ierrgv, GV *) /* *@ */ +PERLVAR(I, errgv, GV *) /* *@ */ /* shortcuts to debugging objects */ -PERLVAR(IDBgv, GV *) /* *DB::DB */ -PERLVAR(IDBline, GV *) /* *DB::line */ +PERLVAR(I, DBgv, GV *) /* *DB::DB */ +PERLVAR(I, DBline, GV *) /* *DB::line */ /* =for apidoc mn|GV *|PL_DBsub @@ -362,71 +362,71 @@ variable. See C<PL_DBsingle>. =cut */ -PERLVAR(IDBsub, GV *) /* *DB::sub */ -PERLVAR(IDBsingle, SV *) /* $DB::single */ -PERLVAR(IDBtrace, SV *) /* $DB::trace */ -PERLVAR(IDBsignal, SV *) /* $DB::signal */ -PERLVAR(Idbargs, AV *) /* args to call listed by caller function */ +PERLVAR(I, DBsub, GV *) /* *DB::sub */ +PERLVAR(I, DBsingle, SV *) /* $DB::single */ +PERLVAR(I, DBtrace, SV *) /* $DB::trace */ +PERLVAR(I, DBsignal, SV *) /* $DB::signal */ +PERLVAR(I, dbargs, AV *) /* args to call listed by caller function */ /* symbol tables */ -PERLVAR(Idebstash, HV *) /* symbol table for perldb package */ -PERLVAR(Iglobalstash, HV *) /* global keyword overrides imported here */ -PERLVAR(Icurstname, SV *) /* name of current package */ -PERLVAR(Ibeginav, AV *) /* names of BEGIN subroutines */ -PERLVAR(Iendav, AV *) /* names of END subroutines */ -PERLVAR(Iunitcheckav, AV *) /* names of UNITCHECK subroutines */ -PERLVAR(Icheckav, AV *) /* names of CHECK subroutines */ -PERLVAR(Iinitav, AV *) /* names of INIT subroutines */ -PERLVAR(Istrtab, HV *) /* shared string table */ -PERLVARI(Isub_generation,U32,1) /* incr to invalidate method cache */ +PERLVAR(I, debstash, HV *) /* symbol table for perldb package */ +PERLVAR(I, globalstash, HV *) /* global keyword overrides imported here */ +PERLVAR(I, curstname, SV *) /* name of current package */ +PERLVAR(I, beginav, AV *) /* names of BEGIN subroutines */ +PERLVAR(I, endav, AV *) /* names of END subroutines */ +PERLVAR(I, unitcheckav, AV *) /* names of UNITCHECK subroutines */ +PERLVAR(I, checkav, AV *) /* names of CHECK subroutines */ +PERLVAR(I, initav, AV *) /* names of INIT subroutines */ +PERLVAR(I, strtab, HV *) /* shared string table */ +PERLVARI(I, sub_generation, U32, 1) /* incr to invalidate method cache */ /* funky return mechanisms */ -PERLVAR(Iforkprocess, int) /* so do_open |- can return proc# */ +PERLVAR(I, forkprocess, int) /* so do_open |- can return proc# */ /* memory management */ -PERLVAR(Isv_count, I32) /* how many SV* are currently allocated */ -PERLVAR(Isv_objcount, I32) /* how many objects are currently allocated */ -PERLVAR(Isv_root, SV*) /* storage for SVs belonging to interp */ -PERLVAR(Isv_arenaroot, SV*) /* list of areas for garbage collection */ +PERLVAR(I, sv_count, I32) /* how many SV* are currently allocated */ +PERLVAR(I, sv_objcount, I32) /* how many objects are currently allocated */ +PERLVAR(I, sv_root, SV *) /* storage for SVs belonging to interp */ +PERLVAR(I, sv_arenaroot, SV *) /* list of areas for garbage collection */ /* subprocess state */ -PERLVAR(Ifdpid, AV *) /* keep fd-to-pid mappings for my_popen */ +PERLVAR(I, fdpid, AV *) /* keep fd-to-pid mappings for my_popen */ /* internal state */ -PERLVARI(Iop_mask, char *, NULL) /* masked operations for safe evals */ +PERLVARI(I, op_mask, char *, NULL) /* masked operations for safe evals */ /* current interpreter roots */ -PERLVAR(Imain_cv, CV *) -PERLVAR(Imain_root, OP *) -PERLVAR(Imain_start, OP *) -PERLVAR(Ieval_root, OP *) -PERLVAR(Ieval_start, OP *) +PERLVAR(I, main_cv, CV *) +PERLVAR(I, main_root, OP *) +PERLVAR(I, main_start, OP *) +PERLVAR(I, eval_root, OP *) +PERLVAR(I, eval_start, OP *) /* runtime control stuff */ -PERLVARI(Icurcopdb, COP *, NULL) +PERLVARI(I, curcopdb, COP *, NULL) -PERLVAR(Ifilemode, int) /* so nextargv() can preserve mode */ -PERLVAR(Ilastfd, int) /* what to preserve mode on */ -PERLVAR(Ioldname, char *) /* what to preserve mode on */ -PERLVAR(IArgv, const char **) /* stuff to free from do_aexec, vfork safe */ -PERLVAR(ICmd, char *) /* stuff to free from do_aexec, vfork safe */ +PERLVAR(I, filemode, int) /* so nextargv() can preserve mode */ +PERLVAR(I, lastfd, int) /* what to preserve mode on */ +PERLVAR(I, oldname, char *) /* what to preserve mode on */ +PERLVAR(I, Argv, const char **) /* stuff to free from do_aexec, vfork safe */ +PERLVAR(I, Cmd, char *) /* stuff to free from do_aexec, vfork safe */ /* Elements in this array have ';' appended and are injected as a single line into the tokeniser. You can't put any (literal) newlines into any program you stuff in into this array, as the point where it's injected is expecting a single physical line. */ -PERLVAR(Ipreambleav, AV *) -PERLVAR(Imess_sv, SV *) -PERLVAR(Iors_sv, SV *) /* output record separator $\ */ +PERLVAR(I, preambleav, AV *) +PERLVAR(I, mess_sv, SV *) +PERLVAR(I, ors_sv, SV *) /* output record separator $\ */ /* statics moved here for shared library purposes */ -PERLVARI(Igensym, I32, 0) /* next symbol for getsym() to define */ -PERLVARI(Icv_has_eval, bool, FALSE) /* PL_compcv includes an entereval or similar */ -PERLVAR(Itaint_warn, bool) /* taint warns instead of dying */ -PERLVARI(Ilaststype, U16, OP_STAT) -PERLVARI(Ilaststatval, int, -1) +PERLVARI(I, gensym, I32, 0) /* next symbol for getsym() to define */ +PERLVARI(I, cv_has_eval, bool, FALSE) /* PL_compcv includes an entereval or similar */ +PERLVAR(I, taint_warn, bool) /* taint warns instead of dying */ +PERLVARI(I, laststype, U16, OP_STAT) +PERLVARI(I, laststatval, int, -1) /* interpreter atexit processing */ -PERLVARI(Iexitlistlen, I32, 0) /* length of same */ -PERLVARI(Iexitlist, PerlExitListEntry *, NULL) +PERLVARI(I, exitlistlen, I32, 0) /* length of same */ +PERLVARI(I, exitlist, PerlExitListEntry *, NULL) /* list of exit functions */ /* @@ -441,38 +441,38 @@ prefixed by the package name of the extension that owns the data. =cut */ -PERLVAR(Imodglobal, HV *) /* per-interp module data */ +PERLVAR(I, modglobal, HV *) /* per-interp module data */ /* these used to be in global before 5.004_68 */ -PERLVARI(Iprofiledata, U32 *, NULL) /* table of ops, counts */ +PERLVARI(I, profiledata, U32 *, NULL) /* table of ops, counts */ -PERLVAR(Icompiling, COP) /* compiling/done executing marker */ +PERLVAR(I, compiling, COP) /* compiling/done executing marker */ -PERLVAR(Icompcv, CV *) /* currently compiling subroutine */ -PERLVAR(Icomppad, AV *) /* storage for lexically scoped temporaries */ -PERLVAR(Icomppad_name, AV *) /* variable names for "my" variables */ -PERLVAR(Icomppad_name_fill, I32) /* last "introduced" variable offset */ -PERLVAR(Icomppad_name_floor, I32) /* start of vars in innermost block */ +PERLVAR(I, compcv, CV *) /* currently compiling subroutine */ +PERLVAR(I, comppad, AV *) /* storage for lexically scoped temporaries */ +PERLVAR(I, comppad_name, AV *) /* variable names for "my" variables */ +PERLVAR(I, comppad_name_fill, I32) /* last "introduced" variable offset */ +PERLVAR(I, comppad_name_floor, I32) /* start of vars in innermost block */ #ifdef HAVE_INTERP_INTERN -PERLVAR(Isys_intern, struct interp_intern) +PERLVAR(I, sys_intern, struct interp_intern) /* platform internals */ #endif /* more statics moved here */ -PERLVAR(IDBcv, CV *) /* from perl.c */ -PERLVARI(Igeneration, int, 100) /* from op.c */ +PERLVAR(I, DBcv, CV *) /* from perl.c */ +PERLVARI(I, generation, int, 100) /* from op.c */ -PERLVARI(Iin_clean_objs,bool, FALSE) /* from sv.c */ -PERLVARI(Iin_clean_all, bool, FALSE) /* ptrs to freed SVs now legal */ -PERLVAR(Inomemok, bool) /* let malloc context handle nomem */ -PERLVARI(Isavebegin, bool, FALSE) /* save BEGINs for compiler */ +PERLVARI(I, in_clean_objs,bool, FALSE) /* from sv.c */ +PERLVARI(I, in_clean_all, bool, FALSE) /* ptrs to freed SVs now legal */ +PERLVAR(I, nomemok, bool) /* let malloc context handle nomem */ +PERLVARI(I, savebegin, bool, FALSE) /* save BEGINs for compiler */ -PERLVAR(Iuid, Uid_t) /* current real user id */ -PERLVAR(Ieuid, Uid_t) /* current effective user id */ -PERLVAR(Igid, Gid_t) /* current real group id */ -PERLVAR(Iegid, Gid_t) /* current effective group id */ -PERLVARI(Ian, U32, 0) /* malloc sequence number */ +PERLVAR(I, uid, Uid_t) /* current real user id */ +PERLVAR(I, euid, Uid_t) /* current effective user id */ +PERLVAR(I, gid, Gid_t) /* current real group id */ +PERLVAR(I, egid, Gid_t) /* current effective group id */ +PERLVARI(I, an, U32, 0) /* malloc sequence number */ #ifdef DEBUGGING /* exercise wrap-around */ @@ -480,26 +480,26 @@ PERLVARI(Ian, U32, 0) /* malloc sequence number */ #else #define PERL_COP_SEQMAX 0 #endif -PERLVARI(Icop_seqmax, U32, PERL_COP_SEQMAX) /* statement sequence number */ +PERLVARI(I, cop_seqmax, U32, PERL_COP_SEQMAX) /* statement sequence number */ #undef PERL_COP_SEQMAX -PERLVARI(Ievalseq, U32, 0) /* eval sequence number */ -PERLVAR(Iorigalen, U32) -PERLVAR(Iorigenviron, char **) +PERLVARI(I, evalseq, U32, 0) /* eval sequence number */ +PERLVAR(I, origalen, U32) +PERLVAR(I, origenviron, char **) #ifdef PERL_USES_PL_PIDSTATUS -PERLVAR(Ipidstatus, HV *) /* pid-to-status mappings for waitpid */ +PERLVAR(I, pidstatus, HV *) /* pid-to-status mappings for waitpid */ #endif -PERLVAR(Iosname, char *) /* operating system */ +PERLVAR(I, osname, char *) /* operating system */ -PERLVAR(Isighandlerp, Sighandler_t) +PERLVAR(I, sighandlerp, Sighandler_t) -PERLVARA(Ibody_roots, PERL_ARENA_ROOTS_SIZE, void*) /* array of body roots */ +PERLVARA(I, body_roots, PERL_ARENA_ROOTS_SIZE, void*) /* array of body roots */ -PERLVAR(Iunicode, U32) /* Unicode features: $ENV{PERL_UNICODE} or -C */ +PERLVAR(I, unicode, U32) /* Unicode features: $ENV{PERL_UNICODE} or -C */ -PERLVARI(Imaxo, int, MAXO) /* maximum number of ops */ +PERLVARI(I, maxo, int, MAXO) /* maximum number of ops */ -PERLVARI(Irunops, runops_proc_t, RUNOPS_DEFAULT) +PERLVARI(I, runops, runops_proc_t, RUNOPS_DEFAULT) /* =for apidoc Amn|SV|PL_sv_undef @@ -516,35 +516,35 @@ C<&PL_sv_yes>. =cut */ -PERLVAR(Isv_undef, SV) -PERLVAR(Isv_no, SV) -PERLVAR(Isv_yes, SV) +PERLVAR(I, sv_undef, SV) +PERLVAR(I, sv_no, SV) +PERLVAR(I, sv_yes, SV) -PERLVAR(Isubname, SV *) /* name of current subroutine */ +PERLVAR(I, subname, SV *) /* name of current subroutine */ -PERLVAR(Isubline, I32) /* line this subroutine began on */ -PERLVAR(Imin_intro_pending, I32) /* start of vars to introduce */ +PERLVAR(I, subline, I32) /* line this subroutine began on */ +PERLVAR(I, min_intro_pending, I32) /* start of vars to introduce */ -PERLVAR(Imax_intro_pending, I32) /* end of vars to introduce */ -PERLVAR(Ipadix, I32) /* max used index in current "register" pad */ +PERLVAR(I, max_intro_pending, I32) /* end of vars to introduce */ +PERLVAR(I, padix, I32) /* max used index in current "register" pad */ -PERLVAR(Ipadix_floor, I32) /* how low may inner block reset padix */ +PERLVAR(I, padix_floor, I32) /* how low may inner block reset padix */ -PERLVAR(Ihints, U32) /* pragma-tic compile-time flags */ +PERLVAR(I, hints, U32) /* pragma-tic compile-time flags */ -PERLVAR(Idebug, VOL U32) /* flags given to -D switch */ +PERLVAR(I, debug, VOL U32) /* flags given to -D switch */ /* Perl_Ibreakable_sub_generation_ptr was too long for VMS, hence "gen" */ -PERLVARI(Ibreakable_sub_gen, U32, 0) +PERLVARI(I, breakable_sub_gen, U32, 0) -PERLVARI(Iamagic_generation, long, 0) +PERLVARI(I, amagic_generation, long, 0) #ifdef USE_LOCALE_COLLATE -PERLVAR(Icollation_name,char *) /* Name of current collation */ -PERLVAR(Icollxfrm_base, Size_t) /* Basic overhead in *xfrm() */ -PERLVARI(Icollxfrm_mult,Size_t, 2) /* Expansion factor in *xfrm() */ -PERLVARI(Icollation_ix, U32, 0) /* Collation generation index */ -PERLVARI(Icollation_standard, bool, TRUE) +PERLVAR(I, collation_name, char *) /* Name of current collation */ +PERLVAR(I, collxfrm_base, Size_t) /* Basic overhead in *xfrm() */ +PERLVARI(I, collxfrm_mult,Size_t, 2) /* Expansion factor in *xfrm() */ +PERLVARI(I, collation_ix, U32, 0) /* Collation generation index */ +PERLVARI(I, collation_standard, bool, TRUE) /* Assume simple collation */ #endif /* USE_LOCALE_COLLATE */ @@ -554,99 +554,99 @@ PERLVARI(Icollation_standard, bool, TRUE) #else # define PERL___I 1 #endif -PERLVARI(Iutf8cache, I8, PERL___I) /* Is the utf8 caching code enabled? */ +PERLVARI(I, utf8cache, I8, PERL___I) /* Is the utf8 caching code enabled? */ #undef PERL___I #ifdef USE_LOCALE_NUMERIC -PERLVARI(Inumeric_standard, bool, TRUE) +PERLVARI(I, numeric_standard, bool, TRUE) /* Assume simple numerics */ -PERLVARI(Inumeric_local, bool, TRUE) +PERLVARI(I, numeric_local, bool, TRUE) /* Assume local numerics */ -PERLVAR(Inumeric_name, char *) /* Name of current numeric locale */ -PERLVAR(Inumeric_radix_sv, SV *) /* The radix separator if not '.' */ +PERLVAR(I, numeric_name, char *) /* Name of current numeric locale */ +PERLVAR(I, numeric_radix_sv, SV *) /* The radix separator if not '.' */ #endif /* !USE_LOCALE_NUMERIC */ /* utf8 character classes */ -PERLVAR(Iutf8_alnum, SV *) -PERLVAR(Iutf8_ascii, SV *) -PERLVAR(Iutf8_alpha, SV *) -PERLVAR(Iutf8_space, SV *) -PERLVAR(Iutf8_perl_space, SV *) -PERLVAR(Iutf8_perl_word, SV *) -PERLVAR(Iutf8_posix_digit, SV *) -PERLVAR(Iutf8_cntrl, SV *) -PERLVAR(Iutf8_graph, SV *) -PERLVAR(Iutf8_digit, SV *) -PERLVAR(Iutf8_upper, SV *) -PERLVAR(Iutf8_lower, SV *) -PERLVAR(Iutf8_print, SV *) -PERLVAR(Iutf8_punct, SV *) -PERLVAR(Iutf8_xdigit, SV *) -PERLVAR(Iutf8_mark, SV *) -PERLVAR(Iutf8_X_begin, SV *) -PERLVAR(Iutf8_X_extend, SV *) -PERLVAR(Iutf8_X_prepend, SV *) -PERLVAR(Iutf8_X_non_hangul, SV *) -PERLVAR(Iutf8_X_L, SV *) -PERLVAR(Iutf8_X_LV, SV *) -PERLVAR(Iutf8_X_LVT, SV *) -PERLVAR(Iutf8_X_T, SV *) -PERLVAR(Iutf8_X_V, SV *) -PERLVAR(Iutf8_X_LV_LVT_V, SV *) -PERLVAR(Iutf8_toupper, SV *) -PERLVAR(Iutf8_totitle, SV *) -PERLVAR(Iutf8_tolower, SV *) -PERLVAR(Iutf8_tofold, SV *) -PERLVAR(Ilast_swash_hv, HV *) -PERLVAR(Ilast_swash_tmps, U8 *) -PERLVAR(Ilast_swash_slen, STRLEN) -PERLVARA(Ilast_swash_key,10, U8) -PERLVAR(Ilast_swash_klen, U8) /* Only needs to store 0-10 */ +PERLVAR(I, utf8_alnum, SV *) +PERLVAR(I, utf8_ascii, SV *) +PERLVAR(I, utf8_alpha, SV *) +PERLVAR(I, utf8_space, SV *) +PERLVAR(I, utf8_perl_space, SV *) +PERLVAR(I, utf8_perl_word, SV *) +PERLVAR(I, utf8_posix_digit, SV *) +PERLVAR(I, utf8_cntrl, SV *) +PERLVAR(I, utf8_graph, SV *) +PERLVAR(I, utf8_digit, SV *) +PERLVAR(I, utf8_upper, SV *) +PERLVAR(I, utf8_lower, SV *) +PERLVAR(I, utf8_print, SV *) +PERLVAR(I, utf8_punct, SV *) +PERLVAR(I, utf8_xdigit, SV *) +PERLVAR(I, utf8_mark, SV *) +PERLVAR(I, utf8_X_begin, SV *) +PERLVAR(I, utf8_X_extend, SV *) +PERLVAR(I, utf8_X_prepend, SV *) +PERLVAR(I, utf8_X_non_hangul, SV *) +PERLVAR(I, utf8_X_L, SV *) +PERLVAR(I, utf8_X_LV, SV *) +PERLVAR(I, utf8_X_LVT, SV *) +PERLVAR(I, utf8_X_T, SV *) +PERLVAR(I, utf8_X_V, SV *) +PERLVAR(I, utf8_X_LV_LVT_V, SV *) +PERLVAR(I, utf8_toupper, SV *) +PERLVAR(I, utf8_totitle, SV *) +PERLVAR(I, utf8_tolower, SV *) +PERLVAR(I, utf8_tofold, SV *) +PERLVAR(I, last_swash_hv, HV *) +PERLVAR(I, last_swash_tmps, U8 *) +PERLVAR(I, last_swash_slen, STRLEN) +PERLVARA(I, last_swash_key,10, U8) +PERLVAR(I, last_swash_klen, U8) /* Only needs to store 0-10 */ #ifdef FCRYPT -PERLVARI(Icryptseen, bool, FALSE) /* has fast crypt() been initialized? */ +PERLVARI(I, cryptseen, bool, FALSE) /* has fast crypt() been initialized? */ #endif -PERLVAR(Ipad_reset_pending, bool) /* reset pad on next attempted alloc */ +PERLVAR(I, pad_reset_pending, bool) /* reset pad on next attempted alloc */ -PERLVARI(Iglob_index, int, 0) +PERLVARI(I, glob_index, int, 0) -PERLVAR(Iparser, yy_parser *) /* current parser state */ +PERLVAR(I, parser, yy_parser *) /* current parser state */ /* Array of signal handlers, indexed by signal number, through which the C signal handler dispatches. */ -PERLVAR(Ipsig_ptr, SV**) +PERLVAR(I, psig_ptr, SV **) /* Array of names of signals, indexed by signal number, for (re)use as the first argument to a signal handler. Only one block of memory is allocated for both psig_name and psig_ptr. */ -PERLVAR(Ipsig_name, SV**) +PERLVAR(I, psig_name, SV **) #if defined(PERL_IMPLICIT_SYS) -PERLVAR(IMem, struct IPerlMem*) -PERLVAR(IMemShared, struct IPerlMem*) -PERLVAR(IMemParse, struct IPerlMem*) -PERLVAR(IEnv, struct IPerlEnv*) -PERLVAR(IStdIO, struct IPerlStdIO*) -PERLVAR(ILIO, struct IPerlLIO*) -PERLVAR(IDir, struct IPerlDir*) -PERLVAR(ISock, struct IPerlSock*) -PERLVAR(IProc, struct IPerlProc*) +PERLVAR(I, Mem, struct IPerlMem *) +PERLVAR(I, MemShared, struct IPerlMem *) +PERLVAR(I, MemParse, struct IPerlMem *) +PERLVAR(I, Env, struct IPerlEnv *) +PERLVAR(I, StdIO, struct IPerlStdIO *) +PERLVAR(I, LIO, struct IPerlLIO *) +PERLVAR(I, Dir, struct IPerlDir *) +PERLVAR(I, Sock, struct IPerlSock *) +PERLVAR(I, Proc, struct IPerlProc *) #endif -PERLVAR(Iptr_table, PTR_TBL_t*) -PERLVARI(Ibeginav_save, AV*, NULL) /* save BEGIN{}s when compiling */ +PERLVAR(I, ptr_table, PTR_TBL_t *) +PERLVARI(I, beginav_save, AV *, NULL) /* save BEGIN{}s when compiling */ -PERLVAR(Ibody_arenas, void*) /* pointer to list of body-arenas */ +PERLVAR(I, body_arenas, void *) /* pointer to list of body-arenas */ #if defined(USE_ITHREADS) -PERLVAR(Iregex_pad, SV**) /* Shortcut into the array of +PERLVAR(I, regex_pad, SV **) /* Shortcut into the array of regex_padav */ -PERLVAR(Iregex_padav, AV*) /* All regex objects, indexed via the +PERLVAR(I, regex_padav, AV *) /* All regex objects, indexed via the values in op_pmoffset of pmop. Entry 0 is an SV whose PV is a "packed" list of IVs listing @@ -654,82 +654,83 @@ PERLVAR(Iregex_padav, AV*) /* All regex objects, indexed via the #endif #ifdef USE_REENTRANT_API -PERLVAR(Ireentrant_buffer, REENTR*) /* here we store the _r buffers */ +PERLVAR(I, reentrant_buffer, REENTR *) /* here we store the _r buffers */ #endif -PERLVAR(Icustom_op_names, HV*) /* Names of user defined ops */ -PERLVAR(Icustom_op_descs, HV*) /* Descriptions of user defined ops */ +PERLVAR(I, custom_op_names, HV *) /* Names of user defined ops */ +PERLVAR(I, custom_op_descs, HV *) /* Descriptions of user defined ops */ #ifdef PERLIO_LAYERS -PERLVARI(Iperlio, PerlIOl *,NULL) -PERLVARI(Iknown_layers, PerlIO_list_t *,NULL) -PERLVARI(Idef_layerlist, PerlIO_list_t *,NULL) +PERLVARI(I, perlio, PerlIOl *, NULL) +PERLVARI(I, known_layers, PerlIO_list_t *, NULL) +PERLVARI(I, def_layerlist, PerlIO_list_t *, NULL) #endif -PERLVARI(Iencoding, SV*, NULL) /* character encoding */ +PERLVARI(I, encoding, SV *, NULL) /* character encoding */ -PERLVAR(Idebug_pad, struct perl_debug_pad) /* always needed because of the re extension */ +PERLVAR(I, debug_pad, struct perl_debug_pad) /* always needed because of the re extension */ -PERLVAR(Iutf8_idstart, SV *) -PERLVAR(Iutf8_idcont, SV *) -PERLVAR(Iutf8_xidstart, SV *) -PERLVAR(Iutf8_xidcont, SV *) +PERLVAR(I, utf8_idstart, SV *) +PERLVAR(I, utf8_idcont, SV *) +PERLVAR(I, utf8_xidstart, SV *) +PERLVAR(I, utf8_xidcont, SV *) -PERLVAR(Isort_RealCmp, SVCOMPARE_t) +PERLVAR(I, sort_RealCmp, SVCOMPARE_t) -PERLVARI(Icheckav_save, AV*, NULL) /* save CHECK{}s when compiling */ -PERLVARI(Iunitcheckav_save, AV*, NULL) /* save UNITCHECK{}s when compiling */ +PERLVARI(I, checkav_save, AV *, NULL) /* save CHECK{}s when compiling */ +PERLVARI(I, unitcheckav_save, AV *, NULL) + /* save UNITCHECK{}s when compiling */ -PERLVARI(Iclocktick, long, 0) /* this many times() ticks in a second */ +PERLVARI(I, clocktick, long, 0) /* this many times() ticks in a second */ -PERLVAR(Istashcache, HV *) /* Cache to speed up S_method_common */ +PERLVAR(I, stashcache, HV *) /* Cache to speed up S_method_common */ /* Hooks to shared SVs and locks. */ -PERLVARI(Isharehook, share_proc_t, Perl_sv_nosharing) -PERLVARI(Ilockhook, share_proc_t, Perl_sv_nosharing) +PERLVARI(I, sharehook, share_proc_t, Perl_sv_nosharing) +PERLVARI(I, lockhook, share_proc_t, Perl_sv_nosharing) #ifdef NO_MATHOMS # define PERL_UNLOCK_HOOK Perl_sv_nosharing #else /* This reference ensures that the mathoms are linked with perl */ # define PERL_UNLOCK_HOOK Perl_sv_nounlocking #endif -PERLVARI(Iunlockhook, share_proc_t, PERL_UNLOCK_HOOK) +PERLVARI(I, unlockhook, share_proc_t, PERL_UNLOCK_HOOK) -PERLVARI(Ithreadhook, thrhook_proc_t, Perl_nothreadhook) +PERLVARI(I, threadhook, thrhook_proc_t, Perl_nothreadhook) /* Can shared object be destroyed */ -PERLVARI(Idestroyhook, destroyable_proc_t, Perl_sv_destroyable) +PERLVARI(I, destroyhook, destroyable_proc_t, Perl_sv_destroyable) #ifndef PERL_MICRO -PERLVARI(Isignalhook, despatch_signals_proc_t, Perl_despatch_signals) +PERLVARI(I, signalhook, despatch_signals_proc_t, Perl_despatch_signals) #endif -PERLVARI(Ihash_seed, UV, 0) /* Hash initializer */ +PERLVARI(I, hash_seed, UV, 0) /* Hash initializer */ -PERLVARI(Irehash_seed, UV, 0) /* 582 hash initializer */ +PERLVARI(I, rehash_seed, UV, 0) /* 582 hash initializer */ -PERLVARI(Iisarev, HV*, NULL) /* Reverse map of @ISA dependencies */ +PERLVARI(I, isarev, HV *, NULL) /* Reverse map of @ISA dependencies */ /* Register of known Method Resolution Orders. What this actually points to is an implementation detail (it may change to a structure incorporating a reference count - use mro_get_from_name to retrieve a C<struct mro_alg *> */ -PERLVAR(Iregistered_mros, HV *) +PERLVAR(I, registered_mros, HV *) /* Compile-time block start/end hooks */ -PERLVAR(Iblockhooks, AV *) +PERLVAR(I, blockhooks, AV *) /* Everything that folds to a given character, for case insensitivity regex * matching */ -PERLVARI(Iutf8_foldclosures, HV *, NULL) +PERLVARI(I, utf8_foldclosures, HV *, NULL) /* List of characters that participate in folds (except marks, etc in * multi-char folds) */ -PERLVARI(Iutf8_foldable, SV *, NULL) +PERLVARI(I, utf8_foldable, SV *, NULL) -PERLVAR(Icustom_ops, HV *) /* custom op registrations */ +PERLVAR(I, custom_ops, HV *) /* custom op registrations */ -PERLVAR(Ireentrant_retint, int) /* Integer return value from reentrant functions */ +PERLVAR(I, reentrant_retint, int) /* Integer return value from reentrant functions */ /* The last unconditional member of the interpreter structure when 5.10.0 was released. The offset of the end of this is baked into a global variable in @@ -738,47 +739,47 @@ PERLVAR(Ireentrant_retint, int) /* Integer return value from reentrant functions #define PERL_LAST_5_16_0_INTERP_MEMBER Ireentrant_retint #ifdef PERL_IMPLICIT_CONTEXT -PERLVARI(Imy_cxt_size, int, 0) /* size of PL_my_cxt_list */ -PERLVARI(Imy_cxt_list, void **, NULL) /* per-module array of MY_CXT pointers */ +PERLVARI(I, my_cxt_size, int, 0) /* size of PL_my_cxt_list */ +PERLVARI(I, my_cxt_list, void **, NULL) /* per-module array of MY_CXT pointers */ # ifdef PERL_GLOBAL_STRUCT_PRIVATE -PERLVARI(Imy_cxt_keys, const char **, NULL) /* per-module array of pointers to MY_CXT_KEY constants */ +PERLVARI(I, my_cxt_keys, const char **, NULL) /* per-module array of pointers to MY_CXT_KEY constants */ # endif #endif #ifdef PERL_TRACK_MEMPOOL /* For use with the memory debugging code in util.c */ -PERLVAR(Imemory_debug_header, struct perl_memory_debug_header) +PERLVAR(I, memory_debug_header, struct perl_memory_debug_header) #endif #ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP /* File descriptor to talk to the child which dumps scalars. */ -PERLVARI(Idumper_fd, int, -1) +PERLVARI(I, dumper_fd, int, -1) #endif /* Stores the PPID */ #ifdef THREADS_HAVE_PIDS -PERLVARI(Ippid, IV, 0) +PERLVARI(I, ppid, IV, 0) #endif #ifdef PERL_MAD -PERLVARI(Imadskills, bool, FALSE) /* preserve all syntactic info */ +PERLVARI(I, madskills, bool, FALSE) /* preserve all syntactic info */ /* (MAD = Misc Attribute Decoration) */ -PERLVARI(Ixmlfp, PerlIO *,NULL) +PERLVARI(I, xmlfp, PerlIO *, NULL) #endif #ifdef PL_OP_SLAB_ALLOC -PERLVAR(IOpPtr,I32 **) -PERLVARI(IOpSpace,I32,0) -PERLVAR(IOpSlab,I32 *) +PERLVAR(I, OpPtr, I32 **) +PERLVARI(I, OpSpace, I32, 0) +PERLVAR(I, OpSlab, I32 *) #endif #ifdef PERL_DEBUG_READONLY_OPS -PERLVARI(Islabs, I32**, NULL) /* Array of slabs that have been allocated */ -PERLVARI(Islab_count, U32, 0) /* Size of the array */ +PERLVARI(I, slabs, I32**, NULL) /* Array of slabs that have been allocated */ +PERLVARI(I, slab_count, U32, 0) /* Size of the array */ #endif #ifdef DEBUG_LEAKING_SCALARS -PERLVARI(Isv_serial, U32, 0) /* SV serial number, used in sv.c */ +PERLVARI(I, sv_serial, U32, 0) /* SV serial number, used in sv.c */ #endif /* If you are adding a U8 or U16, check to see if there are 'Space' comments diff --git a/makedef.pl b/makedef.pl index 6a31582e5a..5841d69f19 100644 --- a/makedef.pl +++ b/makedef.pl @@ -177,7 +177,7 @@ sub readvar { while (<$vars>) { # All symbols have a Perl_ prefix because that's what embed.h sticks # in front of them. The A?I?S?C? is strictly speaking wrong. - next unless /\bPERLVAR(A?I?S?C?)\(([IGT])(\w+)/; + next unless /\bPERLVAR(A?I?S?C?)\(([IGT]),\s*(\w+)/; my $var = "PL_$3"; my $symbol = $proc ? &$proc($1,$2,$3) : $var; @@ -3480,14 +3480,14 @@ S_init_interp(pTHX) { dVAR; #ifdef MULTIPLICITY -# define PERLVAR(var,type) -# define PERLVARA(var,n,type) +# define PERLVAR(prefix,var,type) +# define PERLVARA(prefix,var,n,type) # if defined(PERL_IMPLICIT_CONTEXT) -# define PERLVARI(var,type,init) aTHX->var = init; -# define PERLVARIC(var,type,init) aTHX->var = init; +# define PERLVARI(prefix,var,type,init) aTHX->prefix##var = init; +# define PERLVARIC(prefix,var,type,init) aTHX->prefix##var = init; # else -# define PERLVARI(var,type,init) PERL_GET_INTERP->var = init; -# define PERLVARIC(var,type,init) PERL_GET_INTERP->var = init; +# define PERLVARI(prefix,var,type,init) PERL_GET_INTERP->var = init; +# define PERLVARIC(prefix,var,type,init) PERL_GET_INTERP->var = init; # endif # include "intrpvar.h" # undef PERLVAR @@ -3495,10 +3495,10 @@ S_init_interp(pTHX) # undef PERLVARI # undef PERLVARIC #else -# define PERLVAR(var,type) -# define PERLVARA(var,n,type) -# define PERLVARI(var,type,init) PL_##var = init; -# define PERLVARIC(var,type,init) PL_##var = init; +# define PERLVAR(prefix,var,type) +# define PERLVARA(prefix,var,n,type) +# define PERLVARI(prefix,var,type,init) PL_##var = init; +# define PERLVARIC(prefix,var,type,init) PL_##var = init; # include "intrpvar.h" # undef PERLVAR # undef PERLVARA @@ -4935,10 +4935,10 @@ struct interpreter { */ /* Set up PERLVAR macros for populating structs */ -# define PERLVAR(var,type) type var; -# define PERLVARA(var,n,type) type var[n]; -# define PERLVARI(var,type,init) type var; -# define PERLVARIC(var,type,init) type var; +# define PERLVAR(prefix,var,type) type prefix##var; +# define PERLVARA(prefix,var,n,type) type prefix##var[n]; +# define PERLVARI(prefix,var,type,init) type prefix##var; +# define PERLVARIC(prefix,var,type,init) type prefix##var; struct interpreter { # include "intrpvar.h" @@ -5037,10 +5037,10 @@ struct tempsym; /* defined in pp_pack.c */ * these include variables that would have been their struct-s */ -#define PERLVAR(var,type) EXT type PL_##var; -#define PERLVARA(var,n,type) EXT type PL_##var[n]; -#define PERLVARI(var,type,init) EXT type PL_##var INIT(init); -#define PERLVARIC(var,type,init) EXTCONST type PL_##var INIT(init); +#define PERLVAR(prefix,var,type) EXT type PL_##var; +#define PERLVARA(prefix,var,n,type) EXT type PL_##var[n]; +#define PERLVARI(prefix,var,type,init) EXT type PL_##var INIT(init); +#define PERLVARIC(prefix,var,type,init) EXTCONST type PL_##var INIT(init); #if !defined(MULTIPLICITY) START_EXTERN_C @@ -34,17 +34,17 @@ START_EXTERN_C #undef PERLVARI -#define PERLVARI(v,t,i) PERLVAR(v,t) +#define PERLVARI(p,v,t,i) PERLVAR(p,v,t) #undef PERLVAR #undef PERLVARA -#define PERLVAR(v,t) t* Perl_##v##_ptr(pTHX) \ +#define PERLVAR(p,v,t) t* Perl_##p##v##_ptr(pTHX) \ { dVAR; PERL_UNUSED_CONTEXT; return &(PL_##v); } -#define PERLVARA(v,n,t) PL_##v##_t* Perl_##v##_ptr(pTHX) \ +#define PERLVARA(p,v,n,t) PL_##v##_t* Perl_##p##v##_ptr(pTHX) \ { dVAR; PERL_UNUSED_CONTEXT; return &(PL_##v); } #undef PERLVARIC -#define PERLVARIC(v,t,i) \ - const t* Perl_##v##_ptr(pTHX) \ +#define PERLVARIC(p,v,t,i) \ + const t* Perl_##p##v##_ptr(pTHX) \ { PERL_UNUSED_CONTEXT; return (const t *)&(PL_##v); } #include "perlvars.h" @@ -28,11 +28,11 @@ START_EXTERN_C #undef PERLVARA #undef PERLVARI #undef PERLVARIC -#define PERLVAR(v,t) EXTERN_C t* Perl_##v##_ptr(pTHX); -#define PERLVARA(v,n,t) typedef t PL_##v##_t[n]; \ - EXTERN_C PL_##v##_t* Perl_##v##_ptr(pTHX); -#define PERLVARI(v,t,i) PERLVAR(v,t) -#define PERLVARIC(v,t,i) PERLVAR(v, const t) +#define PERLVAR(p,v,t) EXTERN_C t* Perl_##p##v##_ptr(pTHX); +#define PERLVARA(p,v,n,t) typedef t PL_##v##_t[n]; \ + EXTERN_C PL_##v##_t* Perl_##p##v##_ptr(pTHX); +#define PERLVARI(p,v,t,i) PERLVAR(p,v,t) +#define PERLVARIC(p,v,t,i) PERLVAR(p,v, const t) #include "perlvars.h" @@ -62,10 +62,10 @@ EXTCONST void * const PL_force_link_funcs[] = { #undef PERLVARA #undef PERLVARI #undef PERLVARIC -#define PERLVAR(v,t) (void*)Perl_##v##_ptr, -#define PERLVARA(v,n,t) PERLVAR(v,t) -#define PERLVARI(v,t,i) PERLVAR(v,t) -#define PERLVARIC(v,t,i) PERLVAR(v,t) +#define PERLVAR(p,v,t) (void*)Perl_##p##v##_ptr, +#define PERLVARA(p,v,n,t) PERLVAR(p,v,t) +#define PERLVARI(p,v,t,i) PERLVAR(p,v,t) +#define PERLVARIC(p,v,t,i) PERLVAR(p,v,t) /* In Tru64 (__DEC && __osf__) the cc option -std1 causes that one * cannot cast between void pointers and function pointers without diff --git a/perlvars.h b/perlvars.h index 57bd5bd859..b046fade05 100644 --- a/perlvars.h +++ b/perlvars.h @@ -25,100 +25,102 @@ /* global state */ #if defined(USE_ITHREADS) -PERLVAR(Gop_mutex, perl_mutex) /* Mutex for op refcounting */ +PERLVAR(G, op_mutex, perl_mutex) /* Mutex for op refcounting */ #endif -PERLVAR(Gcurinterp, PerlInterpreter *) +PERLVAR(G, curinterp, PerlInterpreter *) /* currently running interpreter * (initial parent interpreter under * useithreads) */ #if defined(USE_ITHREADS) -PERLVAR(Gthr_key, perl_key) /* key to retrieve per-thread struct */ +PERLVAR(G, thr_key, perl_key) /* key to retrieve per-thread struct */ #endif /* XXX does anyone even use this? */ -PERLVARI(Gdo_undump, bool, FALSE) /* -u or dump seen? */ +PERLVARI(G, do_undump, bool, FALSE) /* -u or dump seen? */ #ifndef PERL_USE_SAFE_PUTENV -PERLVARI(Guse_safe_putenv, bool, TRUE) +PERLVARI(G, use_safe_putenv, bool, TRUE) #endif #if defined(FAKE_PERSISTENT_SIGNAL_HANDLERS)||defined(FAKE_DEFAULT_SIGNAL_HANDLERS) -PERLVARI(Gsig_handlers_initted, int, 0) +PERLVARI(G, sig_handlers_initted, int, 0) #endif #ifdef FAKE_PERSISTENT_SIGNAL_HANDLERS -PERLVARA(Gsig_ignoring, SIG_SIZE, int) /* which signals we are ignoring */ +PERLVARA(G, sig_ignoring, SIG_SIZE, int) + /* which signals we are ignoring */ #endif #ifdef FAKE_DEFAULT_SIGNAL_HANDLERS -PERLVARA(Gsig_defaulting, SIG_SIZE, int) +PERLVARA(G, sig_defaulting, SIG_SIZE, int) #endif /* XXX signals are process-wide anyway, so we * ignore the implications of this for threading */ #ifndef HAS_SIGACTION -PERLVARI(Gsig_trapped, int, 0) +PERLVARI(G, sig_trapped, int, 0) #endif #ifndef PERL_MICRO /* If Perl has to ignore SIGPFE, this is its saved state. * See perl.h macros PERL_FPU_INIT and PERL_FPU_{PRE,POST}_EXEC. */ -PERLVAR(Gsigfpe_saved, Sighandler_t) -PERLVARI(Gcsighandlerp, Sighandler_t, Perl_csighandler) /* Pointer to C-level sighandler */ +PERLVAR(G, sigfpe_saved, Sighandler_t) +PERLVARI(G, csighandlerp, Sighandler_t, Perl_csighandler) + /* Pointer to C-level sighandler */ #endif /* This is constant on most architectures, a global on OS/2 */ #ifdef OS2 -PERLVARI(Gsh_path, char *, SH_PATH) /* full path of shell */ +PERLVARI(G, sh_path, char *, SH_PATH) /* full path of shell */ #endif #ifdef USE_PERLIO # if defined(USE_ITHREADS) -PERLVAR(Gperlio_mutex, perl_mutex) /* Mutex for perlio fd refcounts */ +PERLVAR(G, perlio_mutex, perl_mutex) /* Mutex for perlio fd refcounts */ # endif -PERLVARI(Gperlio_fd_refcnt, int*, 0) /* Pointer to array of fd refcounts. */ -PERLVARI(Gperlio_fd_refcnt_size, int, 0) /* Size of the array */ -PERLVARI(Gperlio_debug_fd, int, 0) /* the fd to write perlio debug into, 0 means not set yet */ +PERLVARI(G, perlio_fd_refcnt, int *, 0) /* Pointer to array of fd refcounts. */ +PERLVARI(G, perlio_fd_refcnt_size, int, 0) /* Size of the array */ +PERLVARI(G, perlio_debug_fd, int, 0) /* the fd to write perlio debug into, 0 means not set yet */ #endif #ifdef HAS_MMAP -PERLVARI(Gmmap_page_size, IV, 0) +PERLVARI(G, mmap_page_size, IV, 0) #endif #if defined(USE_ITHREADS) -PERLVAR(Ghints_mutex, perl_mutex) /* Mutex for refcounted he refcounting */ +PERLVAR(G, hints_mutex, perl_mutex) /* Mutex for refcounted he refcounting */ #endif #ifdef DEBUGGING -PERLVAR(Gwatch_pvx, char*) +PERLVAR(G, watch_pvx, char *) #endif #ifdef PERL_GLOBAL_STRUCT -PERLVAR(Gppaddr, Perl_ppaddr_t*) /* or opcode.h */ -PERLVAR(Gcheck, Perl_check_t *) /* or opcode.h */ -PERLVARA(Gfold_locale, 256, unsigned char) /* or perl.h */ +PERLVAR(G, ppaddr, Perl_ppaddr_t *) /* or opcode.h */ +PERLVAR(G, check, Perl_check_t *) /* or opcode.h */ +PERLVARA(G, fold_locale, 256, unsigned char) /* or perl.h */ #endif #ifdef PERL_NEED_APPCTX -PERLVAR(Gappctx, void*) /* the application context */ +PERLVAR(G, appctx, void*) /* the application context */ #endif #if defined(HAS_TIMES) && defined(PERL_NEED_TIMESBASE) -PERLVAR(Gtimesbase, struct tms) +PERLVAR(G, timesbase, struct tms) #endif /* allocate a unique index to every module that calls MY_CXT_INIT */ #ifdef PERL_IMPLICIT_CONTEXT # ifdef USE_ITHREADS -PERLVAR(Gmy_ctx_mutex, perl_mutex) +PERLVAR(G, my_ctx_mutex, perl_mutex) # endif -PERLVARI(Gmy_cxt_index, int, 0) +PERLVARI(G, my_cxt_index, int, 0) #endif /* this is currently set without MUTEX protection, so keep it a type which * can be set atomically (ie not a bit field) */ -PERLVARI(Gveto_cleanup, int, FALSE) /* exit without cleanup */ +PERLVARI(G, veto_cleanup, int, FALSE) /* exit without cleanup */ /* =for apidoc AmUx|Perl_keyword_plugin_t|PL_keyword_plugin @@ -173,19 +175,19 @@ the Perl core) will normally return C<KEYWORD_PLUGIN_DECLINE>. =cut */ -PERLVARI(Gkeyword_plugin, Perl_keyword_plugin_t, Perl_keyword_plugin_standard) +PERLVARI(G, keyword_plugin, Perl_keyword_plugin_t, Perl_keyword_plugin_standard) -PERLVAR(Gop_sequence, HV*) /* dump.c */ -PERLVARI(Gop_seq, UV, 0) /* dump.c */ +PERLVAR(G, op_sequence, HV *) /* dump.c */ +PERLVARI(G, op_seq, UV, 0) /* dump.c */ #ifdef USE_ITHREADS -PERLVAR(Gdollarzero_mutex, perl_mutex) /* Modifying $0 */ +PERLVAR(G, dollarzero_mutex, perl_mutex) /* Modifying $0 */ #endif /* Restricted hashes placeholder value. * The contents are never used, only the address. */ -PERLVAR(Gsv_placeholder, SV) +PERLVAR(G, sv_placeholder, SV) #if defined(MYMALLOC) && defined(USE_ITHREADS) -PERLVAR(Gmalloc_mutex, perl_mutex) /* Mutex for malloc */ +PERLVAR(G, malloc_mutex, perl_mutex) /* Mutex for malloc */ #endif diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 31b50ba910..ba0d3a51f2 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -105,6 +105,13 @@ XXX =item * +L<B> has been upgraded from version 1.30 to version 1.31 + +The XS code has changed slightly, as it was too tightly coupled to +the contents of the header F<embedvar.h> + +=item * + L<CPAN> has been upgraded from version 1.9600 to version 1.9800 =item * @@ -422,7 +429,12 @@ be noted as well. =item * -XXX +F<embedvar.h> has been simplified, and one level of macro indirection for +PL_* variables has been removed for the default (non-multiplicity) +configuration. PERLVAR*() macros now directly expand their arguments to +tokens such as C<PL_defgv>, instead of expanding to C<PL_Idefgv>, with +F<embedvar.h> defining a macro to map C<PL_Idefgv> to C<PL_defgv>. XS code +which has unwarranted chumminess with the implementation may need updating. =back diff --git a/regen/embed.pl b/regen/embed.pl index 232af368c2..71422bbaa8 100755 --- a/regen/embed.pl +++ b/regen/embed.pl @@ -368,7 +368,7 @@ sub readvars { or die "embed.pl: Can't open $file: $!\n"; while (<FILE>) { s/[ \t]*#.*//; # Delete comments. - if (/PERLVARA?I?C?\($pre(\w+)/) { + if (/PERLVARA?I?C?\($pre,\s*(\w+)/) { warn "duplicate symbol $1 while processing $file line $.\n" if $seen{$1}++; } @@ -392,11 +392,6 @@ sub multon ($$$) { hide("PL_$sym", "($ptr$pre$sym)"); } -sub multoff ($$) { - my ($sym,$pre) = @_; - return hide("PL_$pre$sym", "PL_$sym"); -} - my $em = open_print_header('embed.h'); print $em <<'END'; @@ -593,22 +588,6 @@ for $sym (@intrp) { print $em <<'END'; -#else /* !MULTIPLICITY */ - -/* case 1 above */ - -END - -for $sym (@intrp) { - print $em multoff($sym,'I'); -} - -print $em <<'END'; - -END - -print $em <<'END'; - #endif /* MULTIPLICITY */ #if defined(PERL_GLOBAL_STRUCT) @@ -624,18 +603,6 @@ for $sym (@globvar) { print $em <<'END'; -#else /* !PERL_GLOBAL_STRUCT */ - -END - -for $sym (@globvar) { - print $em "#ifdef OS2\n" if $sym eq 'sh_path'; - print $em multoff($sym,'G'); - print $em "#endif\n" if $sym eq 'sh_path'; -} - -print $em <<'END'; - #endif /* PERL_GLOBAL_STRUCT */ END @@ -656,11 +623,11 @@ START_EXTERN_C #undef PERLVARA #undef PERLVARI #undef PERLVARIC -#define PERLVAR(v,t) EXTERN_C t* Perl_##v##_ptr(pTHX); -#define PERLVARA(v,n,t) typedef t PL_##v##_t[n]; \ - EXTERN_C PL_##v##_t* Perl_##v##_ptr(pTHX); -#define PERLVARI(v,t,i) PERLVAR(v,t) -#define PERLVARIC(v,t,i) PERLVAR(v, const t) +#define PERLVAR(p,v,t) EXTERN_C t* Perl_##p##v##_ptr(pTHX); +#define PERLVARA(p,v,n,t) typedef t PL_##v##_t[n]; \ + EXTERN_C PL_##v##_t* Perl_##p##v##_ptr(pTHX); +#define PERLVARI(p,v,t,i) PERLVAR(p,v,t) +#define PERLVARIC(p,v,t,i) PERLVAR(p,v, const t) #include "perlvars.h" @@ -690,10 +657,10 @@ EXTCONST void * const PL_force_link_funcs[] = { #undef PERLVARA #undef PERLVARI #undef PERLVARIC -#define PERLVAR(v,t) (void*)Perl_##v##_ptr, -#define PERLVARA(v,n,t) PERLVAR(v,t) -#define PERLVARI(v,t,i) PERLVAR(v,t) -#define PERLVARIC(v,t,i) PERLVAR(v,t) +#define PERLVAR(p,v,t) (void*)Perl_##p##v##_ptr, +#define PERLVARA(p,v,n,t) PERLVAR(p,v,t) +#define PERLVARI(p,v,t,i) PERLVAR(p,v,t) +#define PERLVARIC(p,v,t,i) PERLVAR(p,v,t) /* In Tru64 (__DEC && __osf__) the cc option -std1 causes that one * cannot cast between void pointers and function pointers without @@ -767,17 +734,17 @@ print $capi <<'EOT'; START_EXTERN_C #undef PERLVARI -#define PERLVARI(v,t,i) PERLVAR(v,t) +#define PERLVARI(p,v,t,i) PERLVAR(p,v,t) #undef PERLVAR #undef PERLVARA -#define PERLVAR(v,t) t* Perl_##v##_ptr(pTHX) \ +#define PERLVAR(p,v,t) t* Perl_##p##v##_ptr(pTHX) \ { dVAR; PERL_UNUSED_CONTEXT; return &(PL_##v); } -#define PERLVARA(v,n,t) PL_##v##_t* Perl_##v##_ptr(pTHX) \ +#define PERLVARA(p,v,n,t) PL_##v##_t* Perl_##p##v##_ptr(pTHX) \ { dVAR; PERL_UNUSED_CONTEXT; return &(PL_##v); } #undef PERLVARIC -#define PERLVARIC(v,t,i) \ - const t* Perl_##v##_ptr(pTHX) \ +#define PERLVARIC(p,v,t,i) \ + const t* Perl_##p##v##_ptr(pTHX) \ { PERL_UNUSED_CONTEXT; return (const t *)&(PL_##v); } #include "perlvars.h" @@ -5870,10 +5870,10 @@ Perl_init_global_struct(pTHX) # undef PERLVARA # undef PERLVARI # undef PERLVARIC -# define PERLVAR(var,type) /**/ -# define PERLVARA(var,n,type) /**/ -# define PERLVARI(var,type,init) plvarsp->var = init; -# define PERLVARIC(var,type,init) plvarsp->var = init; +# define PERLVAR(prefix,var,type) /**/ +# define PERLVARA(prefix,var,n,type) /**/ +# define PERLVARI(prefix,var,type,init) plvarsp->prefix##var = init; +# define PERLVARIC(prefix,var,type,init) plvarsp->prefix##var = init; # include "perlvars.h" # undef PERLVAR # undef PERLVARA diff --git a/win32/perllib.c b/win32/perllib.c index ff212102f6..526a4a18d5 100644 --- a/win32/perllib.c +++ b/win32/perllib.c @@ -232,10 +232,10 @@ RunPerl(int argc, char **argv, char **env) } #ifdef PERL_GLOBAL_STRUCT -#define PERLVAR(var,type) /**/ -#define PERLVARA(var,type) /**/ -#define PERLVARI(var,type,init) PL_Vars.var = init; -#define PERLVARIC(var,type,init) PL_Vars.var = init; +#define PERLVAR(prefix,var,type) /**/ +#define PERLVARA(prefix,var,type) /**/ +#define PERLVARI(prefix,var,type,init) PL_Vars.prefix##var = init; +#define PERLVARIC(prefix,var,type,init) PL_Vars.prefix##var = init; #include "perlvars.h" #undef PERLVAR #undef PERLVARA |