partial MULTIPLICITY cleanup

p4raw-id: //depot/perl@1205

1 files changed, 112 insertions, 87 deletions

diff --git a/intrpvar.h b/intrpvar.h
index 5637f126be..2ecde8d482 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -2,84 +2,96 @@
 /* Global only to current interpreter instance */
 /***********************************************/
 
+/* Don't forget to re-run embed.pl to propagate changes! */
+
+/* The 'I' prefix is only needed for vars that need appropriate #defines
+ * generated when built with or without MULTIPLICITY.  It is also used
+ * to generate the appropriate export list for win32.
+ *
+ * When building without MULTIPLICITY, these variables will be truly global.
+ *
+ * Avoid build-specific #ifdefs here, like DEBUGGING.  That way,
+ * we can keep binary compatibility of the curinterp structure */
+
 /* pseudo environmental stuff */
-PERLVAR(Iorigargc,	int)		
-PERLVAR(Iorigargv,	char **)		
-PERLVAR(Ienvgv,		GV *)		
-PERLVAR(Isiggv,		GV *)		
-PERLVAR(Iincgv,		GV *)		
-PERLVAR(Iorigfilename,	char *)		
-PERLVAR(Idiehook,	SV *)		
-PERLVAR(Iwarnhook,	SV *)		
-PERLVAR(Iparsehook,	SV *)		
+PERLVAR(Iorigargc,	int)
+PERLVAR(Iorigargv,	char **)
+PERLVAR(Ienvgv,		GV *)
+PERLVAR(Isiggv,		GV *)
+PERLVAR(Iincgv,		GV *)
+PERLVAR(Iorigfilename,	char *)
+PERLVAR(Idiehook,	SV *)
+PERLVAR(Iwarnhook,	SV *)
+PERLVAR(Iparsehook,	SV *)
 PERLVAR(Icddir,		char *)		/* switches */
