Tweak change 27457 - make PL_lasttoke MAD only, but teach makedef.pl

about MADness (and unMADness - maybe there is a special word for that)

p4raw-id: //depot/perl@27460

diff --git a/intrpvar.h b/intrpvar.h
index 7f947a34d8a0ccae7786982a0773301cd754197f..6cdf894df5cd32173782340ff7e0051279fadf77 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -300,8 +300,8 @@ PERLVAR(Ilex_casestack,     char *)         /* what kind of case mods in effect */
 /* What we know when we're in LEX_KNOWNEXT state. */
 #ifdef PERL_MAD
 PERLVARA(Inexttoke,5,  NEXTTOKE)       /* value of next token, if any */
-#else
 PERLVAR(Ilasttoke,     I32)
+#else
 PERLVARA(Inextval,5,   YYSTYPE)        /* value of next token, if any */
 PERLVARA(Inexttype,5,  I32)            /* type of next token */
 PERLVAR(Inexttoke,     I32)

diff --git a/makedef.pl b/makedef.pl
index ab3b2c416d27f686fa3a89c94ebc6e1b6f802c73..5b4f930260baac6cc97ee8a02d796a06c4168e67 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -837,10 +837,16 @@ unless ($define{'PERL_TRACK_MEMPOOL'}) {
                     )];
 }
 
-unless ($define{'PERL_MAD'}) {
+if ($define{'PERL_MAD'}) {
+    skip_symbols [qw(
+                    PL_nextval
+                    PL_nexttype
+                    )];
+} else {
     skip_symbols [qw(
                    PL_madskills
                    PL_xmlfp
+                   PL_lasttoke
                    Perl_pad_peg
                    Perl_xmldump_indent
                    Perl_xmldump_vindent