applied suggested patch with PERL_OBJECT tweaks

[perl5.git] / thrdvar.h

diff --git a/thrdvar.h b/thrdvar.h
index c247dc4..7c72259 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -85,7 +85,7 @@ PERLVAR(Trestartop,   OP *)           /* propagating an error from croak? */
 PERLVARI(Tcurcop,      COP * VOL,      &PL_compiling)
 PERLVAR(Tin_eval,      VOL int)        /* trap "fatal" errors? */
 PERLVAR(Tdelaymagic,   int)            /* ($<,$>) = ... */
-PERLVAR(Tdirty,                bool)           /* in the middle of tearing things down? */
+PERLVARI(Tdirty,       bool, FALSE)    /* in the middle of tearing things down? */
 PERLVAR(Tlocalizing,   int)            /* are we processing a local() list? */
 
 PERLVAR(Tcurstack,     AV *)           /* THE STACK */
@@ -102,6 +102,7 @@ PERLVAR(Thv_fetch_ent_mh, HE)               /* owned by hv_fetch_ent() */
 PERLVAR(Tmodcount,     I32)            /* how much mod()ification in assignment? */
 
 PERLVAR(Tlastgotoprobe,        OP*)            /* from pp_ctl.c */
+PERLVARI(Tdumpindent,  I32, 4)         /* # of blanks per dump indentation level */
 
 /* sort stuff */
 PERLVAR(Tsortcop,      OP *)           /* user defined sort routine */
@@ -133,7 +134,7 @@ PERLVAR(Tseen_evals,        I32)            /* from regcomp.c */
 PERLVAR(Tregcomp_rx,   regexp *)       /* from regcomp.c */
 PERLVAR(Textralen,     I32)            /* from regcomp.c */
 PERLVAR(Tcolorset,     int)            /* from regcomp.c */
-PERLVAR(Tcolors[4],    char *)         /* from regcomp.c */
+PERLVAR(Tcolors[6],    char *)         /* from regcomp.c */
 PERLVAR(Treginput,     char *)         /* String-input pointer. */
 PERLVAR(Tregbol,       char *)         /* Beginning of input, for ^ check. */
 PERLVAR(Tregeol,       char *)         /* End of input, for $ check. */
@@ -155,14 +156,21 @@ PERLVARI(Tregindent,      int,        0)  /* from regexec.c */
 PERLVAR(Tregcc,                CURCUR *)       /* from regexec.c */
 PERLVAR(Treg_call_cc,  struct re_cc_state *)   /* from regexec.c */
 PERLVAR(Treg_re,       regexp *)       /* from regexec.c */
+PERLVAR(Treg_ganch,    char *)         /* position of \G */
+PERLVAR(Treg_sv,       SV *)           /* what we match against */
+PERLVAR(Treg_magic,    MAGIC *)        /* pos-magic of what we match */
+PERLVAR(Treg_oldpos,   I32)            /* old pos of what we match */
 
 PERLVARI(Tregcompp,    regcomp_t, FUNC_NAME_TO_PTR(pregcomp))
                                        /* Pointer to RE compiler */
 PERLVARI(Tregexecp,    regexec_t, FUNC_NAME_TO_PTR(regexec_flags))
                                        /* Pointer to RE executer */
-PERLVARI(Treginterp_cnt,int,       0)  /* Whether `Regexp'
+PERLVARI(Treginterp_cnt,int,       0)  /* Whether `re'
                                                   was interpolated. */
-
+#ifdef DEBUGGING
+PERLVARI(Twatchaddr,   char **,    0)
+PERLVAR(Twatchok,      char *)
+#endif
 
 /* Note that the variables below are all explicitly referenced in the code
  * as thr->whatever and therefore don't need the 'T' prefix. */