Skip to content

Commit 5b52ed1

Browse files
committed
mktables: Add count() method to Range class
There is already this method for lists of Ranges, so this is is just so callers don't need to know which they are operating on.
1 parent 9ce4ca1 commit 5b52ed1

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

charclass_invlists.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -436055,7 +436055,7 @@ static const U8 WB_table[23][23] = {
436055436055
* 3f4f32ed2a577344a508114527e721d7a8b633d32f38945d47fe0c743650c585 lib/unicore/extracted/DLineBreak.txt
436056436056
* 710abf2d581ac9c57f244c0834f9d9969d9781e0396adccd330eaae658ac7d6b lib/unicore/extracted/DNumType.txt
436057436057
* 6bd30f385f3baf3ab5d5308c111a81de87bea5f494ba0ba69e8ab45263b8c34d lib/unicore/extracted/DNumValues.txt
436058-
* c1557a0885bf627ece862b3a80ee1bd24449b656e01159d4c6753c3a1ed54335 lib/unicore/mktables
436058+
* 4b2ad6e7689bea5acec1b52fa813a60fdac125a5cc6901cc02be3093b1697894 lib/unicore/mktables
436059436059
* 55d90fdc3f902e5c0b16b3378f9eaa36e970a1c09723c33de7d47d0370044012 lib/unicore/version
436060436060
* 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
436061436061
* c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl

lib/unicore/mktables

+7-2
Original file line numberDiff line numberDiff line change
@@ -3627,6 +3627,11 @@ sub trace { return main::trace(@_); }
36273627
return $standard_form{$addr} = main::standardize($value);
36283628
}
36293629

3630+
sub count($self) {
3631+
my $addr = pack 'J', refaddr $self;
3632+
return $end{$addr} - $start{$addr} + 1;
3633+
}
3634+
36303635
sub dump($self, $indent) {
36313636
# Human, not machine readable. For machine readable, comment out this
36323637
# entire routine and let the standard one take effect.
@@ -4811,7 +4816,7 @@ sub trace { return main::trace(@_); }
48114816

48124817
my $count = 0;
48134818
foreach my $range (@{$ranges{$addr}}) {
4814-
$count += $range->end - $range->start + 1;
4819+
$count += $range->count;
48154820
}
48164821
return $count;
48174822
}
@@ -6028,7 +6033,7 @@ END
60286033
# points"
60296034
my $count = ($set->type != 0)
60306035
? 1
6031-
: $set->end - $set->start + 1;
6036+
: $set->count;
60326037
$widths{$this_width} += $count;
60336038
$total += $count;
60346039
$max_map_width = $this_width

lib/unicore/uni_keywords.pl

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

regcharclass.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

regexp_constants.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
* 3f4f32ed2a577344a508114527e721d7a8b633d32f38945d47fe0c743650c585 lib/unicore/extracted/DLineBreak.txt
7979
* 710abf2d581ac9c57f244c0834f9d9969d9781e0396adccd330eaae658ac7d6b lib/unicore/extracted/DNumType.txt
8080
* 6bd30f385f3baf3ab5d5308c111a81de87bea5f494ba0ba69e8ab45263b8c34d lib/unicore/extracted/DNumValues.txt
81-
* c1557a0885bf627ece862b3a80ee1bd24449b656e01159d4c6753c3a1ed54335 lib/unicore/mktables
81+
* 4b2ad6e7689bea5acec1b52fa813a60fdac125a5cc6901cc02be3093b1697894 lib/unicore/mktables
8282
* 55d90fdc3f902e5c0b16b3378f9eaa36e970a1c09723c33de7d47d0370044012 lib/unicore/version
8383
* 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
8484
* c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl

uni_keywords.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)