From 8843f0de523f9c939c38391398eb1f71e2621846 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Wed, 28 Mar 2018 09:55:52 -0600 Subject: [PATCH] regen/mk_invlists.pl: Change some fcns to return a ref They previously returned an array. This is in preparation for a future commit, where a similar function will return multiple arguments. --- charclass_invlists.h | 2 +- regen/mk_invlists.pl | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/charclass_invlists.h b/charclass_invlists.h index e02309f..a6fcee9 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -162117,5 +162117,5 @@ static const U8 WB_table[24][24] = { * ea4dc61a00d2db9bd46f3ddec706b5b7b11e8fcf848fb384b54b507fb70d8e90 lib/unicore/mktables * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl - * 51e088ab6a41930a38c1c896a943d1d7094b97e6a3180c4e9699f434c63be2ed regen/mk_invlists.pl + * 90f9d3726f5dfaa25d13f513332ba162be34f1cef8623322b3de7cb36b0e3dca regen/mk_invlists.pl * ex: set ro: */ diff --git a/regen/mk_invlists.pl b/regen/mk_invlists.pl index 4a29d6f..89546d1 100644 --- a/regen/mk_invlists.pl +++ b/regen/mk_invlists.pl @@ -681,7 +681,8 @@ for my $i (0 .. @$folds_ref - 1) { sub _Perl_Non_Final_Folds { @is_non_final_fold = sort { $a <=> $b } @is_non_final_fold; - return mk_invlist_from_sorted_cp_list(\@is_non_final_fold); + my @return = mk_invlist_from_sorted_cp_list(\@is_non_final_fold); + return \@return; } sub prop_name_for_cmp ($) { # Sort helper @@ -696,7 +697,8 @@ sub prop_name_for_cmp ($) { # Sort helper } sub UpperLatin1 { - return mk_invlist_from_sorted_cp_list([ 128 .. 255 ]); + my @return = mk_invlist_from_sorted_cp_list([ 128 .. 255 ]); + return \@return; } sub output_table_common { @@ -1959,8 +1961,10 @@ for my $charset (get_supported_code_pages()) { my $maps_to_code_point; my $to_adjust; if ($is_local_sub) { - @invlist = eval $lookup_prop; + my @return = eval $lookup_prop; die $@ if $@; + my $invlist_ref = shift @return; + @invlist = @$invlist_ref; } else { @invlist = prop_invlist($lookup_prop, '_perl_core_internal_ok'); -- 1.8.3.1