use strict;
use warnings;
-use 5.010;
+use v5.16;
+use utf8;
-my $IS_EBCDIC = ord ('A') == 193;
+# To verify that messages containing the expansions work on UTF-8
+my $utf8_comment;
+
+my @warnings;
+local $SIG {__WARN__} = sub {push @warnings, "@_"};
+
+BEGIN {
+ chdir 't' if -d 't';
+ require './test.pl';
+ skip_all_if_miniperl("no dynamic loading on miniperl, no File::Spec (used by charnames)");
+}
sub run_tests;
+sub get_str_name($) {
+ my $char = shift;
+
+ my ($str, $name);
+
+ if ($char =~ /^\\/) {
+ $str = eval qq ["$char"];
+ $name = qq ["$char"];
+ }
+ elsif ($char =~ /^0x([0-9A-Fa-f]+)$/) {
+ $str = chr hex $1;
+ $name = "chr ($char)";
+ }
+ else {
+ $str = $char;
+ $name = qq ["$char"];
+ }
+
+ return ($str, $name);
+}
+
#
# This is the data to test.
#
# It's ok to repeat class names.
#
InLatin1Supplement =>
- $IS_EBCDIC ? ['!\x{7f}', '\x{80}', '!\x{100}']
- : ['!\x{7f}', '\x{80}', '\x{ff}', '!\x{100}'],
+ ['!\N{U+7f}', '\N{U+80}', '\N{U+ff}', '!\x{100}'],
InLatinExtendedA =>
- ['!\x{7f}', '!\x{80}', '!\x{ff}', '\x{100}'],
+ ['!\N{U+7f}', '!\N{U+80}', '!\N{U+ff}', '\x{100}'],
#
# Properties are case-insensitive, and may have whitespace,
# dashes and underscores.
#
- 'in-latin1_SUPPLEMENT' => ['\x{80}',
+ 'in-latin1_SUPPLEMENT' => ['\N{U+80}',
'\N{LATIN SMALL LETTER Y WITH DIAERESIS}'],
' ^ In Latin 1 Supplement '
- => ['!\x{80}', '\N{COFFIN}'],
- 'latin-1 supplement' => ['\x{80}', "0xDF"],
+ => ['!\N{U+80}', '\N{COFFIN}'],
+ 'latin-1 supplement' => ['\N{U+80}', "0xDF"],
);
-my @USER_DEFINED_PROPERTIES = (
- #
- # User defined properties
- #
- InKana1 => ['\x{3040}', '!\x{303F}'],
- InKana2 => ['\x{3040}', '!\x{303F}'],
- InKana3 => ['\x{3041}', '!\x{3040}'],
- InNotKana => ['\x{3040}', '!\x{3041}'],
- InConsonant => ['d', '!e'],
- IsSyriac1 => ['\x{0712}', '!\x{072F}'],
- Syriac1 => ['\x{0712}', '!\x{072F}'],
- '# User-defined character properties my lack \n at the end',
- InGreekSmall => ['\N{GREEK SMALL LETTER PI}',
- '\N{GREEK SMALL LETTER FINAL SIGMA}'],
- InGreekCapital => ['\N{GREEK CAPITAL LETTER PI}', '!\x{03A2}'],
- Dash => ['-'],
- ASCII_Hex_Digit => ['!-', 'A'],
- AsciiHexAndDash => ['-', 'A'],
-);
+my @USER_DEFINED_PROPERTIES;
+my @USER_CASELESS_PROPERTIES;
+my @USER_ERROR_PROPERTIES;
+my @DEFERRED;
+my $overflow;
+BEGIN {
+ $utf8_comment = "#\N{U+30CD}";
+
+ use Config;
+ $overflow = $Config{uvsize} < 8 ? "80000000" : "80000000000000000";
+
+ # We defined these at compile time, so that the subroutines that they
+ # refer to aren't known, so that we can test properties not known until
+ # runtime
+
+ @USER_DEFINED_PROPERTIES = (
+ #
+ # User defined properties
+ #
+ InKana1 => ['\x{3040}', '!\x{303F}'],
+ InKana2 => ['\x{3040}', '!\x{303F}'],
+ InKana3 => ['\x{3041}', '!\x{3040}'],
+ InNotKana => ['\x{3040}', '!\x{3041}'],
+ InConsonant => ['d', '!e'],
+ IsSyriac1 => ['\x{0712}', '!\x{072F}'],
+ IsSyriac1KanaMark => ['\x{309A}', '!\x{3090}'],
+ IsSyriac1KanaMark => ['\x{0730}', '!\x{0712}'],
+ '# User-defined character properties may lack \n at the end',
+ InGreekSmall => ['\N{GREEK SMALL LETTER PI}',
+ '\N{GREEK SMALL LETTER FINAL SIGMA}'],
+ InGreekCapital => ['\N{GREEK CAPITAL LETTER PI}', '!\x{03A2}'],
+ Dash => ['-'],
+ ASCII_Hex_Digit => ['!-', 'A'],
+ IsAsciiHexAndDash => ['-', 'A'],
+ );
+
+ @USER_CASELESS_PROPERTIES = (
+ #
+ # User defined properties which differ depending on /i. Second entry
+ # is false normally, true under /i
+ #
+ 'IsMyUpper' => ["M", "!m" ],
+ 'pkg1::pkg2::IsMyLower' => ["a", "!A" ],
+ );
+
+ @USER_ERROR_PROPERTIES = (
+ 'IsOverflow' => qr/Code point too large in (?#
+ )"0\t$overflow$utf8_comment" in expansion of (?#
+ )main::IsOverflow/,
+ 'InRecursedA' => qr/Infinite recursion in user-defined property (?#
+ )"main::InRecursedA" in expansion of (?#
+ )main::InRecursedC in expansion of (?#
+ )main::InRecursedB in expansion of (?#
+ )main::InRecursedA/,
+ 'IsRangeReversed' => qr/Illegal range in "200 100$utf8_comment" in (?#
+ )expansion of main::IsRangeReversed/,
+ 'IsNonHex' => qr/Can't find Unicode property definition (?#
+ )"BEEF CAGED" in expansion of main::IsNonHex/,
+
+ # Could have \n, hence /s
+ 'IsDeath' => qr/Died.* in expansion of main::IsDeath/s,
+ );
+
+ # Now create a list of properties whose definitions won't be known at
+ # runtime. The qr// below thus will have forward references to them, and
+ # when matched at runtime will not know what's in the property definition
+ my @DEFERRABLE_USER_DEFINED_PROPERTIES;
+ push @DEFERRABLE_USER_DEFINED_PROPERTIES, @USER_DEFINED_PROPERTIES;
+ push @DEFERRABLE_USER_DEFINED_PROPERTIES, @USER_CASELESS_PROPERTIES;
+ unshift @DEFERRABLE_USER_DEFINED_PROPERTIES, @USER_ERROR_PROPERTIES;
+ for (my $i = 0; $i < @DEFERRABLE_USER_DEFINED_PROPERTIES; $i+=2) {
+ my $property = $DEFERRABLE_USER_DEFINED_PROPERTIES[$i];
+ if ($property =~ / ^ \# /x) {
+ $i++;
+ redo;
+ }
+
+ # Only do this for the properties in the list that are user-defined
+ next if ($property !~ / ( ^ | :: ) I[ns] /x);
+ push @DEFERRED, qr/\p{$property}/,
+ $DEFERRABLE_USER_DEFINED_PROPERTIES[$i+1];
+ }
+}
+
+# These override the official ones, so if found before defined, the official
+# ones prevail, so can't test deferred definition
+my @OVERRIDING_USER_DEFINED_PROPERTIES = (
+ InLatin1 => ['\x{0100}', '!\x{00FF}'],
+);
#
# From the short properties we populate POSIX-like classes.
'Ll' => ['m', '\N{CYRILLIC SMALL LETTER A}'],
'Lu' => ['M', '\N{GREEK CAPITAL LETTER ALPHA}'],
'Lo' => ['\N{HIRAGANA LETTER SMALL A}'],
- 'Mn' => ['\N{COMBINING GRAVE ACCENT}'],
+ # is also in other alphabetic
+ 'Mn' => ['\N{HEBREW POINT RAFE}'],
'Nd' => ["0", '\N{ARABIC-INDIC DIGIT ZERO}'],
'Pc' => ["_"],
'Po' => ["!"],
#
# Illegal properties
#
-my @ILLEGAL_PROPERTIES = qw [q qrst];
+my @ILLEGAL_PROPERTIES =
+ qw[q qrst f foo isfoo infoo ISfoo INfoo Is::foo In::foo];
my %d;
push @{$d {IsWord}} => map {$class =~ /^[LMN]/ || $_ eq "_"
? $_ : "!$_"} @$chars;
push @{$d {IsSpace}} => map {$class =~ /^Z/ ||
- length ($_) == 1 && ord ($_) >= 0x09
- && ord ($_) <= 0x0D
+ length ($_) == 1 && utf8::native_to_unicode(ord ($_)) >= 0x09
+ && utf8::native_to_unicode(ord ($_)) <= 0x0D
? $_ : "!$_"} @$chars;
}
-delete $d {IsASCII} if $IS_EBCDIC;
-
push @CLASSES => "# Short properties" => %SHORT_PROPERTIES,
"# POSIX like properties" => %d,
- "# User defined properties" => @USER_DEFINED_PROPERTIES;
+ "# User defined properties" => @USER_DEFINED_PROPERTIES,
+ "# Overriding user defined properties" => @OVERRIDING_USER_DEFINED_PROPERTIES;
#
my $count = 0;
for (my $i = 0; $i < @CLASSES; $i += 2) {
$i ++, redo if $CLASSES [$i] =~ /^\h*#\h*(.*)/;
- $count += (length $CLASSES [$i] == 1 ? 4 : 2) * @{$CLASSES [$i + 1]};
+ $count += 2 * (length $CLASSES [$i] == 1 ? 4 : 2) * @{$CLASSES [$i + 1]};
}
-$count += 2 * @ILLEGAL_PROPERTIES;
-$count += 2 * grep {length $_ == 1} @ILLEGAL_PROPERTIES;
+$count += 4 * @ILLEGAL_PROPERTIES;
+$count += 4 * grep {length $_ == 1} @ILLEGAL_PROPERTIES;
+$count += 8 * @USER_CASELESS_PROPERTIES;
+$count += 1 * (@DEFERRED - @USER_ERROR_PROPERTIES) / 2;
+$count += 1 * @USER_ERROR_PROPERTIES;
+$count += 1; # No warnings generated
-my $tests = 0;
-
-say "1..$count";
+plan(tests => $count);
run_tests unless caller ();
sub match {
- my ($char, $match, $nomatch) = @_;
+ my ($char, $match, $nomatch, $caseless) = @_;
+ $caseless = "" unless defined $caseless;
+ $caseless = 'i' if $caseless;
- my ($str, $name);
+ my ($str, $name) = get_str_name($char);
- given ($char) {
- when (/^\\/) {
- $str = eval qq ["$char"];
- $name = qq ["$char"];
- }
- when (/^0x([0-9A-Fa-f]+)$/) {
- $str = chr hex $1;
- $name = "chr ($char)";
- }
- default {
- $str = $char;
- $name = qq ["$char"];
- }
+ undef $@;
+ my $pat = "qr/$match/$caseless";
+ my $match_pat = eval $pat;
+ if (is($@, '', "$pat compiled correctly to a regexp: $@")) {
+ like($str, $match_pat, "$name correctly matched");
}
- print "not " unless $str =~ /$match/;
- print "ok ", ++ $tests, " - $name =~ /$match/\n";
- print "not " unless $str !~ /$nomatch/;
- print "ok ", ++ $tests, " - $name !~ /$nomatch/\n";
+ undef $@;
+ $pat = "qr/$nomatch/$caseless";
+ my $nomatch_pat = eval $pat;
+ if (is($@, '', "$pat compiled correctly to a regexp: $@")) {
+ unlike($str, $nomatch_pat, "$name correctly did not match");
+ }
}
sub run_tests {
+ for (my $i = 0; $i < @DEFERRED; $i+=2) {
+ if (ref $DEFERRED[$i+1] eq 'ARRAY') {
+ my ($str, $name) = get_str_name($DEFERRED[$i+1][0]);
+ like($str, $DEFERRED[$i],
+ "$name correctly matched $DEFERRED[$i] (defn. not known until runtime)");
+ }
+ else { # Single entry rhs indicates a property that is an error
+ undef $@;
+
+ # Using block eval causes the pattern to not be recompiled, so it
+ # retains its deferred status until this is executed.
+ eval { 'A' =~ $DEFERRED[$i] };
+ like($@, $DEFERRED[$i+1],
+ "$DEFERRED[$i] gave correct failure message (defn. not known until runtime)");
+ }
+ }
+
while (@CLASSES) {
my $class = shift @CLASSES;
if ($class =~ /^\h*#\h*(.*)/) {
match $_, $in_pat, $out_pat for @in;
match $_, $out_pat, $in_pat for @out;
- if (1 == length $class) {
+ if (1 == length $class) { # Repeat without braces if name length 1
my $in_pat = eval qq ['\\p$class'];
my $out_pat = eval qq ['\\P$class'];
}
- my $pat = qr /^Can't find Unicode property definition/;
print "# Illegal properties\n";
foreach my $p (@ILLEGAL_PROPERTIES) {
+ my $pat;
+ if ($p =~ /::/) {
+ $pat = qr /^Illegal user-defined property name/;
+ }
+ else {
+ $pat = qr /^Can't find Unicode property definition/;
+ }
+
undef $@;
my $r = eval "'a' =~ /\\p{$p}/; 1";
- print "not " unless !$r && $@ && $@ =~ $pat;
- print "ok ", ++ $tests, " - Unknown Unicode property \\p{$p}\n";
+ is($r, undef, "Unknown Unicode property \\p{$p}");
+ like($@, $pat, "Unknown Unicode property \\p{$p}");
undef $@;
my $s = eval "'a' =~ /\\P{$p}/; 1";
- print "not " unless !$s && $@ && $@ =~ $pat;
- print "ok ", ++ $tests, " - Unknown Unicode property \\P{$p}\n";
+ is($s, undef, "Unknown Unicode property \\p{$p}");
+ like($@, $pat, "Unknown Unicode property \\p{$p}");
if (length $p == 1) {
undef $@;
my $r = eval "'a' =~ /\\p$p/; 1";
- print "not " unless !$r && $@ && $@ =~ $pat;
- print "ok ", ++ $tests, " - Unknown Unicode property \\p$p\n";
+ is($r, undef, "Unknown Unicode property \\p$p");
+ like($@, $pat, "Unknown Unicode property \\p$p");
undef $@;
my $s = eval "'a' =~ /\\P$p/; 1";
- print "not " unless !$s && $@ && $@ =~ $pat;
- print "ok ", ++ $tests, " - Unknown Unicode property \\P$p\n";
+ is($r, undef, "Unknown Unicode property \\P$p");
+ like($@, $pat, "Unknown Unicode property \\P$p");
}
}
+
+ print "# User-defined properties with /i differences\n";
+ while (my $class = shift @USER_CASELESS_PROPERTIES) {
+ my $chars_ref = shift @USER_CASELESS_PROPERTIES;
+ my @in = grep {!/^!./} @$chars_ref;
+ my @out = map {s/^!(?=.)//; $_} grep { /^!./} @$chars_ref;
+ my $in_pat = eval qq ['\\p{$class}'];
+ my $out_pat = eval qq ['\\P{$class}'];
+
+ # Verify that adding /i does change the out set to match.
+ match $_, $in_pat, $out_pat, 'i' for @out;
+
+ # Verify that adding /i doesn't change the in set.
+ match $_, $in_pat, $out_pat, 'i' for @in;
+
+ # Verify works as regularly for not /i
+ match $_, $in_pat, $out_pat for @in;
+ match $_, $out_pat, $in_pat for @out;
+ }
+
+ print "# User-defined properties with errors in their definition\n";
+ while (my $error_property = shift @USER_ERROR_PROPERTIES) {
+ my $error_re = shift @USER_ERROR_PROPERTIES;
+
+ undef $@;
+ eval { 'A' =~ /\p{$error_property}/; };
+ like($@, $error_re, "$error_property gave correct failure message");
+ }
}
#
sub InKana1 {<<'--'}
-3040 309F
-30A0 30FF
+3040 309F # A comment; next line has trailing spaces
+30A0 30FF
--
sub InKana2 {<<'--'}
--
sub InKana3 {<<'--'}
+# First line comment
+utf8::InHiragana
+# Full line comment
+utf8::InKatakana
-utf8::IsCn
--
sub InNotKana {<<'--'}
-!utf8::InHiragana
--utf8::InKatakana
+!utf8::InHiragana # A comment; next line has trailing spaces
+-utf8::InKatakana
+utf8::IsCn
+# Final line comment
--
-sub InConsonant {<<'--'} # Not EBCDIC-aware.
-0061 007f
--0061
--0065
--0069
--006f
--0075
---
+sub InConsonant {
+
+ my $return = "+utf8::Lowercase\n&utf8::ASCII\n";
+ $return .= sprintf("-%X\n", ord "a");
+ $return .= sprintf("-%X\n", ord "e");
+ $return .= sprintf("-%X\n", ord "i");
+ $return .= sprintf("-%X\n", ord "o");
+ $return .= sprintf("-%X\n", ord "u");
+ return $return;
+}
sub IsSyriac1 {<<'--'}
0712 072C
0730 074A
--
-sub Syriac1 {<<'--'}
-0712 072C
-0730 074A
---
+sub InRecursedA {
+ return "+main::InRecursedB\n";
+}
+
+sub InRecursedB {
+ return "+main::InRecursedC\n";
+}
+
+sub InRecursedC {
+ return "+main::InRecursedA\n";
+}
sub InGreekSmall {return "03B1\t03C9"}
sub InGreekCapital {return "0391\t03A9\n-03A2"}
-sub AsciiHexAndDash {<<'--'}
+sub IsAsciiHexAndDash {<<'--'}
+utf8::ASCII_Hex_Digit
+utf8::Dash
--
+sub InLatin1 {
+ return "0100\t10FFFF";
+}
+
+sub IsMyUpper {
+ my $caseless = shift;
+ return "+utf8::"
+ . (($caseless)
+ ? 'Alphabetic'
+ : 'Uppercase')
+ . "\n&utf8::ASCII";
+}
+
+sub pkg1::pkg2::IsMyLower {
+ my $caseless = shift;
+ return "+utf8::"
+ . (($caseless)
+ ? 'Alphabetic'
+ : 'Lowercase')
+ . "\n&utf8::ASCII";
+}
+
+sub IsRangeReversed {
+ return "200 100$utf8_comment";
+}
+
+sub IsNonHex {
+ return "BEEF CAGED$utf8_comment";
+}
+
+sub IsDeath {
+ die;
+}
+
+# Verify that can use user-defined properties inside another one
+sub IsSyriac1KanaMark {<<'--'}
++main::IsSyriac1
++main::InKana3
+&utf8::IsMark
+--
+
+# fake user-defined properties; these subs shouldn't be called, because
+# their names don't start with In or Is
+
+sub f { die }
+sub foo { die }
+sub isfoo { die }
+sub infoo { die }
+sub ISfoo { die }
+sub INfoo { die }
+sub Is::foo { die }
+sub In::foo { die }
+
+sub IsOverflow {
+ return "0\t$overflow$utf8_comment";
+}
+
+if (! is(@warnings, 0, "No warnings were generated")) {
+ diag join "\n", @warnings, "\n";
+}
+
+1;
__END__
https://perl5.git.perl.org / perl5.git / blobdiff