move easy lexer state variables into PL_parser

(where "easy" == "only appear in toke.c")

p4raw-id: //depot/perl@29655

1 files changed, 0 insertions, 64 deletions

diff --git a/embedvar.h b/embedvar.h
index 7fe5e295a3..566c2ff196 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -195,7 +195,6 @@
 #define PL_egid			(vTHX->Iegid)
 #define PL_encoding		(vTHX->Iencoding)
 #define PL_endav		(vTHX->Iendav)
-#define PL_endwhite		(vTHX->Iendwhite)
 #define PL_envgv		(vTHX->Ienvgv)
 #define PL_errgv		(vTHX->Ierrgv)
 #define PL_error_count		(vTHX->Ierror_count)
@@ -207,7 +206,6 @@
 #define PL_exitlist		(vTHX->Iexitlist)
 #define PL_exitlistlen		(vTHX->Iexitlistlen)
 #define PL_expect		(vTHX->Iexpect)
-#define PL_faketokens		(vTHX->Ifaketokens)
 #define PL_fdpid		(vTHX->Ifdpid)
 #define PL_filemode		(vTHX->Ifilemode)
 #define PL_forkprocess		(vTHX->Iforkprocess)
@@ -241,22 +239,7 @@
 #define PL_lastfd		(vTHX->Ilastfd)
 #define PL_laststatval		(vTHX->Ilaststatval)
 #define PL_laststype		(vTHX->Ilaststype)
-#define PL_lasttoke		(vTHX->Ilasttoke)
-#define PL_lex_brackets		(vTHX->Ilex_brackets)
-#define PL_lex_brackstack	(vTHX->Ilex_brackstack)
-#define PL_lex_casemods		(vTHX->Ilex_casemods)
-#define PL_lex_casestack	(vTHX->Ilex_casestack)
-#define PL_lex_defer		(vTHX->Ilex_defer)
-#define PL_lex_dojoin		(vTHX->Ilex_dojoin)
-#define PL_lex_expect		(vTHX->Ilex_expect)
-#define PL_lex_formbrack	(vTHX->Ilex_formbrack)
-#define PL_lex_inpat		(vTHX->Ilex_inpat)
-#define PL_lex_inwhat		(vTHX->Ilex_inwhat)
-#define PL_lex_op		(vTHX->Ilex_op)
-#define PL_lex_repl		(vTHX->Ilex_repl)
-#define PL_lex_starts		(vTHX->Ilex_starts)
 #define PL_lex_state		(vTHX->Ilex_state)
-#define PL_lex_stuff		(vTHX->Ilex_stuff)
 #define PL_lineary		(vTHX->Ilineary)
 #define PL_linestart		(vTHX->Ilinestart)
 #define PL_linestr		(vTHX->Ilinestr)
@@ -280,17 +263,13 @@
 #define PL_minus_n		(vTHX->Iminus_n)
 #define PL_minus_p		(vTHX->Iminus_p)
 #define PL_modglobal		(vTHX->Imodglobal)
-#define PL_multi_close		(vTHX->Imulti_close)
 #define PL_multi_end		(vTHX->Imulti_end)
-#define PL_multi_open		(vTHX->Imulti_open)
-#define PL_multi_start		(vTHX->Imulti_start)
 #define PL_my_cxt_keys		(vTHX->Imy_cxt_keys)
 #define PL_my_cxt_list		(vTHX->Imy_cxt_list)
 #define PL_my_cxt_size		(vTHX->Imy_cxt_size)
 #define PL_nexttoke		(vTHX->Inexttoke)
 #define PL_nexttype		(vTHX->Inexttype)
 #define PL_nextval		(vTHX->Inextval)
-#define PL_nextwhite		(vTHX->Inextwhite)
 #define PL_nice_chunk		(vTHX->Inice_chunk)
 #define PL_nice_chunk_size	(vTHX->Inice_chunk_size)
 #define PL_nomemok		(vTHX->Inomemok)
@@ -315,21 +294,18 @@
 #define PL_padix_floor		(vTHX->Ipadix_floor)
 #define PL_parser		(vTHX->Iparser)
 #define PL_patchlevel		(vTHX->Ipatchlevel)
