diff options
| author | Peter Prymmer <PPrymmer@factset.com> | 2001-03-30 10:06:36 -0800 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-03-31 02:58:17 +0000 |
| commit | 2390ecbcb0b20daf38bdaf45d84f3358380e4adf (patch) | |
| tree | c49b1b283998ca68372ada5630571cf0a83a083f | |
| parent | 0e6dc35ebda8ef721869f0225d5a4607f33c3b6c (diff) | |
| download | perl-2390ecbcb0b20daf38bdaf45d84f3358380e4adf.tar.gz | |
Not OK: perl v5.7.0 +DEVEL9472 on VMS_AXP V7.1 (UNINSTALLED)
Message-ID: <Pine.OSF.4.10.10103301805450.63762-100000@aspara.forte.com>
p4raw-id: //depot/perl@9485
| -rw-r--r-- | regexec.c | 8 | ||||
| -rw-r--r-- | t/lib/cwd.t | 14 |
2 files changed, 20 insertions, 2 deletions
@@ -3245,9 +3245,15 @@ S_regmatch(pTHX_ regnode *prog) c = utf8_to_uvchr((U8*)PL_reginput, NULL); else c = UCHARAT(PL_reginput); + /* If it could work, try it. */ + if (c == c1 || c == c2) + { + TRYPAREN(paren, n, PL_reginput); + REGCP_UNWIND(lastcp); + } } /* If it could work, try it. */ - if (c1 == -1000 || c == c1 || c == c2) + else if (c1 == -1000) { TRYPAREN(paren, n, PL_reginput); REGCP_UNWIND(lastcp); diff --git a/t/lib/cwd.t b/t/lib/cwd.t index f852a2775a..f507918e39 100644 --- a/t/lib/cwd.t +++ b/t/lib/cwd.t @@ -33,10 +33,14 @@ my $pwd_cmd = ($^O eq "MSWin32") ? "cd" : (grep { -x && -f } map { "$_/pwd" } split m/$Config{path_sep}/, $ENV{PATH})[0]; +if ($^O eq 'VMS') { $pwd_cmd = 'SHOW DEFAULT'; } + if (defined $pwd_cmd) { chomp(my $start = `$pwd_cmd`); # Win32's cd returns native C:\ style $start =~ s,\\,/,g if $^O eq 'MSWin32'; + # DCL SHOW DEFAULT has leading spaces + $start =~ s/^\s+// if $^O eq 'VMS'; if ($?) { for (3..6) { print "ok $_ # Skip: '$pwd_cmd' failed\n"; @@ -68,6 +72,8 @@ my $getcwd = getcwd; my $fastcwd = fastcwd; my $fastgetcwd = fastgetcwd; my $want = "t/pteerslt/path/to/a/dir"; +# This checked out OK on ODS-2 and ODS-5: +$want = "T\.PTEERSLT\.PATH\.TO\.A\.DIR\]"; print +($cwd =~ m|$want$| ? "" : "not "), "ok 7\n"; print +($getcwd =~ m|$want$| ? "" : "not "), "ok 8\n"; print +($fastcwd =~ m|$want$| ? "" : "not "), "ok 9\n"; @@ -86,7 +92,13 @@ Cwd::chdir ".."; rmdir "path"; print "#$ENV{PWD}\n"; Cwd::chdir ".."; rmdir "pteerslt"; print "#$ENV{PWD}\n"; -print +($ENV{PWD} =~ m|\bt$| ? "" : "not "), "ok 12\n"; +if ($^O eq 'VMS') { + # This checked out OK on ODS-2 and ODS-5: + print +($ENV{PWD} =~ m|\bT\]$| ? "" : "not "), "ok 12\n"; +} +else { + print +($ENV{PWD} =~ m|\bt$| ? "" : "not "), "ok 12\n"; +} if ($Config{d_symlink}) { my @dirs = split " " => $Config{libpth}; |