inline S_init_lexer() and regen

p4raw-id: //depot/perl@31045

diff --git a/embed.fnc b/embed.fnc
index 3e86722..a4c97d4 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1255,7 +1255,6 @@ s |void   |forbid_setid   |const char flag|const int suidscript
 s      |void   |incpush        |NULLOK const char *dir|bool addsubdirs|bool addoldvers|bool usesep|bool canrelocate
 s      |void   |init_interp
 s      |void   |init_ids
-s      |void   |init_lexer
 s      |void   |init_main_stash
 s      |void   |init_perllib
 s      |void   |init_postdump_symbols|int argc|NN char **argv|NULLOK char **env

diff --git a/embed.h b/embed.h
index 5d83dd2..2fea714 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -1249,7 +1249,6 @@
 #define incpush                        S_incpush
 #define init_interp            S_init_interp
 #define init_ids               S_init_ids
-#define init_lexer             S_init_lexer
 #define init_main_stash                S_init_main_stash
 #define init_perllib           S_init_perllib
 #define init_postdump_symbols  S_init_postdump_symbols
@@ -3508,7 +3507,6 @@
 #define incpush(a,b,c,d,e)     S_incpush(aTHX_ a,b,c,d,e)
 #define init_interp()          S_init_interp(aTHX)
 #define init_ids()             S_init_ids(aTHX)
-#define init_lexer()           S_init_lexer(aTHX)
 #define init_main_stash()      S_init_main_stash(aTHX)
 #define init_perllib()         S_init_perllib(aTHX)
 #define init_postdump_symbols(a,b,c)   S_init_postdump_symbols(aTHX_ a,b,c)

diff --git a/embedvar.h b/embedvar.h
index bc1d3aa..6de77e7 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -273,7 +273,6 @@
 #define PL_nice_chunk          (vTHX->Inice_chunk)
 #define PL_nice_chunk_size     (vTHX->Inice_chunk_size)
 #define PL_nomemok             (vTHX->Inomemok)
-#define PL_numeric_compat1     (vTHX->Inumeric_compat1)
 #define PL_numeric_local       (vTHX->Inumeric_local)
 #define PL_numeric_name                (vTHX->Inumeric_name)
 #define PL_numeric_radix_sv    (vTHX->Inumeric_radix_sv)
@@ -381,7 +380,6 @@
 #define PL_utf8locale          (vTHX->Iutf8locale)
 #define PL_uudmap              (vTHX->Iuudmap)
 #define PL_warnhook            (vTHX->Iwarnhook)
-#define PL_widesyscalls                (vTHX->Iwidesyscalls)
 #define PL_xmlfp               (vTHX->Ixmlfp)
 
 #else  /* !MULTIPLICITY */
@@ -541,7 +539,6 @@
 #define PL_Inice_chunk         PL_nice_chunk
 #define PL_Inice_chunk_size    PL_nice_chunk_size
 #define PL_Inomemok            PL_nomemok
-#define PL_Inumeric_compat1    PL_numeric_compat1
 #define PL_Inumeric_local      PL_numeric_local
 #define PL_Inumeric_name       PL_numeric_name
 #define PL_Inumeric_radix_sv   PL_numeric_radix_sv
@@ -649,7 +646,6 @@
 #define PL_Iutf8locale         PL_utf8locale
 #define PL_Iuudmap             PL_uudmap
 #define PL_Iwarnhook           PL_warnhook
-#define PL_Iwidesyscalls       PL_widesyscalls
 #define PL_Ixmlfp              PL_xmlfp
 
 #define PL_TSv                 PL_Sv

diff --git a/perl.c b/perl.c
index 09052d8..ca4ebb4 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -1658,6 +1658,7 @@ STATIC void *
 S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 {
     dVAR;
+    PerlIO *tmpfp;
     int argc = PL_origargc;
     char **argv = PL_origargv;
     const char *scriptname = NULL;
@@ -2257,7 +2258,11 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
     }
 #endif
 
-    init_lexer();
+    tmpfp = PL_rsfp;
+    PL_rsfp = NULL;
+    lex_start(PL_linestr);
+    PL_rsfp = tmpfp;
+    PL_subname = newSVpvs("main");
 
     /* now parse the script */
 
@@ -4564,17 +4569,6 @@ S_nuke_stacks(pTHX)
     Safefree(PL_savestack);
 }
 
-STATIC void
-S_init_lexer(pTHX)
-{
-    dVAR;
-    PerlIO *tmpfp;
-    tmpfp = PL_rsfp;
-    PL_rsfp = NULL;
-    lex_start(PL_linestr);
-    PL_rsfp = tmpfp;
-    PL_subname = newSVpvs("main");
-}
 
 STATIC void
 S_init_predump_symbols(pTHX)

diff --git a/perlapi.h b/perlapi.h
index 59bb04b..da5363d 100644 (file)
--- a/perlapi.h
+++ b/perlapi.h
@@ -424,8 +424,6 @@ END_EXTERN_C
 #define PL_nice_chunk_size     (*Perl_Inice_chunk_size_ptr(aTHX))
 #undef  PL_nomemok
 #define PL_nomemok             (*Perl_Inomemok_ptr(aTHX))
-#undef  PL_numeric_compat1
-#define PL_numeric_compat1     (*Perl_Inumeric_compat1_ptr(aTHX))
 #undef  PL_numeric_local
 #define PL_numeric_local       (*Perl_Inumeric_local_ptr(aTHX))
 #undef  PL_numeric_name
@@ -640,8 +638,6 @@ END_EXTERN_C
 #define PL_uudmap              (*Perl_Iuudmap_ptr(aTHX))
 #undef  PL_warnhook
 #define PL_warnhook            (*Perl_Iwarnhook_ptr(aTHX))
-#undef  PL_widesyscalls
-#define PL_widesyscalls                (*Perl_Iwidesyscalls_ptr(aTHX))
 #undef  PL_xmlfp
 #define PL_xmlfp               (*Perl_Ixmlfp_ptr(aTHX))
 #undef  PL_Sv

diff --git a/proto.h b/proto.h
index f8aa9a2..c769d30 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -3378,7 +3378,6 @@ STATIC void       S_forbid_setid(pTHX_ const char flag, const int suidscript);
 STATIC void    S_incpush(pTHX_ const char *dir, bool addsubdirs, bool addoldvers, bool usesep, bool canrelocate);
 STATIC void    S_init_interp(pTHX);
 STATIC void    S_init_ids(pTHX);
-STATIC void    S_init_lexer(pTHX);
 STATIC void    S_init_main_stash(pTHX);
 STATIC void    S_init_perllib(pTHX);
 STATIC void    S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env)