X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embedvar.h;h=8c7c2a7807dd091d255925fcc2b524c935e6a451;hb=ccc7f9b3740d5c1211fbd847d1ae120278f3f710;hp=8394e840007eab983594802d9b2d221603cf7557;hpb=92742e379e6f1679633256cac8dcf3be460cfb98;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embedvar.h b/embedvar.h index 8394e84..8c7c2a7 100644 --- a/embedvar.h +++ b/embedvar.h @@ -1,18 +1,10 @@ /* !!!!!!! DO NOT EDIT THIS FILE !!!!!!! - This file is built by embed.pl from global.sym, intrpvar.h, - and thrdvar.h. Any changes made here will be lost! + This file is built by embed.pl from global.sym, pp.sym, intrpvar.h, + perlvars.h and thrdvar.h. Any changes made here will be lost! */ /* (Doing namespace management portably in C is really gross.) */ -/* EMBED has no run-time penalty, but helps keep the Perl namespace - from colliding with that used by other libraries pulled in - by extensions or by embedding perl. Allow a cc -DNO_EMBED - override, however, to keep binary compatability with previous - versions of perl. -*/ - - /* Put interpreter-specific symbols into a struct? */ #ifdef MULTIPLICITY @@ -38,6 +30,7 @@ #define PL_defstash (PL_curinterp->Tdefstash) #define PL_delaymagic (PL_curinterp->Tdelaymagic) #define PL_dirty (PL_curinterp->Tdirty) +#define PL_dumpindent (PL_curinterp->Tdumpindent) #define PL_extralen (PL_curinterp->Textralen) #define PL_firstgv (PL_curinterp->Tfirstgv) #define PL_formtarget (PL_curinterp->Tformtarget) @@ -54,15 +47,25 @@ #define PL_markstack_ptr (PL_curinterp->Tmarkstack_ptr) #define PL_maxscream (PL_curinterp->Tmaxscream) #define PL_modcount (PL_curinterp->Tmodcount) +#define PL_na (PL_curinterp->Tna) #define PL_nrs (PL_curinterp->Tnrs) #define PL_ofs (PL_curinterp->Tofs) #define PL_ofslen (PL_curinterp->Tofslen) #define PL_op (PL_curinterp->Top) #define PL_opsave (PL_curinterp->Topsave) +#define PL_reg_call_cc (PL_curinterp->Treg_call_cc) +#define PL_reg_curpm (PL_curinterp->Treg_curpm) #define PL_reg_eval_set (PL_curinterp->Treg_eval_set) #define PL_reg_flags (PL_curinterp->Treg_flags) +#define PL_reg_ganch (PL_curinterp->Treg_ganch) +#define PL_reg_magic (PL_curinterp->Treg_magic) +#define PL_reg_oldcurpm (PL_curinterp->Treg_oldcurpm) +#define PL_reg_oldpos (PL_curinterp->Treg_oldpos) +#define PL_reg_re (PL_curinterp->Treg_re) #define PL_reg_start_tmp (PL_curinterp->Treg_start_tmp) #define PL_reg_start_tmpl (PL_curinterp->Treg_start_tmpl) +#define PL_reg_starttry (PL_curinterp->Treg_starttry) +#define PL_reg_sv (PL_curinterp->Treg_sv) #define PL_regbol (PL_curinterp->Tregbol) #define PL_regcc (PL_curinterp->Tregcc) #define PL_regcode (PL_curinterp->Tregcode) @@ -126,6 +129,8 @@ #define PL_tmps_stack (PL_curinterp->Ttmps_stack) #define PL_top_env (PL_curinterp->Ttop_env) #define PL_toptarget (PL_curinterp->Ttoptarget) +#define PL_watchaddr (PL_curinterp->Twatchaddr) +#define PL_watchok (PL_curinterp->Twatchok) #endif /* !USE_THREADS */ @@ -172,7 +177,6 @@ #define PL_doextract (PL_curinterp->Idoextract) #define PL_doswitches (PL_curinterp->Idoswitches) #define PL_dowarn (PL_curinterp->Idowarn) -#define PL_dumplvl (PL_curinterp->Idumplvl) #define PL_e_script (PL_curinterp->Ie_script) #define PL_endav (PL_curinterp->Iendav) #define PL_envgv (PL_curinterp->Ienvgv) @@ -250,6 +254,7 @@ #define PL_stdingv (PL_curinterp->Istdingv) #define PL_strchop (PL_curinterp->Istrchop) #define PL_strtab (PL_curinterp->Istrtab) +#define PL_strtab_mutex (PL_curinterp->Istrtab_mutex) #define PL_sub_generation (PL_curinterp->Isub_generation) #define PL_sublex_info (PL_curinterp->Isublex_info) #define PL_sv_arenaroot (PL_curinterp->Isv_arenaroot) @@ -306,7 +311,6 @@ #define PL_Idoextract PL_doextract #define PL_Idoswitches PL_doswitches #define PL_Idowarn PL_dowarn -#define PL_Idumplvl PL_dumplvl #define PL_Ie_script PL_e_script #define PL_Iendav PL_endav #define PL_Ienvgv PL_envgv @@ -384,6 +388,7 @@ #define PL_Istdingv PL_stdingv #define PL_Istrchop PL_strchop #define PL_Istrtab PL_strtab +#define PL_Istrtab_mutex PL_strtab_mutex #define PL_Isub_generation PL_sub_generation #define PL_Isublex_info PL_sublex_info #define PL_Isv_arenaroot PL_sv_arenaroot @@ -417,6 +422,7 @@ #define PL_Tdefstash PL_defstash #define PL_Tdelaymagic PL_delaymagic #define PL_Tdirty PL_dirty +#define PL_Tdumpindent PL_dumpindent #define PL_Textralen PL_extralen #define PL_Tfirstgv PL_firstgv #define PL_Tformtarget PL_formtarget @@ -433,15 +439,25 @@ #define PL_Tmarkstack_ptr PL_markstack_ptr #define PL_Tmaxscream PL_maxscream #define PL_Tmodcount PL_modcount +#define PL_Tna PL_na #define PL_Tnrs PL_nrs #define PL_Tofs PL_ofs #define PL_Tofslen PL_ofslen #define PL_Top PL_op #define PL_Topsave PL_opsave +#define PL_Treg_call_cc PL_reg_call_cc +#define PL_Treg_curpm PL_reg_curpm #define PL_Treg_eval_set PL_reg_eval_set #define PL_Treg_flags PL_reg_flags +#define PL_Treg_ganch PL_reg_ganch +#define PL_Treg_magic PL_reg_magic +#define PL_Treg_oldcurpm PL_reg_oldcurpm +#define PL_Treg_oldpos PL_reg_oldpos +#define PL_Treg_re PL_reg_re #define PL_Treg_start_tmp PL_reg_start_tmp #define PL_Treg_start_tmpl PL_reg_start_tmpl +#define PL_Treg_starttry PL_reg_starttry +#define PL_Treg_sv PL_reg_sv #define PL_Tregbol PL_regbol #define PL_Tregcc PL_regcc #define PL_Tregcode PL_regcode @@ -505,19 +521,18 @@ #define PL_Ttmps_stack PL_tmps_stack #define PL_Ttop_env PL_top_env #define PL_Ttoptarget PL_toptarget +#define PL_Twatchaddr PL_watchaddr +#define PL_Twatchok PL_watchok #endif /* USE_THREADS */ /* Hide what would have been interpreter-specific symbols? */ -#ifdef EMBED - #ifndef USE_THREADS #endif /* USE_THREADS */ -#endif /* EMBED */ #endif /* MULTIPLICITY */ /* Now same trickey for per-thread variables */ @@ -542,6 +557,7 @@ #define PL_defstash (thr->Tdefstash) #define PL_delaymagic (thr->Tdelaymagic) #define PL_dirty (thr->Tdirty) +#define PL_dumpindent (thr->Tdumpindent) #define PL_extralen (thr->Textralen) #define PL_firstgv (thr->Tfirstgv) #define PL_formtarget (thr->Tformtarget) @@ -558,15 +574,25 @@ #define PL_markstack_ptr (thr->Tmarkstack_ptr) #define PL_maxscream (thr->Tmaxscream) #define PL_modcount (thr->Tmodcount) +#define PL_na (thr->Tna) #define PL_nrs (thr->Tnrs) #define PL_ofs (thr->Tofs) #define PL_ofslen (thr->Tofslen) #define PL_op (thr->Top) #define PL_opsave (thr->Topsave) +#define PL_reg_call_cc (thr->Treg_call_cc) +#define PL_reg_curpm (thr->Treg_curpm) #define PL_reg_eval_set (thr->Treg_eval_set) #define PL_reg_flags (thr->Treg_flags) +#define PL_reg_ganch (thr->Treg_ganch) +#define PL_reg_magic (thr->Treg_magic) +#define PL_reg_oldcurpm (thr->Treg_oldcurpm) +#define PL_reg_oldpos (thr->Treg_oldpos) +#define PL_reg_re (thr->Treg_re) #define PL_reg_start_tmp (thr->Treg_start_tmp) #define PL_reg_start_tmpl (thr->Treg_start_tmpl) +#define PL_reg_starttry (thr->Treg_starttry) +#define PL_reg_sv (thr->Treg_sv) #define PL_regbol (thr->Tregbol) #define PL_regcc (thr->Tregcc) #define PL_regcode (thr->Tregcode) @@ -630,6 +656,8 @@ #define PL_tmps_stack (thr->Ttmps_stack) #define PL_top_env (thr->Ttop_env) #define PL_toptarget (thr->Ttoptarget) +#define PL_watchaddr (thr->Twatchaddr) +#define PL_watchok (thr->Twatchok) #endif /* USE_THREADS */ @@ -639,6 +667,7 @@ #define PL_Yes (PL_Vars.GYes) #define PL_amagic_generation (PL_Vars.Gamagic_generation) #define PL_an (PL_Vars.Gan) +#define PL_bitcount (PL_Vars.Gbitcount) #define PL_bufend (PL_Vars.Gbufend) #define PL_bufptr (PL_Vars.Gbufptr) #define PL_collation_ix (PL_Vars.Gcollation_ix) @@ -647,6 +676,7 @@ #define PL_collxfrm_base (PL_Vars.Gcollxfrm_base) #define PL_collxfrm_mult (PL_Vars.Gcollxfrm_mult) #define PL_cop_seqmax (PL_Vars.Gcop_seqmax) +#define PL_cred_mutex (PL_Vars.Gcred_mutex) #define PL_cryptseen (PL_Vars.Gcryptseen) #define PL_cshlen (PL_Vars.Gcshlen) #define PL_cshname (PL_Vars.Gcshname) @@ -654,6 +684,8 @@ #define PL_curthr (PL_Vars.Gcurthr) #define PL_debug (PL_Vars.Gdebug) #define PL_do_undump (PL_Vars.Gdo_undump) +#define PL_efloatbuf (PL_Vars.Gefloatbuf) +#define PL_efloatsize (PL_Vars.Gefloatsize) #define PL_egid (PL_Vars.Gegid) #define PL_error_count (PL_Vars.Gerror_count) #define PL_euid (PL_Vars.Geuid) @@ -662,7 +694,9 @@ #define PL_eval_owner (PL_Vars.Geval_owner) #define PL_evalseq (PL_Vars.Gevalseq) #define PL_expect (PL_Vars.Gexpect) +#define PL_filter_debug (PL_Vars.Gfilter_debug) #define PL_gid (PL_Vars.Ggid) +#define PL_glob_index (PL_Vars.Gglob_index) #define PL_he_root (PL_Vars.Ghe_root) #define PL_hexdigit (PL_Vars.Ghexdigit) #define PL_hints (PL_Vars.Ghints) @@ -670,6 +704,11 @@ #define PL_in_my_stash (PL_Vars.Gin_my_stash) #define PL_last_lop (PL_Vars.Glast_lop) #define PL_last_lop_op (PL_Vars.Glast_lop_op) +#define PL_last_swash_hv (PL_Vars.Glast_swash_hv) +#define PL_last_swash_key (PL_Vars.Glast_swash_key) +#define PL_last_swash_klen (PL_Vars.Glast_swash_klen) +#define PL_last_swash_slen (PL_Vars.Glast_swash_slen) +#define PL_last_swash_tmps (PL_Vars.Glast_swash_tmps) #define PL_last_uni (PL_Vars.Glast_uni) #define PL_lex_brackets (PL_Vars.Glex_brackets) #define PL_lex_brackstack (PL_Vars.Glex_brackstack) @@ -696,7 +735,6 @@ #define PL_multi_end (PL_Vars.Gmulti_end) #define PL_multi_open (PL_Vars.Gmulti_open) #define PL_multi_start (PL_Vars.Gmulti_start) -#define PL_na (PL_Vars.Gna) #define PL_nexttoke (PL_Vars.Gnexttoke) #define PL_nexttype (PL_Vars.Gnexttype) #define PL_nextval (PL_Vars.Gnextval) @@ -724,6 +762,7 @@ #define PL_sh_path (PL_Vars.Gsh_path) #define PL_sighandlerp (PL_Vars.Gsighandlerp) #define PL_specialsv_list (PL_Vars.Gspecialsv_list) +#define PL_srand_called (PL_Vars.Gsrand_called) #define PL_subline (PL_Vars.Gsubline) #define PL_subname (PL_Vars.Gsubname) #define PL_sv_mutex (PL_Vars.Gsv_mutex) @@ -737,11 +776,29 @@ #define PL_threadsv_names (PL_Vars.Gthreadsv_names) #define PL_tokenbuf (PL_Vars.Gtokenbuf) #define PL_uid (PL_Vars.Guid) +#define PL_utf8_alnum (PL_Vars.Gutf8_alnum) +#define PL_utf8_alpha (PL_Vars.Gutf8_alpha) +#define PL_utf8_digit (PL_Vars.Gutf8_digit) +#define PL_utf8_lower (PL_Vars.Gutf8_lower) +#define PL_utf8_mark (PL_Vars.Gutf8_mark) +#define PL_utf8_print (PL_Vars.Gutf8_print) +#define PL_utf8_space (PL_Vars.Gutf8_space) +#define PL_utf8_tolower (PL_Vars.Gutf8_tolower) +#define PL_utf8_totitle (PL_Vars.Gutf8_totitle) +#define PL_utf8_toupper (PL_Vars.Gutf8_toupper) +#define PL_utf8_upper (PL_Vars.Gutf8_upper) +#define PL_uudmap (PL_Vars.Guudmap) #define PL_xiv_arenaroot (PL_Vars.Gxiv_arenaroot) #define PL_xiv_root (PL_Vars.Gxiv_root) #define PL_xnv_root (PL_Vars.Gxnv_root) #define PL_xpv_root (PL_Vars.Gxpv_root) #define PL_xrv_root (PL_Vars.Gxrv_root) +#define PL_yychar (PL_Vars.Gyychar) +#define PL_yydebug (PL_Vars.Gyydebug) +#define PL_yyerrflag (PL_Vars.Gyyerrflag) +#define PL_yylval (PL_Vars.Gyylval) +#define PL_yynerrs (PL_Vars.Gyynerrs) +#define PL_yyval (PL_Vars.Gyyval) #else /* !PERL_GLOBAL_STRUCT */ @@ -749,6 +806,7 @@ #define PL_GYes PL_Yes #define PL_Gamagic_generation PL_amagic_generation #define PL_Gan PL_an +#define PL_Gbitcount PL_bitcount #define PL_Gbufend PL_bufend #define PL_Gbufptr PL_bufptr #define PL_Gcollation_ix PL_collation_ix @@ -757,6 +815,7 @@ #define PL_Gcollxfrm_base PL_collxfrm_base #define PL_Gcollxfrm_mult PL_collxfrm_mult #define PL_Gcop_seqmax PL_cop_seqmax +#define PL_Gcred_mutex PL_cred_mutex #define PL_Gcryptseen PL_cryptseen #define PL_Gcshlen PL_cshlen #define PL_Gcshname PL_cshname @@ -764,6 +823,8 @@ #define PL_Gcurthr PL_curthr #define PL_Gdebug PL_debug #define PL_Gdo_undump PL_do_undump +#define PL_Gefloatbuf PL_efloatbuf +#define PL_Gefloatsize PL_efloatsize #define PL_Gegid PL_egid #define PL_Gerror_count PL_error_count #define PL_Geuid PL_euid @@ -772,7 +833,9 @@ #define PL_Geval_owner PL_eval_owner #define PL_Gevalseq PL_evalseq #define PL_Gexpect PL_expect +#define PL_Gfilter_debug PL_filter_debug #define PL_Ggid PL_gid +#define PL_Gglob_index PL_glob_index #define PL_Ghe_root PL_he_root #define PL_Ghexdigit PL_hexdigit #define PL_Ghints PL_hints @@ -780,6 +843,11 @@ #define PL_Gin_my_stash PL_in_my_stash #define PL_Glast_lop PL_last_lop #define PL_Glast_lop_op PL_last_lop_op +#define PL_Glast_swash_hv PL_last_swash_hv +#define PL_Glast_swash_key PL_last_swash_key +#define PL_Glast_swash_klen PL_last_swash_klen +#define PL_Glast_swash_slen PL_last_swash_slen +#define PL_Glast_swash_tmps PL_last_swash_tmps #define PL_Glast_uni PL_last_uni #define PL_Glex_brackets PL_lex_brackets #define PL_Glex_brackstack PL_lex_brackstack @@ -806,7 +874,6 @@ #define PL_Gmulti_end PL_multi_end #define PL_Gmulti_open PL_multi_open #define PL_Gmulti_start PL_multi_start -#define PL_Gna PL_na #define PL_Gnexttoke PL_nexttoke #define PL_Gnexttype PL_nexttype #define PL_Gnextval PL_nextval @@ -834,6 +901,7 @@ #define PL_Gsh_path PL_sh_path #define PL_Gsighandlerp PL_sighandlerp #define PL_Gspecialsv_list PL_specialsv_list +#define PL_Gsrand_called PL_srand_called #define PL_Gsubline PL_subline #define PL_Gsubname PL_subname #define PL_Gsv_mutex PL_sv_mutex @@ -847,20 +915,35 @@ #define PL_Gthreadsv_names PL_threadsv_names #define PL_Gtokenbuf PL_tokenbuf #define PL_Guid PL_uid +#define PL_Gutf8_alnum PL_utf8_alnum +#define PL_Gutf8_alpha PL_utf8_alpha +#define PL_Gutf8_digit PL_utf8_digit +#define PL_Gutf8_lower PL_utf8_lower +#define PL_Gutf8_mark PL_utf8_mark +#define PL_Gutf8_print PL_utf8_print +#define PL_Gutf8_space PL_utf8_space +#define PL_Gutf8_tolower PL_utf8_tolower +#define PL_Gutf8_totitle PL_utf8_totitle +#define PL_Gutf8_toupper PL_utf8_toupper +#define PL_Gutf8_upper PL_utf8_upper +#define PL_Guudmap PL_uudmap #define PL_Gxiv_arenaroot PL_xiv_arenaroot #define PL_Gxiv_root PL_xiv_root #define PL_Gxnv_root PL_xnv_root #define PL_Gxpv_root PL_xpv_root #define PL_Gxrv_root PL_xrv_root - -#ifdef EMBED +#define PL_Gyychar PL_yychar +#define PL_Gyydebug PL_yydebug +#define PL_Gyyerrflag PL_yyerrflag +#define PL_Gyylval PL_yylval +#define PL_Gyynerrs PL_yynerrs +#define PL_Gyyval PL_yyval -#endif /* EMBED */ #endif /* PERL_GLOBAL_STRUCT */ -#ifndef MIN_PERL_DEFINE +#ifdef PERL_POLLUTE /* unsupported in 5.006 */ #define DBsingle PL_DBsingle #define DBsub PL_DBsub @@ -869,9 +952,13 @@ #define curstash PL_curstash #define debstash PL_debstash #define defgv PL_defgv +#define diehook PL_diehook +#define dirty PL_dirty #define dowarn PL_dowarn #define errgv PL_errgv #define na PL_na +#define no_modify PL_no_modify +#define perl_destruct_level PL_perl_destruct_level #define perldb PL_perldb #define rsfp PL_rsfp #define rsfp_filters PL_rsfp_filters