summaryrefslogtreecommitdiff
path: root/toke.c
diff options
context:
space:
mode:
authorPerl 5 Porters <perl5-porters@africa.nicoh.com>1997-04-04 00:00:00 +0000
committerChip Salzenberg <chip@atlantic.net>1997-04-04 00:00:00 +0000
commit5cd24f17b72b10f8506d70fba1ec4dd25224c257 (patch)
tree0016ef5cb000e60fd3ea5ca5acf14ab3fa5a9812 /toke.c
parentdaff0e373f3630eaa9dbded0adcc04185f454487 (diff)
downloadperl-5cd24f17b72b10f8506d70fba1ec4dd25224c257.tar.gz
[inseparable changes from match from perl-5.003_97a to perl-5.003_97b]
BUILD PROCESS Subject: Don't suggest 'Configure -der' in config.sh comments From: Chip Salzenberg <chip@perl.com> Files: Configure CORE LANGUAGE CHANGES Subject: Make assignment to C<$)> call setgroups() From: Chip Salzenberg <chip@perl.com> Files: Configure config_H config_h.SH mg.c plan9/config.plan9 pod/perldelta.pod vms/config.vms win32/config.H win32/config.w32 Subject: Grandfather "$$<digit>" in strings From: Chip Salzenberg <chip@perl.com> Files: pod/perldiag.pod toke.c Subject: Disconnect warn and die hooks _after_ object destruction From: Chip Salzenberg <chip@perl.com> Files: perl.c Subject: Forbid recursive substitutions From: Chip Salzenberg <chip@perl.com> Files: cop.h pod/perldelta.pod pod/perldiag.pod pp_ctl.c pp_hot.c DOCUMENTATION Subject: Document required module versions From: Chip Salzenberg <chip@perl.com> Files: pod/perldelta.pod LIBRARY AND EXTENSIONS Subject: Updates to Math::Complex and Math::Trig From: Jarkko Hietaniemi <Jarkko.Hietaniemi@cc.hut.fi> Files: lib/Math/Complex.pm lib/Math/Trig.pm pod/perldelta.pod t/lib/complex.t OTHER CORE CHANGES Subject: length($') isn't Date: Mon, 07 Apr 1997 03:30:44 -0400 From: Gurusamy Sarathy <gsar@engin.umich.edu> Files: mg.c Msg-ID: 199704070730.DAA07310@aatma.engin.umich.edu (applied based on p5p patch as commit 645a7cbb1f14932f058231f0a4f808b88ebe8703) Subject: Fix obscure regex bug related to leading C<.*> From: Chip Salzenberg <chip@perl.com> Files: toke.c Subject: Add warning for glob failure From: Chip Salzenberg <chip@perl.com> Files: pod/perldelta.pod pod/perldiag.pod pp_hot.c Subject: Fix C<perl -V> in presence of local patches From: Chip Salzenberg <chip@perl.com> Files: perl.c
Diffstat (limited to 'toke.c')
-rw-r--r--toke.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/toke.c b/toke.c
index 724c214722..c40955a101 100644
--- a/toke.c
+++ b/toke.c
@@ -4388,7 +4388,12 @@ I32 ck_uni;
}
if (*s == '$' && s[1] &&
(isALNUM(s[1]) || strchr("${", s[1]) || strnEQ(s+1,"::",2)) )
- return s;
+ {
+ if (isDIGIT(s[1]) && lex_state == LEX_INTERPNORMAL)
+ deprecate("\"$$<digit>\" to mean \"${$}<digit>\"");
+ else
+ return s;
+ }
if (*s == '{') {
bracket = s;
s++;
@@ -4589,7 +4594,8 @@ register PMOP *pm;
}
}
/* promote the better string */
- if ((!pm->op_pmshort && !(pm->op_pmregexp->reganch & ROPT_ANCH)) ||
+ if ((!pm->op_pmshort &&
+ !(pm->op_pmregexp->reganch & ROPT_ANCH_GPOS)) ||
((pm->op_pmflags & PMf_SCANFIRST) &&
(SvCUR(pm->op_pmshort) < SvCUR(pm->op_pmregexp->regmust)))) {
SvREFCNT_dec(pm->op_pmshort); /* ok if null */