Simplify embedvar.h, removing a level of macro indirection for PL_* variables.

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>. This removes over 350 lines from F<embedvar.h>,
which defined macros to map from C<PL_Idefgv> to C<PL_defgv> and so forth.

1 files changed, 0 insertions, 369 deletions

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: */