-#define PL_pending_ident	(vTHX->Ipending_ident)
 #define PL_perl_destruct_level	(vTHX->Iperl_destruct_level)
 #define PL_perldb		(vTHX->Iperldb)
 #define PL_perlio		(vTHX->Iperlio)
 #define PL_pidstatus		(vTHX->Ipidstatus)
 #define PL_ppid			(vTHX->Ippid)
 #define PL_preambleav		(vTHX->Ipreambleav)
-#define PL_preambled		(vTHX->Ipreambled)
 #define PL_preprocess		(vTHX->Ipreprocess)
 #define PL_profiledata		(vTHX->Iprofiledata)
 #define PL_psig_name		(vTHX->Ipsig_name)
 #define PL_psig_pend		(vTHX->Ipsig_pend)
 #define PL_psig_ptr		(vTHX->Ipsig_ptr)
 #define PL_ptr_table		(vTHX->Iptr_table)
-#define PL_realtokenstart	(vTHX->Irealtokenstart)
 #define PL_reentrant_buffer	(vTHX->Ireentrant_buffer)
 #define PL_reentrant_retint	(vTHX->Ireentrant_retint)
 #define PL_regex_pad		(vTHX->Iregex_pad)
@@ -348,7 +324,6 @@
 #define PL_sig_pending		(vTHX->Isig_pending)
 #define PL_sighandlerp		(vTHX->Isighandlerp)
 #define PL_signals		(vTHX->Isignals)
-#define PL_skipwhite		(vTHX->Iskipwhite)
 #define PL_sort_RealCmp		(vTHX->Isort_RealCmp)
 #define PL_splitstr		(vTHX->Isplitstr)
 #define PL_srand_called		(vTHX->Isrand_called)
@@ -360,7 +335,6 @@
 #define PL_stdingv		(vTHX->Istdingv)
 #define PL_strtab		(vTHX->Istrtab)
 #define PL_sub_generation	(vTHX->Isub_generation)
-#define PL_sublex_info		(vTHX->Isublex_info)
 #define PL_subline		(vTHX->Isubline)
 #define PL_subname		(vTHX->Isubname)
 #define PL_sv_arenaroot		(vTHX->Isv_arenaroot)
@@ -373,12 +347,6 @@
 #define PL_sys_intern		(vTHX->Isys_intern)
 #define PL_taint_warn		(vTHX->Itaint_warn)
 #define PL_tainting		(vTHX->Itainting)
-#define PL_thisclose		(vTHX->Ithisclose)
-#define PL_thismad		(vTHX->Ithismad)
-#define PL_thisopen		(vTHX->Ithisopen)
-#define PL_thisstuff		(vTHX->Ithisstuff)
-#define PL_thistoken		(vTHX->Ithistoken)
-#define PL_thiswhite		(vTHX->Ithiswhite)
 #define PL_threadhook		(vTHX->Ithreadhook)
 #define PL_tokenbuf		(vTHX->Itokenbuf)
 #define PL_uid			(vTHX->Iuid)
@@ -493,7 +461,6 @@
 #define PL_Iegid		PL_egid
 #define PL_Iencoding		PL_encoding
 #define PL_Iendav		PL_endav
-#define PL_Iendwhite		PL_endwhite
 #define PL_Ienvgv		PL_envgv
 #define PL_Ierrgv		PL_errgv
 #define PL_Ierror_count		PL_error_count
@@ -505,7 +472,6 @@
 #define PL_Iexitlist		PL_exitlist
 #define PL_Iexitlistlen		PL_exitlistlen
 #define PL_Iexpect		PL_expect
-#define PL_Ifaketokens		PL_faketokens
 #define PL_Ifdpid		PL_fdpid
 #define PL_Ifilemode		PL_filemode
 #define PL_Iforkprocess		PL_forkprocess
@@ -539,22 +505,7 @@
 #define PL_Ilastfd		PL_lastfd
 #define PL_Ilaststatval		PL_laststatval
 #define PL_Ilaststype		PL_laststype