-PERLVAR(Iminus_c,	bool)		
-PERLVAR(Ipatchlevel[10],char)		
-PERLVAR(Ilocalpatches,	char **)		
-PERLVARI(Isplitstr,	char *,	" ")	
-PERLVAR(Ipreprocess,	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(Idowarn,	bool)		
-PERLVAR(Idoextract,	bool)		
+PERLVAR(Iminus_c,	bool)
+PERLVAR(Ipatchlevel[10],char)
+PERLVAR(Ilocalpatches,	char **)
+PERLVARI(Isplitstr,	char *,	" ")
+PERLVAR(Ipreprocess,	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(Idowarn,	bool)
+PERLVAR(Idoextract,	bool)
 PERLVAR(Isawampersand,	bool)		/* must save all match strings */
 PERLVAR(Isawstudy,	bool)		/* do fbm_instr on all strings */
-PERLVAR(Isawvec,	bool)		
-PERLVAR(Iunsafe,	bool)		
-PERLVAR(Iinplace,	char *)		
-PERLVAR(Ie_script,	SV *)		
-PERLVAR(Iperldb,	U32)		
+PERLVAR(Isawvec,	bool)
+PERLVAR(Iunsafe,	bool)
+PERLVAR(Iinplace,	char *)
+PERLVAR(Ie_script,	SV *)
+PERLVAR(Iperldb,	U32)
 
 /* This value may be raised by extensions for testing purposes */
 /* 0=none, 1=full, 2=full with checks */
-PERLVARI(Iperl_destruct_level,	int,	0)	
+PERLVARI(Iperl_destruct_level,	int,	0)
 
 /* magical thingies */
 PERLVAR(Ibasetime,	Time_t)		/* $^T */
 PERLVAR(Iformfeed,	SV *)		/* $^L */
 
 
-PERLVARI(Imaxsysfd,	I32,	MAXSYSFD)	/* top fd to pass to subprocesses */
+PERLVARI(Imaxsysfd,	I32,	MAXSYSFD)
+					/* top fd to pass to subprocesses */
 PERLVAR(Imultiline,	int)		/* $*--do strings hold >1 line? */
 PERLVAR(Istatusvalue,	I32)		/* $? */
 #ifdef VMS
-PERLVAR(Istatusvalue_vms,	U32)		
+PERLVAR(Istatusvalue_vms,U32)
 #endif
 
-PERLVAR(Istatcache,	Stat_t)	/* _ */
-PERLVAR(Istatgv,	GV *)		
-PERLVARI(Istatname,	SV *,	Nullsv)	
+PERLVAR(Istatcache,	Stat_t)		/* _ */
+PERLVAR(Istatgv,	GV *)
+PERLVARI(Istatname,	SV *,	Nullsv)
 
 /* shortcuts to various I/O objects */
-PERLVAR(Istdingv,	GV *)		
-PERLVAR(Idefgv,		GV *)		
-PERLVAR(Iargvgv,	GV *)		
-PERLVAR(Iargvoutgv,	GV *)		
+PERLVAR(Istdingv,	GV *)
+PERLVAR(Idefgv,		GV *)
+PERLVAR(Iargvgv,	GV *)
+PERLVAR(Iargvoutgv,	GV *)
 
 /* shortcuts to regexp stuff */
-PERLVAR(Ileftgv,	GV *)		
-PERLVAR(Iampergv,	GV *)		
-PERLVAR(Irightgv,	GV *)		
-PERLVAR(Iscreamfirst,	I32 *)		
-PERLVAR(Iscreamnext,	I32 *)		
-PERLVARI(Imaxscream,	I32,	-1)	
-PERLVAR(Ilastscream,	SV *)		
-PERLVAR(Ireplgv,	GV *)		
+PERLVAR(Ileftgv,	GV *)
+PERLVAR(Iampergv,	GV *)
+PERLVAR(Irightgv,	GV *)
+PERLVAR(Iscreamfirst,	I32 *)
+PERLVAR(Iscreamnext,	I32 *)
+PERLVARI(Imaxscream,	I32,	-1)
+PERLVAR(Ilastscream,	SV *)
+PERLVAR(Ireplgv,	GV *)
 
 /* shortcuts to misc objects */
-PERLVAR(Ierrgv,		GV *)		
+PERLVAR(Ierrgv,		GV *)
 
 /* shortcuts to debugging objects */
-PERLVAR(IDBgv,		GV *)		
-PERLVAR(IDBline,	GV *)		
-PERLVAR(IDBsub,		GV *)		
-PERLVAR(IDBsingle,	SV *)		
-PERLVAR(IDBtrace,	SV *)		
-PERLVAR(IDBsignal,	SV *)		
+PERLVAR(IDBgv,		GV *)
+PERLVAR(IDBline,	GV *)
+PERLVAR(IDBsub,		GV *)
+PERLVAR(IDBsingle,	SV *)
+PERLVAR(IDBtrace,	SV *)
+PERLVAR(IDBsignal,	SV *)
 PERLVAR(Ilineary,	AV *)		/* lines of script for debugger */
 PERLVAR(Idbargs,	AV *)		/* args to call listed by caller function */
 
@@ -99,8 +111,8 @@ PERLVAR(Isv_root,	SV*)		/* storage for SVs belonging to interp */
 PERLVAR(Isv_arenaroot,	SV*)		/* list of areas for garbage collection */
 
 /* funky return mechanisms */
-PERLVAR(Ilastspbase,	I32)		
-PERLVAR(Ilastsize,	I32)		
+PERLVAR(Ilastspbase,	I32)
+PERLVAR(Ilastsize,	I32)
 PERLVAR(Iforkprocess,	int)		/* so do_open |- can return proc# */
 
 /* subprocess state */
@@ -112,21 +124,21 @@ PERLVARI(Iop_mask,	char *,	NULL)	/* masked operations for safe evals */
 PERLVAR(Ilast_proto, char *)		/* Prototype of last sub seen. */
 
 /* trace state */
-PERLVAR(Idlevel,	I32)		
-PERLVARI(Idlmax,	I32,	128)	
-PERLVAR(Idebname,	char *)		
-PERLVAR(Idebdelim,	char *)		
+PERLVAR(Idlevel,	I32)
+PERLVARI(Idlmax,	I32,	128)
+PERLVAR(Idebname,	char *)
+PERLVAR(Idebdelim,	char *)
 
 /* current interpreter roots */
-PERLVAR(Imain_cv,	CV *)		
-PERLVAR(Imain_root,	OP *)		
-PERLVAR(Imain_start,	OP *)		
-PERLVAR(Ieval_root,	OP *)		
-PERLVAR(Ieval_start,	OP *)		
+PERLVAR(Imain_cv,	CV *)
+PERLVAR(Imain_root,	OP *)
+PERLVAR(Imain_start,	OP *)
+PERLVAR(Ieval_root,	OP *)
+PERLVAR(Ieval_start,	OP *)
 
 /* runtime control stuff */
-PERLVARI(Icurcopdb,	COP *,	NULL)	
-PERLVARI(Icopline,	line_t,	NOLINE)	
+PERLVARI(Icurcopdb,	COP *,	NULL)
+PERLVARI(Icopline,	line_t,	NOLINE)
 
 /* statics moved here for shared library purposes */
 PERLVAR(Istrchop,	SV)		/* return value from chop */
@@ -141,25 +153,41 @@ PERLVAR(Ifirstgv,	GV *)		/* $a */
 PERLVAR(Isecondgv,	GV *)		/* $b */
 PERLVAR(Imystrk,	SV *)		/* temp key string for do_each() */
 PERLVAR(Idumplvl,	I32)		/* indentation level on syntax tree dump */
-PERLVAR(Ioldlastpm,	PMOP *)		/* for saving regexp context during debugger */
+PERLVAR(Ioldlastpm,	PMOP *)		/* for saving regexp context in debugger */
 PERLVAR(Igensym,	I32)		/* next symbol for getsym() to define */
-PERLVAR(Ipreambled,	bool)		
-PERLVAR(Ipreambleav,	AV *)		
-PERLVARI(Ilaststatval,	int,	-1)	
-PERLVARI(Ilaststype,	I32,	OP_STAT)	
-PERLVAR(Imess_sv,	SV *)		
+PERLVAR(Ipreambled,	bool)
+PERLVAR(Ipreambleav,	AV *)
+PERLVARI(Ilaststatval,	int,	-1)
+PERLVARI(Ilaststype,	I32,	OP_STAT)
+PERLVAR(Imess_sv,	SV *)
 
-PERLVAR(Iors,		char *)		/* $\ */
-PERLVAR(Iorslen,	STRLEN)		
-PERLVAR(Iofmt,		char *)		/* $# */
+/* XXX shouldn't these be per-thread? --GSAR */
+PERLVAR(Iors,		char *)		/* output record separator $\ */
+PERLVAR(Iorslen,	STRLEN)
+PERLVAR(Iofmt,		char *)		/* output format for numbers $# */
 
 /* interpreter atexit processing */
-PERLVARI(Iexitlist,	PerlExitListEntry *, NULL)	/* list of exit functions */
-PERLVARI(Iexitlistlen,	I32, 0)				/* length of same */
-PERLVAR(Imodglobal,	HV *)				/* per-interp module data */
+PERLVARI(Iexitlist,	PerlExitListEntry *, NULL)
+					/* list of exit functions */
+PERLVARI(Iexitlistlen,	I32, 0)		/* length of same */
+PERLVAR(Imodglobal,	HV *)		/* per-interp module data */
+
+/* these used to be in global before 5.004_68 */
+PERLVARI(Iprofiledata,	U32 *,	NULL)	/* table of ops, counts */
+PERLVARI(Irsfp,	PerlIO * VOL,	Nullfp) /* current source file pointer */
+PERLVARI(Irsfp_filters,	AV *,	Nullav)	/* keeps active source filters */
+
+PERLVAR(Icompiling,	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 */
 
 #ifdef HAVE_INTERP_INTERN
-PERLVAR(Isys_intern,	struct interp_intern)		/* platform internals */
+PERLVAR(Isys_intern,	struct interp_intern)
+					/* platform internals */
 #endif
 
 /* more statics moved here */
@@ -171,7 +199,7 @@ PERLVAR(Ilastgotoprobe,	OP*)		/* from pp_ctl.c */
 PERLVAR(Iregdummy,	regnode)	/* from regcomp.c */
 PERLVAR(Iregcomp_parse,	char*)		/* Input-scan pointer. */
 PERLVAR(Iregxend,	char*)		/* End of input for compile */
-PERLVAR(Iregcode,	regnode*)	/* Code-emit pointer; &regdummy = don't. */
+PERLVAR(Iregcode,	regnode*)	/* Code-emit pointer; &regdummy = don't */
 PERLVAR(Iregnaughty,	I32)		/* How bad is this pattern? */
 PERLVAR(Iregsawback,	I32)		/* Did we see \1, ...? */
 
@@ -185,10 +213,8 @@ PERLVAR(Iregseen,	U32)		/* from regcomp.c */
 PERLVAR(Iseen_zerolen,	I32)		/* from regcomp.c */
 PERLVAR(Iregcomp_rx,	regexp *)	/* from regcomp.c */
 PERLVAR(Iextralen,	I32)		/* from regcomp.c */
-/* #ifdef DEBUGGING -- keep the structure the same with/without DEBUGGING defined */
 PERLVAR(Icolorset,	int)		/* from regcomp.c */
 PERLVAR(Icolors[4],	char *)		/* from regcomp.c */
-/* #endif */
 
 PERLVAR(Ireginput,	char *)		/* String-input pointer. */
 PERLVAR(Iregbol,	char *)		/* Beginning of input, for ^ check. */
@@ -201,27 +227,26 @@ PERLVAR(Iregprev,	char)		/* char before regbol, \n if none */
 
 PERLVAR(Ireg_start_tmp,	char **)	/* from regexec.c */
 PERLVAR(Ireg_start_tmpl,U32)		/* from regexec.c */
-PERLVAR(Iregdata,	struct reg_data *) /* from regexec.c renamed was data */
+PERLVAR(Iregdata,	struct reg_data *)
+					/* from regexec.c renamed was data */
 PERLVAR(Ibostr,		char *)		/* from regexec.c */
 PERLVAR(Ireg_flags,	U32)		/* from regexec.c */
 PERLVAR(Ireg_eval_set,	I32)		/* from regexec.c */
 
-/* #ifdef DEBUGGING -- keep the structure the same with/without DEBUGGING defined */
 PERLVAR(Iregnarrate,	I32)		/* from regexec.c */
 PERLVAR(Iregprogram,	regnode *)	/* from regexec.c */
 PERLVARI(Iregindent,	int,	    0)	/* from regexec.c */
-/* #endif */
 
 PERLVAR(Iregcc,		CURCUR *)	/* from regexec.c */
-PERLVARI(Iin_clean_objs,bool,	    FALSE)  /* from sv.c */
-PERLVARI(Iin_clean_all,	bool,	    FALSE)  /* from sv.c */
+PERLVARI(Iin_clean_objs,bool,    FALSE)	/* from sv.c */
+PERLVARI(Iin_clean_all,	bool,    FALSE)	/* from sv.c */
 
 PERLVAR(Ilinestart,	char *)		/* beg. of most recently read line */
 PERLVAR(Ipending_ident,	char)		/* pending identifier lookup */
 PERLVAR(Isublex_info,	SUBLEXINFO)	/* from toke.c */
 
 #ifdef USE_THREADS
-PERLVAR(Ithrsv,		SV *)		/* holds struct perl_thread for main thread */
+PERLVAR(Ithrsv,		SV *)		/* struct perl_thread for main thread */
 PERLVARI(Ithreadnum,	U32,	0)	/* incremented each thread creation */
 #endif /* USE_THREADS */