This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
eliminate OP_4tree type
authorDavid Mitchell <davem@iabyn.com>
Sun, 1 Apr 2012 12:59:58 +0000 (13:59 +0100)
committerDavid Mitchell <davem@iabyn.com>
Wed, 13 Jun 2012 12:32:51 +0000 (13:32 +0100)
This was an alias to OP, and formerly used by the old re_eval mechanism

regcomp.h
regexec.c

index 8cf0a92..cca15bc 100644 (file)
--- a/regcomp.h
+++ b/regcomp.h
@@ -9,9 +9,6 @@
  */
 #include "regcharclass.h"
 
-typedef OP OP_4tree;                   /* Will be redefined later. */
-
-
 /* Convert branch sequences to more efficient trie ops? */
 #define PERL_ENABLE_TRIE_OPTIMISATION 1
 
index ea40e4a..e14c69c 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -4246,7 +4246,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
                /* execute the code in the {...} */
                dSP;
                SV ** const before = SP;
-               OP_4tree * const oop = PL_op;
+               OP * const oop = PL_op;
                COP * const ocurcop = PL_curcop;
                PAD *old_comppad, *new_comppad;
                char *saved_regeol = PL_regeol;
@@ -4278,17 +4278,17 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
                                                (REGEXP*)(rexi->data->data[n])
                                            ))->qr_anoncv
                                        ))[1];
-                   PL_op = (OP_4tree*)rexi->data->data[n+1];
+                   PL_op = (OP*)rexi->data->data[n+1];
                }
                else if (rexi->data->what[n] == 'l') { /* literal code */
                    new_comppad = initial_pad; /* the pad of the current sub */
-                   PL_op = (OP_4tree*)rexi->data->data[n];
+                   PL_op = (OP*)rexi->data->data[n];
                }
                else {
                    /* literal with own CV */
                    assert(rexi->data->what[n] == 'L');
                    new_comppad =  (PAD*)AvARRAY(CvPADLIST(rex->qr_anoncv))[1];
-                   PL_op = (OP_4tree*)rexi->data->data[n];
+                   PL_op = (OP*)rexi->data->data[n];
                }
                /* the initial nextstate you would normally execute
                 * at the start of an eval (which would cause error