From 57a643a6b02820e528cc89d03660b9beb7f3784c Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Wed, 11 Aug 2021 07:46:14 -0600 Subject: mktables: Fix debugging issues Commit 4fe9356b250 changed the signatures on subroutines, and didn't do these correctly. The result was that perl would croak when using the mktables debugging facility. --- charclass_invlists.h | 2 +- lib/unicore/mktables | 12 ++++++------ lib/unicore/uni_keywords.pl | 2 +- regcharclass.h | 2 +- uni_keywords.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charclass_invlists.h b/charclass_invlists.h index 8f3bff7902..581e0afb6a 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -419900,7 +419900,7 @@ static const U8 WB_table[23][23] = { * baba9dfc133e3cb770a89aaf0973b1341fa61c2da6c176baf6428898b3b568d8 lib/unicore/extracted/DLineBreak.txt * 6d4a8c945dd7db83ed617cbb7d937de7f4ecf016ff22970d846e996a7c9a2a5d lib/unicore/extracted/DNumType.txt * 5b7c14380d5cceeaffcfbc18db1ed936391d2af2d51f5a41f1a17b692c77e59b lib/unicore/extracted/DNumValues.txt - * 3f9b68df38ab90c512f7159658ea01cc6fee76420c5953300a31fb06ac632e62 lib/unicore/mktables + * 7b73d5a791ee8a6ac3381904a719c530f5d41c41c17de02f416841adc6745ffb lib/unicore/mktables * 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl diff --git a/lib/unicore/mktables b/lib/unicore/mktables index dbc924c449..c0c66aad6b 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -2644,7 +2644,7 @@ END ".=" => \&main::_operator_dot_equal, ; - sub _operator_stringify($self) { + sub _operator_stringify($self, $other="", $reversed=0) { return __PACKAGE__ . " object for " . $self->file; } @@ -3566,7 +3566,7 @@ sub trace { return main::trace(@_); } ".=" => \&main::_operator_dot_equal, ; - sub _operator_stringify($self) { + sub _operator_stringify($self, $other="", $reversed=0) { my $addr = do { no overloading; pack 'J', $self; }; # Output it like '0041..0065 (value)' @@ -3723,7 +3723,7 @@ sub trace { return main::trace(@_); } ".=" => \&main::_operator_dot_equal, ; - sub _operator_stringify($self) { + sub _operator_stringify($self, $other="", $reversed=0) { my $addr = do { no overloading; pack 'J', $self; }; return "Range_List attached to '$owner_name_of{$addr}'" @@ -6800,7 +6800,7 @@ sub trace { return main::trace(@_); } qw("") => "_operator_stringify", ; - sub _operator_stringify { + sub _operator_stringify($self, $other="", $reversed=0) { my $self = shift; my $name = $self->property->full_name; @@ -7821,7 +7821,7 @@ sub trace { return main::trace(@_); } }, ; - sub _operator_stringify { + sub _operator_stringify($self, $other="", $reversed=0) { my $self = shift; my $name = $self->complete_name; @@ -8938,7 +8938,7 @@ sub trace { return main::trace(@_) if main::DEBUG && $to_trace } '-=' => "_minus_and_equal", ; - sub _operator_stringify { + sub _operator_stringify($self, $other="", $reversed=0) { return "Property '" . shift->full_name . "'"; } diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index 44c371bde4..1e9bc09238 100644 --- a/lib/unicore/uni_keywords.pl +++ b/lib/unicore/uni_keywords.pl @@ -1295,7 +1295,7 @@ # baba9dfc133e3cb770a89aaf0973b1341fa61c2da6c176baf6428898b3b568d8 lib/unicore/extracted/DLineBreak.txt # 6d4a8c945dd7db83ed617cbb7d937de7f4ecf016ff22970d846e996a7c9a2a5d lib/unicore/extracted/DNumType.txt # 5b7c14380d5cceeaffcfbc18db1ed936391d2af2d51f5a41f1a17b692c77e59b lib/unicore/extracted/DNumValues.txt -# 3f9b68df38ab90c512f7159658ea01cc6fee76420c5953300a31fb06ac632e62 lib/unicore/mktables +# 7b73d5a791ee8a6ac3381904a719c530f5d41c41c17de02f416841adc6745ffb lib/unicore/mktables # 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version # 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl # 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl diff --git a/regcharclass.h b/regcharclass.h index 242c4b89db..a8252f14e2 100644 --- a/regcharclass.h +++ b/regcharclass.h @@ -3762,7 +3762,7 @@ * baba9dfc133e3cb770a89aaf0973b1341fa61c2da6c176baf6428898b3b568d8 lib/unicore/extracted/DLineBreak.txt * 6d4a8c945dd7db83ed617cbb7d937de7f4ecf016ff22970d846e996a7c9a2a5d lib/unicore/extracted/DNumType.txt * 5b7c14380d5cceeaffcfbc18db1ed936391d2af2d51f5a41f1a17b692c77e59b lib/unicore/extracted/DNumValues.txt - * 3f9b68df38ab90c512f7159658ea01cc6fee76420c5953300a31fb06ac632e62 lib/unicore/mktables + * 7b73d5a791ee8a6ac3381904a719c530f5d41c41c17de02f416841adc6745ffb lib/unicore/mktables * 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 3fb6bafb4c830dd501868e34f550cdad3bf8d2c9eed44756488f36c484969417 regen/regcharclass.pl diff --git a/uni_keywords.h b/uni_keywords.h index 1df875fcf1..63cb693283 100644 --- a/uni_keywords.h +++ b/uni_keywords.h @@ -7542,7 +7542,7 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) { * baba9dfc133e3cb770a89aaf0973b1341fa61c2da6c176baf6428898b3b568d8 lib/unicore/extracted/DLineBreak.txt * 6d4a8c945dd7db83ed617cbb7d937de7f4ecf016ff22970d846e996a7c9a2a5d lib/unicore/extracted/DNumType.txt * 5b7c14380d5cceeaffcfbc18db1ed936391d2af2d51f5a41f1a17b692c77e59b lib/unicore/extracted/DNumValues.txt - * 3f9b68df38ab90c512f7159658ea01cc6fee76420c5953300a31fb06ac632e62 lib/unicore/mktables + * 7b73d5a791ee8a6ac3381904a719c530f5d41c41c17de02f416841adc6745ffb lib/unicore/mktables * 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl -- cgit v1.2.1