X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=thrdvar.h;h=61298edcd833ba2aa7904ef5e3a980bbc9dfff31;hb=1fef4616ad97a72dc45194bd8ac11e63e518aba2;hp=726dbeea2d39e97cfffbbe3bf94aa60da676fd40;hpb=766f891612bf493b0430beb068ead367d70cdef6;p=p5sagit%2Fp5-mst-13.2.git diff --git a/thrdvar.h b/thrdvar.h index 726dbee..61298ed 100644 --- a/thrdvar.h +++ b/thrdvar.h @@ -1,6 +1,7 @@ /* thdrvar.h * - * Copyright (C) 1999, 2000, 2001, 2002, by Larry Wall and others + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + * by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -77,7 +78,7 @@ PERLVAR(Tna, STRLEN) /* for use in SvPV when length is PERLVAR(Tstatbuf, Stat_t) PERLVAR(Tstatcache, Stat_t) /* _ */ PERLVAR(Tstatgv, GV *) -PERLVARI(Tstatname, SV *, Nullsv) +PERLVARI(Tstatname, SV *, NULL) #ifdef HAS_TIMES PERLVAR(Ttimesbuf, struct tms) @@ -86,7 +87,6 @@ PERLVAR(Ttimesbuf, struct tms) /* Fields used by magic variables such as $@, $/ and so on */ PERLVAR(Ttainted, bool) /* using variables controlled by $< */ PERLVAR(Tcurpm, PMOP *) /* what to do \ interps in REs from */ -PERLVAR(Tnrs, SV *) /* was placeholder: unused since 5.8.0 (5.7.2 patch #12027 for bug ID 20010815.012). Used to save rx->saved_copy */ /* =for apidoc mn|SV*|PL_rs @@ -108,7 +108,7 @@ PERLVAR(Trs, SV *) /* input record separator $/ */ PERLVAR(Tlast_in_gv, GV *) /* GV used in last */ PERLVAR(Tofs_sv, SV *) /* output field separator $, */ PERLVAR(Tdefoutgv, GV *) /* default FH for output */ -PERLVARI(Tchopset, char *, " \n-") /* $: */ +PERLVARI(Tchopset, const char *, " \n-") /* $: */ PERLVAR(Tformtarget, SV *) PERLVAR(Tbodytarget, SV *) PERLVAR(Ttoptarget, SV *) @@ -119,8 +119,8 @@ PERLVAR(Tcurstash, HV *) /* symbol table for current package */ 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(Tin_eval, VOL U8) /* trap "fatal" errors? */ +PERLVAR(Tdelaymagic, U16) /* ($<,$>) = ... */ PERLVARI(Tdirty, bool, FALSE) /* in the middle of tearing things down? */ PERLVAR(Tlocalizing, int) /* are we processing a local() list? */ @@ -130,7 +130,7 @@ PERLVAR(Tmainstack, AV *) /* the stack when nothing funny is happening */ PERLVAR(Ttop_env, JMPENV *) /* ptr. to current sigjmp() environment */ PERLVAR(Tstart_env, JMPENV) /* empty startup sigjmp() environment */ -PERLVARI(Terrors, SV *, Nullsv) /* outstanding queued errors */ +PERLVARI(Terrors, SV *, NULL) /* outstanding queued errors */ /* statics "owned" by various functions */ PERLVAR(Tav_fetch_sv, SV *) /* unused as of change #19268 */ @@ -147,7 +147,6 @@ PERLVAR(Tsortcop, OP *) /* user defined sort routine */ PERLVAR(Tsortstash, HV *) /* which is in some package or other */ PERLVAR(Tfirstgv, GV *) /* $a */ PERLVAR(Tsecondgv, GV *) /* $b */ -PERLVAR(Tsortcxix, I32) /* from pp_ctl.c */ /* float buffer */ PERLVAR(Tefloatbuf, char*) @@ -160,67 +159,23 @@ PERLVAR(Tscreamnext, I32 *) PERLVARI(Tmaxscream, I32, -1) PERLVAR(Tlastscream, SV *) +PERLVAR(Treg_state, struct re_save_state) PERLVAR(Tregdummy, regnode) /* from regcomp.c */ -PERLVAR(Tregprecomp, char *) /* uncompiled string. */ -PERLVAR(Tregnpar, I32) /* () count. */ -PERLVAR(Tregsize, I32) /* Code size. */ PERLVAR(Tcolorset, int) /* from regcomp.c */ PERLVARA(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. */ -PERLVAR(Tregstartp, I32 *) /* Pointer to startp array. */ -PERLVAR(Tregendp, I32 *) /* Ditto for endp. */ -PERLVAR(Treglastparen, U32 *) /* Similarly for lastparen. */ -PERLVAR(Treglastcloseparen, U32 *) /* Similarly for lastcloseparen. */ -PERLVAR(Tregtill, char *) /* How far we are required to go. */ -PERLVAR(Treg_start_tmp, char **) /* from regexec.c */ -PERLVAR(Treg_start_tmpl,U32) /* from regexec.c */ -PERLVAR(Tregdata, struct reg_data *) - /* from regexec.c renamed was data */ -PERLVAR(Tbostr, char *) /* from regexec.c */ -PERLVAR(Treg_flags, U32) /* from regexec.c */ -PERLVAR(Treg_eval_set, I32) /* from regexec.c */ -PERLVAR(Tregnarrate, I32) /* from regexec.c */ -PERLVAR(Tregprogram, regnode *) /* from regexec.c */ -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(Treg_oldcurpm, PMOP*, NULL) /* curpm before match */ -PERLVARI(Treg_curpm, PMOP*, NULL) /* curpm during match */ -PERLVAR(Treg_oldsaved, char*) /* old saved substr during match */ -PERLVAR(Treg_oldsavedlen, STRLEN) /* old length of saved substr during match */ -PERLVAR(Treg_maxiter, I32) /* max wait until caching pos */ -PERLVAR(Treg_leftiter, I32) /* wait until caching pos */ -PERLVARI(Treg_poscache, char *, Nullch) /* cache of pos of WHILEM */ -PERLVAR(Treg_poscache_size, STRLEN) /* size of pos cache of WHILEM */ PERLVARI(Tpeepp, peep_t, MEMBER_TO_FPTR(Perl_peep)) /* Pointer to peephole optimizer */ -PERLVARI(Tregcompp, regcomp_t, MEMBER_TO_FPTR(Perl_pregcomp)) - /* Pointer to REx compiler */ -PERLVARI(Tregexecp, regexec_t, MEMBER_TO_FPTR(Perl_regexec_flags)) - /* Pointer to REx executer */ -PERLVARI(Tregint_start, re_intuit_start_t, MEMBER_TO_FPTR(Perl_re_intuit_start)) - /* Pointer to optimized REx executer */ -PERLVARI(Tregint_string,re_intuit_string_t, MEMBER_TO_FPTR(Perl_re_intuit_string)) - /* Pointer to optimized REx string */ -PERLVARI(Tregfree, regfree_t, MEMBER_TO_FPTR(Perl_pregfree)) - /* Pointer to REx free()er */ - -PERLVARI(Treginterp_cnt,int, 0) /* Whether `Regexp' - was interpolated. */ -PERLVARI(Treg_starttry, char *, 0) /* -Dr: where regtry was called. */ + +PERLVARI(Treginterp_cnt,int, 0) /* Whether "Regexp" was interpolated. */ PERLVARI(Twatchaddr, char **, 0) PERLVAR(Twatchok, char *) /* Note that the variables below are all explicitly referenced in the code * as thr->whatever and therefore don't need the 'T' prefix. */ -PERLVAR(Treg_match_utf8, bool) /* was what we matched against utf8 */ +/* the currently active slab in a chain of slabs of regmatch states, + * and the currently active state within that slab */ +PERLVARI(Tregmatch_slab, regmatch_slab *, NULL) +PERLVAR(Tregmatch_state, regmatch_state *)