diff options
| author | Nicholas Clark <nick@ccl4.org> | 2005-06-02 13:36:01 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2005-06-02 13:36:01 +0000 |
| commit | 7a9b70e91d2c0aa19f8cec5b0f8c133492a19280 (patch) | |
| tree | a7189a0b6ed5aba44b00173c76f0b082b3724e0a /toke.c | |
| parent | 345dbb93fc4813c4387eb6b1eedefc6d79a752d0 (diff) | |
| download | perl-7a9b70e91d2c0aa19f8cec5b0f8c133492a19280.tar.gz | |
Changes 24660 and 24665 both introduced errors into the USEMYMALLOC
code. Plus change 24672 appears to break under USEMYMALLOC, so revert
it for now.
p4raw-id: //depot/perl@24676
Diffstat (limited to 'toke.c')
| -rw-r--r-- | toke.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -5538,9 +5538,8 @@ S_pending_ident(pTHX) /* might be an "our" variable" */ if (PAD_COMPNAME_FLAGS(tmp) & SVpad_OUR) { /* build ops for a bareword */ - HV *stash = PAD_COMPNAME_OURSTASH(tmp); - HEK *stashname = HvNAME_HEK(stash); - SV *sym = newSVpvn(HEK_KEY(stashname), HEK_LEN(stashname)); + SV *sym = newSVpvn(HvNAME_get(PAD_COMPNAME_OURSTASH(tmp)), + HvNAMELEN_get(PAD_COMPNAME_OURSTASH(tmp))); sv_catpvn(sym, "::", 2); sv_catpv(sym, PL_tokenbuf+1); yylval.opval = (OP*)newSVOP(OP_CONST, 0, sym); @@ -9740,10 +9739,9 @@ S_scan_inputsymbol(pTHX_ char *start) */ if ((tmp = pad_findmy(d)) != NOT_IN_PAD) { if (PAD_COMPNAME_FLAGS(tmp) & SVpad_OUR) { - HV *stash = PAD_COMPNAME_OURSTASH(tmp); - HEK *stashname = HvNAME_HEK(stash); - SV *sym = sv_2mortal(newSVpvn(HEK_KEY(stashname), - HEK_LEN(stashname))); + SV *sym = sv_2mortal( + newSVpvn(HvNAME_get(PAD_COMPNAME_OURSTASH(tmp)), + HvNAMELEN_get(PAD_COMPNAME_OURSTASH(tmp)))); sv_catpvn(sym, "::", 2); sv_catpv(sym, d+1); d = SvPVX(sym); |