-#define PL_Ilasttoke		PL_lasttoke
-#define PL_Ilex_brackets	PL_lex_brackets
-#define PL_Ilex_brackstack	PL_lex_brackstack
-#define PL_Ilex_casemods	PL_lex_casemods
-#define PL_Ilex_casestack	PL_lex_casestack
-#define PL_Ilex_defer		PL_lex_defer
-#define PL_Ilex_dojoin		PL_lex_dojoin
-#define PL_Ilex_expect		PL_lex_expect
-#define PL_Ilex_formbrack	PL_lex_formbrack
-#define PL_Ilex_inpat		PL_lex_inpat
-#define PL_Ilex_inwhat		PL_lex_inwhat
-#define PL_Ilex_op		PL_lex_op
-#define PL_Ilex_repl		PL_lex_repl
-#define PL_Ilex_starts		PL_lex_starts
 #define PL_Ilex_state		PL_lex_state
-#define PL_Ilex_stuff		PL_lex_stuff
 #define PL_Ilineary		PL_lineary
 #define PL_Ilinestart		PL_linestart
 #define PL_Ilinestr		PL_linestr
@@ -578,17 +529,13 @@
 #define PL_Iminus_n		PL_minus_n
 #define PL_Iminus_p		PL_minus_p
 #define PL_Imodglobal		PL_modglobal
-#define PL_Imulti_close		PL_multi_close
 #define PL_Imulti_end		PL_multi_end
-#define PL_Imulti_open		PL_multi_open
-#define PL_Imulti_start		PL_multi_start
 #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_Inexttoke		PL_nexttoke
 #define PL_Inexttype		PL_nexttype
 #define PL_Inextval		PL_nextval
-#define PL_Inextwhite		PL_nextwhite
 #define PL_Inice_chunk		PL_nice_chunk
 #define PL_Inice_chunk_size	PL_nice_chunk_size
 #define PL_Inomemok		PL_nomemok
@@ -613,21 +560,18 @@
 #define PL_Ipadix_floor		PL_padix_floor
 #define PL_Iparser		PL_parser
 #define PL_Ipatchlevel		PL_patchlevel
-#define PL_Ipending_ident	PL_pending_ident
 #define PL_Iperl_destruct_level	PL_perl_destruct_level
 #define PL_Iperldb		PL_perldb
 #define PL_Iperlio		PL_perlio
 #define PL_Ipidstatus		PL_pidstatus
 #define PL_Ippid		PL_ppid
 #define PL_Ipreambleav		PL_preambleav
-#define PL_Ipreambled		PL_preambled
 #define PL_Ipreprocess		PL_preprocess
 #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_Irealtokenstart	PL_realtokenstart
 #define PL_Ireentrant_buffer	PL_reentrant_buffer
 #define PL_Ireentrant_retint	PL_reentrant_retint
 #define PL_Iregex_pad		PL_regex_pad
@@ -646,7 +590,6 @@
 #define PL_Isig_pending		PL_sig_pending
 #define PL_Isighandlerp		PL_sighandlerp
 #define PL_Isignals		PL_signals
-#define PL_Iskipwhite		PL_skipwhite
 #define PL_Isort_RealCmp	PL_sort_RealCmp
 #define PL_Isplitstr		PL_splitstr
 #define PL_Isrand_called	PL_srand_called
@@ -658,7 +601,6 @@
 #define PL_Istdingv		PL_stdingv
 #define PL_Istrtab		PL_strtab
 #define PL_Isub_generation	PL_sub_generation
-#define PL_Isublex_info		PL_sublex_info
 #define PL_Isubline		PL_subline
 #define PL_Isubname		PL_subname
 #define PL_Isv_arenaroot	PL_sv_arenaroot
@@ -671,12 +613,6 @@
 #define PL_Isys_intern		PL_sys_intern
 #define PL_Itaint_warn		PL_taint_warn
 #define PL_Itainting		PL_tainting
-#define PL_Ithisclose		PL_thisclose
-#define PL_Ithismad		PL_thismad
-#define PL_Ithisopen		PL_thisopen
-#define PL_Ithisstuff		PL_thisstuff
-#define PL_Ithistoken		PL_thistoken
-#define PL_Ithiswhite		PL_thiswhite
 #define PL_Ithreadhook		PL_threadhook
 #define PL_Itokenbuf		PL_tokenbuf
 #define PL_Iuid			PL_uid