add blk_old_tmpsfloor shortcut
authorDavid Mitchell <davem@iabyn.com>
Wed, 30 Dec 2015 15:48:52 +0000 (15:48 +0000)
committerDavid Mitchell <davem@iabyn.com>
Wed, 3 Feb 2016 09:19:20 +0000 (09:19 +0000)
Add

    #define blk_old_tmpsfloor cx_u.cx_blk.blku_old_tmpsfloor

to match all the other 'struct block' fields which have similar short cuts

cop.h
inline.h

diff --git a/cop.h b/cop.h
index 8a5ba8b..269bdeb 100644 (file)
--- a/cop.h
+++ b/cop.h
@@ -739,6 +739,7 @@ struct block {
 #define blk_gimme      cx_u.cx_blk.blku_gimme
 #define blk_u16                cx_u.cx_blk.blku_u16
 #define blk_oldsaveix   cx_u.cx_blk.blku_oldsaveix
+#define blk_old_tmpsfloor cx_u.cx_blk.blku_old_tmpsfloor
 #define blk_sub                cx_u.cx_blk.blk_u.blku_sub
 #define blk_format     cx_u.cx_blk.blk_u.blku_format
 #define blk_eval       cx_u.cx_blk.blk_u.blku_eval
index 87b3d13..492a965 100644 (file)
--- a/inline.h
+++ b/inline.h
@@ -423,7 +423,7 @@ S_cx_pushblock(pTHX_ U8 type, U8 gimme, SV** sp, I32 saveix)
     cx->blk_oldmarksp  = PL_markstack_ptr - PL_markstack;
     cx->blk_oldscopesp = PL_scopestack_ix;
     cx->blk_oldpm      = PL_curpm;
-    cx->cx_u.cx_blk.blku_old_tmpsfloor = PL_tmps_floor;
+    cx->blk_old_tmpsfloor = PL_tmps_floor;
 
     PL_tmps_floor        = PL_tmps_ix;
     CX_DEBUG(cx, "PUSH");
@@ -450,7 +450,7 @@ S_cx_popblock(pTHX_ PERL_CONTEXT *cx)
     assert(   (CxTYPE(cx) == CXt_SUB && CxMULTICALL(cx))
             || PL_savestack_ix == cx->blk_oldsaveix);
     PL_curcop     = cx->blk_oldcop;
-    PL_tmps_floor = cx->cx_u.cx_blk.blku_old_tmpsfloor;
+    PL_tmps_floor = cx->blk_old_tmpsfloor;
 }
 
 /* Continue a block elsewhere (e.g. NEXT, REDO, GOTO).