X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/814eedc877a5aa1dbba0047735733e9491aa94a4..02601e33951e916a19e46272146a0b59862aaff5:/op.h?ds=sidebyside diff --git a/op.h b/op.h index bfdebaa..6d9dae8 100644 --- a/op.h +++ b/op.h @@ -38,21 +38,12 @@ typedef PERL_BITFIELD16 Optype; -/* this field now either points to the next sibling or to the parent, - * depending on op_moresib. So rename it from op_sibling to op_sibparent. - */ -#ifdef PERL_OP_PARENT -# define _OP_SIBPARENT_FIELDNAME op_sibparent -#else -# define _OP_SIBPARENT_FIELDNAME op_sibling -#endif - #ifdef BASEOP_DEFINITION #define BASEOP BASEOP_DEFINITION #else #define BASEOP \ OP* op_next; \ - OP* _OP_SIBPARENT_FIELDNAME;\ + OP* op_sibparent; \ OP* (*op_ppaddr)(pTHX); \ PADOFFSET op_targ; \ PERL_BITFIELD16 op_type:9; \ @@ -980,7 +971,7 @@ and C>. For a higher-level interface, see C>. =for apidoc Am|void|OpLASTSIB_set|OP *o|OP *parent -Marks C as having no further siblings. On C builds, marks +Marks C as having no further siblings and marks o as having the specified parent. See also C> and C. For a higher-level interface, see C>. @@ -1026,7 +1017,6 @@ C is non-null. For a higher-level interface, see C>. ( (o) && OP_TYPE_ISNT_AND_WASNT_NN(o, type) ) -#ifdef PERL_OP_PARENT # define OpHAS_SIBLING(o) (cBOOL((o)->op_moresib)) # define OpSIBLING(o) (0 + (o)->op_moresib ? (o)->op_sibparent : NULL) # define OpMORESIB_set(o, sib) ((o)->op_moresib = 1, (o)->op_sibparent = (sib)) @@ -1034,15 +1024,6 @@ C is non-null. For a higher-level interface, see C>. ((o)->op_moresib = 0, (o)->op_sibparent = (parent)) # define OpMAYBESIB_set(o, sib, parent) \ ((o)->op_sibparent = ((o)->op_moresib = cBOOL(sib)) ? (sib) : (parent)) -#else -# define OpHAS_SIBLING(o) (cBOOL((o)->op_sibling)) -# define OpSIBLING(o) (0 + (o)->op_sibling) -# define OpMORESIB_set(o, sib) ((o)->op_moresib = 1, (o)->op_sibling = (sib)) -# define OpLASTSIB_set(o, parent) \ - ((o)->op_moresib = 0, (o)->op_sibling = NULL) -# define OpMAYBESIB_set(o, sib, parent) \ - ((o)->op_moresib = cBOOL(sib), (o)->op_sibling = (sib)) -#endif #if !defined(PERL_CORE) && !defined(PERL_EXT) /* for backwards compatibility only */