[perl #122445] use magic on $DB::single etc to avoid overload issues

[perl5.git] / embedvar.h

diff --git a/embedvar.h b/embedvar.h
index dc2583d..2659d02 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -40,10 +40,10 @@
 #    define vTHX       PERL_GET_INTERP
 #  endif
 
-#define PL_ASCII               (vTHX->IASCII)
 #define PL_AboveLatin1         (vTHX->IAboveLatin1)
 #define PL_Argv                        (vTHX->IArgv)
 #define PL_Cmd                 (vTHX->ICmd)
+#define PL_DBcontrol           (vTHX->IDBcontrol)
 #define PL_DBcv                        (vTHX->IDBcv)
 #define PL_DBgv                        (vTHX->IDBgv)
 #define PL_DBline              (vTHX->IDBline)
@@ -54,45 +54,20 @@
 #define PL_Dir                 (vTHX->IDir)
 #define PL_Env                 (vTHX->IEnv)
 #define PL_HasMultiCharFold    (vTHX->IHasMultiCharFold)
-#define PL_L1Cased             (vTHX->IL1Cased)
-#define PL_L1PosixAlnum                (vTHX->IL1PosixAlnum)
-#define PL_L1PosixAlpha                (vTHX->IL1PosixAlpha)
-#define PL_L1PosixGraph                (vTHX->IL1PosixGraph)
-#define PL_L1PosixLower                (vTHX->IL1PosixLower)
-#define PL_L1PosixPrint                (vTHX->IL1PosixPrint)
-#define PL_L1PosixPunct                (vTHX->IL1PosixPunct)
-#define PL_L1PosixUpper                (vTHX->IL1PosixUpper)
-#define PL_L1PosixWord         (vTHX->IL1PosixWord)
+#define PL_InBitmap            (vTHX->IInBitmap)
 #define PL_LIO                 (vTHX->ILIO)
 #define PL_Latin1              (vTHX->ILatin1)
 #define PL_Mem                 (vTHX->IMem)
 #define PL_MemParse            (vTHX->IMemParse)
 #define PL_MemShared           (vTHX->IMemShared)
 #define PL_NonL1NonFinalFold   (vTHX->INonL1NonFinalFold)
-#define PL_PerlSpace           (vTHX->IPerlSpace)
-#define PL_PosixAlnum          (vTHX->IPosixAlnum)
-#define PL_PosixAlpha          (vTHX->IPosixAlpha)
-#define PL_PosixBlank          (vTHX->IPosixBlank)
-#define PL_PosixCntrl          (vTHX->IPosixCntrl)
-#define PL_PosixDigit          (vTHX->IPosixDigit)
-#define PL_PosixGraph          (vTHX->IPosixGraph)
-#define PL_PosixLower          (vTHX->IPosixLower)
-#define PL_PosixPrint          (vTHX->IPosixPrint)
-#define PL_PosixPunct          (vTHX->IPosixPunct)
-#define PL_PosixSpace          (vTHX->IPosixSpace)
-#define PL_PosixUpper          (vTHX->IPosixUpper)
-#define PL_PosixWord           (vTHX->IPosixWord)
-#define PL_PosixXDigit         (vTHX->IPosixXDigit)
+#define PL_Posix_ptrs          (vTHX->IPosix_ptrs)
 #define PL_Proc                        (vTHX->IProc)
 #define PL_Sock                        (vTHX->ISock)
 #define PL_StdIO               (vTHX->IStdIO)
 #define PL_Sv                  (vTHX->ISv)
-#define PL_VertSpace           (vTHX->IVertSpace)
-#define PL_XPerlSpace          (vTHX->IXPerlSpace)
-#define PL_XPosixBlank         (vTHX->IXPosixBlank)
-#define PL_XPosixCntrl         (vTHX->IXPosixCntrl)
-#define PL_XPosixSpace         (vTHX->IXPosixSpace)
-#define PL_XPosixXDigit                (vTHX->IXPosixXDigit)
+#define PL_UpperLatin1         (vTHX->IUpperLatin1)
+#define PL_XPosix_ptrs         (vTHX->IXPosix_ptrs)
 #define PL_Xpv                 (vTHX->IXpv)
 #define PL_an                  (vTHX->Ian)
 #define PL_apiversion          (vTHX->Iapiversion)
@@ -124,6 +99,7 @@
 #define PL_comppad_name                (vTHX->Icomppad_name)
 #define PL_comppad_name_fill   (vTHX->Icomppad_name_fill)
 #define PL_comppad_name_floor  (vTHX->Icomppad_name_floor)
+#define PL_constpadix          (vTHX->Iconstpadix)
 #define PL_cop_seqmax          (vTHX->Icop_seqmax)
 #define PL_cryptseen           (vTHX->Icryptseen)
 #define PL_curcop              (vTHX->Icurcop)
@@ -178,17 +154,17 @@
 #define PL_formtarget          (vTHX->Iformtarget)
 #define PL_generation          (vTHX->Igeneration)
 #define PL_gensym              (vTHX->Igensym)
-#define PL_glob_index          (vTHX->Iglob_index)
 #define PL_globalstash         (vTHX->Iglobalstash)
 #define PL_globhook            (vTHX->Iglobhook)
-#define PL_hash_seed           (vTHX->Ihash_seed)
+#define PL_hash_rand_bits      (vTHX->Ihash_rand_bits)
+#define PL_hash_rand_bits_enabled      (vTHX->Ihash_rand_bits_enabled)
 #define PL_hintgv              (vTHX->Ihintgv)
-#define PL_hints               (vTHX->Ihints)
 #define PL_hv_fetch_ent_mh     (vTHX->Ihv_fetch_ent_mh)
 #define PL_in_clean_all                (vTHX->Iin_clean_all)
 #define PL_in_clean_objs       (vTHX->Iin_clean_objs)
 #define PL_in_eval             (vTHX->Iin_eval)
 #define PL_in_load_module      (vTHX->Iin_load_module)
+#define PL_in_utf8_CTYPE_locale        (vTHX->Iin_utf8_CTYPE_locale)
 #define PL_incgv               (vTHX->Iincgv)
 #define PL_initav              (vTHX->Iinitav)
 #define PL_inplace             (vTHX->Iinplace)
@@ -207,7 +183,6 @@
 #define PL_localizing          (vTHX->Ilocalizing)
 #define PL_localpatches                (vTHX->Ilocalpatches)
 #define PL_lockhook            (vTHX->Ilockhook)
-#define PL_madskills           (vTHX->Imadskills)
 #define PL_main_cv             (vTHX->Imain_cv)
 #define PL_main_root           (vTHX->Imain_root)
 #define PL_main_start          (vTHX->Imain_start)
@@ -242,9 +217,9 @@
 #define PL_ofsgv               (vTHX->Iofsgv)
 #define PL_oldname             (vTHX->Ioldname)
 #define PL_op                  (vTHX->Iop)
+#define PL_op_exec_cnt         (vTHX->Iop_exec_cnt)
 #define PL_op_mask             (vTHX->Iop_mask)
 #define PL_opfreehook          (vTHX->Iopfreehook)
-#define PL_opsave              (vTHX->Iopsave)
 #define PL_origalen            (vTHX->Iorigalen)
 #define PL_origargc            (vTHX->Iorigargc)
 #define PL_origargv            (vTHX->Iorigargv)
@@ -255,7 +230,6 @@
 #define PL_pad_reset_pending   (vTHX->Ipad_reset_pending)
 #define PL_padix               (vTHX->Ipadix)
 #define PL_padix_floor         (vTHX->Ipadix_floor)
-#define PL_padlist_generation  (vTHX->Ipadlist_generation)
 #define PL_parser              (vTHX->Iparser)
 #define PL_patchlevel          (vTHX->Ipatchlevel)
 #define PL_peepp               (vTHX->Ipeepp)
@@ -270,17 +244,15 @@
 #define PL_psig_pend           (vTHX->Ipsig_pend)
 #define PL_psig_ptr            (vTHX->Ipsig_ptr)
 #define PL_ptr_table           (vTHX->Iptr_table)
+#define PL_random_state                (vTHX->Irandom_state)
 #define PL_reentrant_buffer    (vTHX->Ireentrant_buffer)
 #define PL_reentrant_retint    (vTHX->Ireentrant_retint)
-#define PL_reg_state           (vTHX->Ireg_state)
-#define PL_regdummy            (vTHX->Iregdummy)
+#define PL_reg_curpm           (vTHX->Ireg_curpm)
 #define PL_regex_pad           (vTHX->Iregex_pad)
 #define PL_regex_padav         (vTHX->Iregex_padav)
 #define PL_registered_mros     (vTHX->Iregistered_mros)
 #define PL_regmatch_slab       (vTHX->Iregmatch_slab)
 #define PL_regmatch_state      (vTHX->Iregmatch_state)
-#define PL_rehash_seed         (vTHX->Irehash_seed)
-#define PL_rehash_seed_set     (vTHX->Irehash_seed_set)
 #define PL_replgv              (vTHX->Ireplgv)
 #define PL_restartjmpenv       (vTHX->Irestartjmpenv)
 #define PL_restartop           (vTHX->Irestartop)
@@ -291,7 +263,10 @@
 #define PL_savestack           (vTHX->Isavestack)
 #define PL_savestack_ix                (vTHX->Isavestack_ix)
 #define PL_savestack_max       (vTHX->Isavestack_max)
+#define PL_sawalias            (vTHX->Isawalias)
+#ifndef PL_sawampersand
 #define PL_sawampersand                (vTHX->Isawampersand)
+#endif
 #define PL_scopestack          (vTHX->Iscopestack)
 #define PL_scopestack_ix       (vTHX->Iscopestack_ix)
 #define PL_scopestack_max      (vTHX->Iscopestack_max)
@@ -329,9 +304,9 @@
 #define PL_subline             (vTHX->Isubline)
 #define PL_subname             (vTHX->Isubname)
 #define PL_sv_arenaroot                (vTHX->Isv_arenaroot)
+#define PL_sv_consts           (vTHX->Isv_consts)
 #define PL_sv_count            (vTHX->Isv_count)
 #define PL_sv_no               (vTHX->Isv_no)
-#define PL_sv_objcount         (vTHX->Isv_objcount)
 #define PL_sv_root             (vTHX->Isv_root)
 #define PL_sv_serial           (vTHX->Isv_serial)
 #define PL_sv_undef            (vTHX->Isv_undef)
@@ -353,30 +328,22 @@
 #define PL_unitcheckav_save    (vTHX->Iunitcheckav_save)
 #define PL_unlockhook          (vTHX->Iunlockhook)
 #define PL_unsafe              (vTHX->Iunsafe)
-#define PL_utf8_X_LVT          (vTHX->Iutf8_X_LVT)
 #define PL_utf8_X_extend       (vTHX->Iutf8_X_extend)
 #define PL_utf8_X_regular_begin        (vTHX->Iutf8_X_regular_begin)
-#define PL_utf8_alnum          (vTHX->Iutf8_alnum)
-#define PL_utf8_alpha          (vTHX->Iutf8_alpha)
-#define PL_utf8_blank          (vTHX->Iutf8_blank)
-#define PL_utf8_digit          (vTHX->Iutf8_digit)
+#define PL_utf8_charname_begin (vTHX->Iutf8_charname_begin)
+#define PL_utf8_charname_continue      (vTHX->Iutf8_charname_continue)
 #define PL_utf8_foldable       (vTHX->Iutf8_foldable)
 #define PL_utf8_foldclosures   (vTHX->Iutf8_foldclosures)
-#define PL_utf8_graph          (vTHX->Iutf8_graph)
 #define PL_utf8_idcont         (vTHX->Iutf8_idcont)
 #define PL_utf8_idstart                (vTHX->Iutf8_idstart)
-#define PL_utf8_lower          (vTHX->Iutf8_lower)
 #define PL_utf8_mark           (vTHX->Iutf8_mark)
+#define PL_utf8_perl_idcont    (vTHX->Iutf8_perl_idcont)
 #define PL_utf8_perl_idstart   (vTHX->Iutf8_perl_idstart)
-#define PL_utf8_print          (vTHX->Iutf8_print)
-#define PL_utf8_punct          (vTHX->Iutf8_punct)
-#define PL_utf8_space          (vTHX->Iutf8_space)
+#define PL_utf8_swash_ptrs     (vTHX->Iutf8_swash_ptrs)
 #define PL_utf8_tofold         (vTHX->Iutf8_tofold)
 #define PL_utf8_tolower                (vTHX->Iutf8_tolower)
 #define PL_utf8_totitle                (vTHX->Iutf8_totitle)
 #define PL_utf8_toupper                (vTHX->Iutf8_toupper)
-#define PL_utf8_upper          (vTHX->Iutf8_upper)
-#define PL_utf8_xdigit         (vTHX->Iutf8_xdigit)
 #define PL_utf8_xidcont                (vTHX->Iutf8_xidcont)
 #define PL_utf8_xidstart       (vTHX->Iutf8_xidstart)
 #define PL_utf8cache           (vTHX->Iutf8cache)
@@ -384,7 +351,6 @@
 #define PL_warnhook            (vTHX->Iwarnhook)
 #define PL_watchaddr           (vTHX->Iwatchaddr)
 #define PL_watchok             (vTHX->Iwatchok)
-#define PL_xmlfp               (vTHX->Ixmlfp)
 
 #endif /* MULTIPLICITY */
 
@@ -406,6 +372,10 @@
 #define PL_Gdollarzero_mutex   (my_vars->Gdollarzero_mutex)
 #define PL_fold_locale         (my_vars->Gfold_locale)
 #define PL_Gfold_locale                (my_vars->Gfold_locale)
+#define PL_hash_seed           (my_vars->Ghash_seed)
+#define PL_Ghash_seed          (my_vars->Ghash_seed)
+#define PL_hash_seed_set       (my_vars->Ghash_seed_set)
+#define PL_Ghash_seed_set      (my_vars->Ghash_seed_set)
 #define PL_hints_mutex         (my_vars->Ghints_mutex)
 #define PL_Ghints_mutex                (my_vars->Ghints_mutex)
 #define PL_keyword_plugin      (my_vars->Gkeyword_plugin)