From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 7 Jul 1999 13:04:55 +0000 (+0000)
Subject: Integrate with Sarathy; one conflict in t/pragma/warn/recgomp
X-Git-Tag: accepted/trunk/20130322.191538~34817^2~960
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70c6d02e8060a55a75042c794203b8925b3151f3;p=platform%2Fupstream%2Fperl.git

Integrate with Sarathy; one conflict in t/pragma/warn/recgomp
resolved manually.

p4raw-id: //depot/cfgperl@3648
---

70c6d02e8060a55a75042c794203b8925b3151f3
diff --cc t/pragma/warn/regcomp
index 0f48c67,4b2f7ff..f67fafa
--- a/t/pragma/warn/regcomp
+++ b/t/pragma/warn/regcomp
@@@ -29,21 -36,30 +33,16 @@@ Strange *+?{} on zero-length expressio
  # regcomp.c
  use warning 'unsafe' ;
  $_ = "" ;
 -/[a[:xyz:]b]/;
--/[a[.xyz.]b]/;
--/[a[=xyz=]b]/;
- EXPECT
- Character class syntax [. .] is reserved for future extensions at - line 4.
- Character class syntax [= =] is reserved for future extensions at - line 5.
- ########
- # regcomp.c
- use warning 'unsafe' ;
- $_ = "" ;
 +/[:foo:]/;
 +/[.bar.]/;
 +/[=zog=]/;
+ no warning 'unsafe' ;
 -/[a[:xyz:]b]/;
 -/[a[.xyz.]b]/;
 -/[a[=xyz=]b]/;
++/[a[:foo:]b]/;
++/[a[.bar.]b]/;
++/[a[=zog=]b]/;
  EXPECT
 -Character class syntax [: :] is reserved for future extensions at - line 4.
 +Character class syntax [: :] belongs inside character classes at - line 4.
 +Character class syntax [. .] belongs inside character classes at - line 5.
  Character class syntax [. .] is reserved for future extensions at - line 5.
 +Character class syntax [= =] belongs inside character classes at - line 6.
  Character class syntax [= =] is reserved for future extensions at - line 6.
 -########
 -# regcomp.c
 -use warning 'unsafe' ; 
 -# use utf8 ; # Note this line should be uncommented when utf8 gets fixed.
 -$_ = "" ;
 -/[a[:xyz:]b]/;
 -/[a[.xyz.]b]/;
 -/[a[=xyz=]b]/;
 -no warning 'unsafe' ;
 -/[a[:xyz:]b]/;
 -/[a[.xyz.]b]/;
 -/[a[=xyz=]b]/;
 -EXPECT
 -Character class syntax [: :] is reserved for future extensions at - line 5.
 -Character class syntax [. .] is reserved for future extensions at - line 6.
 -Character class syntax [= =] is reserved for future extensions at - line 7.