summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2015-07-26 22:02:19 -0600
committerKarl Williamson <khw@cpan.org>2015-07-28 22:15:56 -0600
commit36fa794810751a036adba47faf9817633b549155 (patch)
tree8aafc8f9344bf057bb4208ea9eb72bc3f9078e3f
parentd963b40d95190da0752832d8df913f2b294844bf (diff)
downloadperl-36fa794810751a036adba47faf9817633b549155.tar.gz
mktables: Reindent after prev. commit
That commit added a nesting block, so indent an extra level, and reflow the text to fit in 79 columns.
-rw-r--r--charclass_invlists.h2
-rw-r--r--lib/unicore/mktables94
-rw-r--r--regcharclass.h2
3 files changed, 50 insertions, 48 deletions
diff --git a/charclass_invlists.h b/charclass_invlists.h
index a975d91542..9d35fdbb87 100644
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -99521,7 +99521,7 @@ static const UV XPosixXDigit_invlist[] = { /* for EBCDIC POSIX-BC */
* 1a0687fb9c6c4567e853913549df0944fe40821279a3e9cdaa6ab8679bc286fd lib/unicore/extracted/DLineBreak.txt
* 40bcfed3ca727c19e1331f6c33806231d5f7eeeabd2e6a9e06a3740c85d0c250 lib/unicore/extracted/DNumType.txt
* a18d502bad39d527ac5586d7bc93e29f565859e3bcc24ada627eff606d6f5fed lib/unicore/extracted/DNumValues.txt
- * f5a4305a9370059eba8955dda8f9ba72339996dc2249c7c37dd70ab0dd140a8d lib/unicore/mktables
+ * cd7fa4531c960622bb742271405469b68784c664045a5c949cc0187d952e414e lib/unicore/mktables
* 462c9aaa608fb2014cd9649af1c5c009485c60b9c8b15b89401fdc10cf6161c6 lib/unicore/version
* c6884f4d629f04d1316f3476cb1050b6a1b98ca30c903262955d4eae337c6b1e regen/charset_translations.pl
* 7b6f61662df48e0cbfb234a926e02e5cb9468af052f7f9feb84285996f30df09 regen/mk_invlists.pl
diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index 00a54a41f8..b0925469fc 100644
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -13260,63 +13260,65 @@ END
$property->table("N")->set_complement($yes);
}
else {
- if (defined $default_map) {
+ if (defined $default_map) {
- # Make sure there is a match table for the default
- if (! defined ($default_table = $property->table($default_map))) {
- $default_table = $property->add_match_table($default_map);
- }
+ # Make sure there is a match table for the default
+ if (! defined ($default_table = $property->table($default_map)))
+ {
+ $default_table = $property->add_match_table($default_map);
+ }
- # And, if the property is binary, the default table will just
- # be the complement of the other table.
- if ($property_type == $BINARY) {
- my $non_default_table;
+ # And, if the property is binary, the default table will just
+ # be the complement of the other table.
+ if ($property_type == $BINARY) {
+ my $non_default_table;
- # Find the non-default table.
- for my $table ($property->tables) {
- if ($table == $default_table) {
- if ($v_version le v5.0.0) {
- $table->add_alias($_) for qw(N No F False);
+ # Find the non-default table.
+ for my $table ($property->tables) {
+ if ($table == $default_table) {
+ if ($v_version le v5.0.0) {
+ $table->add_alias($_) for qw(N No F False);
+ }
+ next;
+ } elsif ($v_version le v5.0.0) {
+ $table->add_alias($_) for qw(Y Yes T True);
}
- next;
- } elsif ($v_version le v5.0.0) {
- $table->add_alias($_) for qw(Y Yes T True);
+ $non_default_table = $table;
}
- $non_default_table = $table;
+ $default_table->set_complement($non_default_table);
}
- $default_table->set_complement($non_default_table);
- }
- else {
+ else {
- # This fills in any missing values with the default. It's not
- # necessary to do this with binary properties, as the default
- # is defined completely in terms of the Y table.
- $property->add_map(0, $MAX_WORKING_CODEPOINT,
- $default_map, Replace => $NO);
+ # This fills in any missing values with the default. It's
+ # not necessary to do this with binary properties, as the
+ # default is defined completely in terms of the Y table.
+ $property->add_map(0, $MAX_WORKING_CODEPOINT,
+ $default_map, Replace => $NO);
+ }
}
- }
-
- # Have all we need to populate the match tables.
- my $maps_should_be_defined = $property->pre_declared_maps;
- foreach my $range ($property->ranges) {
- my $map = $range->value;
- my $table = $property->table($map);
- if (! defined $table) {
- # Integral and rational property values are not necessarily
- # defined in PropValueAliases, but whether all the other ones
- # should be depends on the property.
- if ($maps_should_be_defined
- && $map !~ /^ -? \d+ ( \/ \d+ )? $/x)
- {
- Carp::my_carp("Table '$property_name=$map' should have been defined. Defining it now.")
+ # Have all we need to populate the match tables.
+ my $maps_should_be_defined = $property->pre_declared_maps;
+ foreach my $range ($property->ranges) {
+ my $map = $range->value;
+ my $table = $property->table($map);
+ if (! defined $table) {
+
+ # Integral and rational property values are not
+ # necessarily defined in PropValueAliases, but whether all
+ # the other ones should be depends on the property.
+ if ($maps_should_be_defined
+ && $map !~ /^ -? \d+ ( \/ \d+ )? $/x)
+ {
+ Carp::my_carp("Table '$property_name=$map' should "
+ . "have been defined. Defining it now.")
+ }
+ $table = $property->add_match_table($map);
}
- $table = $property->add_match_table($map);
- }
- next if $table->complement != 0; # Don't need to populate these
- $table->add_range($range->start, $range->end);
- }
+ next if $table->complement != 0; # Don't need to populate these
+ $table->add_range($range->start, $range->end);
+ }
}
# For Perl 5.6 compatibility, all properties matchable in regexes can
diff --git a/regcharclass.h b/regcharclass.h
index e0e5ec86b1..23efe2005e 100644
--- a/regcharclass.h
+++ b/regcharclass.h
@@ -2514,7 +2514,7 @@
* 1a0687fb9c6c4567e853913549df0944fe40821279a3e9cdaa6ab8679bc286fd lib/unicore/extracted/DLineBreak.txt
* 40bcfed3ca727c19e1331f6c33806231d5f7eeeabd2e6a9e06a3740c85d0c250 lib/unicore/extracted/DNumType.txt
* a18d502bad39d527ac5586d7bc93e29f565859e3bcc24ada627eff606d6f5fed lib/unicore/extracted/DNumValues.txt
- * f5a4305a9370059eba8955dda8f9ba72339996dc2249c7c37dd70ab0dd140a8d lib/unicore/mktables
+ * cd7fa4531c960622bb742271405469b68784c664045a5c949cc0187d952e414e lib/unicore/mktables
* 462c9aaa608fb2014cd9649af1c5c009485c60b9c8b15b89401fdc10cf6161c6 lib/unicore/version
* c6884f4d629f04d1316f3476cb1050b6a1b98ca30c903262955d4eae337c6b1e regen/charset_translations.pl
* d9c04ac46bdd81bb3e26519f2b8eb6242cb12337205add3f7cf092b0c58dccc4 regen/regcharclass.pl