From bc1686f3f653d30847736f2b71d694b98ba5c31d Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 1 Feb 2017 11:23:53 +0200 Subject: [PATCH] Small fixes to the Perl scripts to create unicode conversion tables. Add missing semicolons in UCS_to_* perl scripts. For consistency, use "$hashref->{key}" style everywhere. Kyotaro Horiguchi Discussion: https://www.postgresql.org/message-id/20170130.153738.139030994.horiguchi.kyotaro@lab.ntt.co.jp --- src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl | 2 +- .../utils/mb/Unicode/UCS_to_GB18030.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_UHC.pl | 2 +- src/backend/utils/mb/Unicode/convutils.pm | 28 +++++++++---------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl index 7566104f33..4f4375eb8f 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl @@ -69,7 +69,7 @@ while (<$in>) ucs => $ucs, code => $code, direction => 'both' - } + }; } close($in); diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl index b70f7144c7..926d2d8b30 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl @@ -218,7 +218,7 @@ sub sjis2jis $pos = $pos - ((31 * 0x5e) + 12); # after 85-ku 82-ten needs to be moved 2 codepoints - $pos = $pos - 2 if ($pos >= 84 * 0x5c + 82) + $pos = $pos - 2 if ($pos >= 84 * 0x5c + 82); } my $hi2 = $pos / 0x5e; diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl index 91699f6d20..296ed2bc1e 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl @@ -55,7 +55,7 @@ foreach my $i (@$mapping) code => ($i->{code} + 0x8ea10000), rest => $i->{rest}, direction => 'to_unicode' - } + }; } } diff --git a/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl b/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl index 701c35cfa7..f754611ce8 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl @@ -37,7 +37,7 @@ while (<$in>) ucs => $ucs, code => $code, direction => 'both' - } + }; } } close($in); diff --git a/src/backend/utils/mb/Unicode/UCS_to_UHC.pl b/src/backend/utils/mb/Unicode/UCS_to_UHC.pl index 45c6db538c..a65c537820 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_UHC.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_UHC.pl @@ -40,7 +40,7 @@ while (<$in>) ucs => $ucs, code => $code, direction => 'both' - } + }; } } close($in); diff --git a/src/backend/utils/mb/Unicode/convutils.pm b/src/backend/utils/mb/Unicode/convutils.pm index 7adcee4857..0ae79a2f33 100644 --- a/src/backend/utils/mb/Unicode/convutils.pm +++ b/src/backend/utils/mb/Unicode/convutils.pm @@ -168,20 +168,20 @@ sub print_from_utf8_map "static const pg_utf_to_local ULmap${charset}[ %d ] = {", scalar(@$table)); my $first = 1; - foreach my $i (sort {$$a{utf8} <=> $$b{utf8}} @$table) + foreach my $i (sort {$a->{utf8} <=> $b->{utf8}} @$table) { print($out ",") if (!$first); $first = 0; print($out "\t/* $last_comment */") if ($verbose); - printf($out "\n {0x%04x, 0x%04x}", $$i{utf8}, $$i{code}); + printf($out "\n {0x%04x, 0x%04x}", $i->{utf8}, $i->{code}); if ($verbose >= 2) { - $last_comment = "$$i{f}:$$i{l} $$i{comment}"; + $last_comment = "$i->{f}:$i->{l} $i->{comment}"; } else { - $last_comment = $$i{comment}; + $last_comment = $i->{comment}; } } print($out "\t/* $last_comment */") if ($verbose); @@ -202,14 +202,14 @@ sub print_from_utf8_combined_map "static const pg_utf_to_local_combined ULmap${charset}_combined[ %d ] = {", scalar(@$table)); my $first = 1; - foreach my $i (sort {$$a{utf8} <=> $$b{utf8}} @$table) + foreach my $i (sort {$a->{utf8} <=> $b->{utf8}} @$table) { print($out ",") if (!$first); $first = 0; print($out "\t/* $last_comment */") if ($verbose); - printf($out "\n {0x%08x, 0x%08x, 0x%04x}", $$i{utf8}, $$i{utf8_second}, $$i{code}); - $last_comment = "$$i{comment}"; + printf($out "\n {0x%08x, 0x%08x, 0x%04x}", $i->{utf8}, $i->{utf8_second}, $i->{code}); + $last_comment = "$i->{comment}"; } print($out "\t/* $last_comment */") if ($verbose); print $out "\n};\n"; @@ -230,20 +230,20 @@ sub print_to_utf8_map "static const pg_local_to_utf LUmap${charset}[ %d ] = {", scalar(@$table)); my $first = 1; - foreach my $i (sort {$$a{code} <=> $$b{code}} @$table) + foreach my $i (sort {$a->{code} <=> $b->{code}} @$table) { print($out ",") if (!$first); $first = 0; print($out "\t/* $last_comment */") if ($verbose); - printf($out "\n {0x%04x, 0x%x}", $$i{code}, $$i{utf8}); + printf($out "\n {0x%04x, 0x%x}", $i->{code}, $i->{utf8}); if ($verbose >= 2) { - $last_comment = "$$i{f}:$$i{l} $$i{comment}"; + $last_comment = "$i->{f}:$i->{l} $i->{comment}"; } else { - $last_comment = $$i{comment}; + $last_comment = $i->{comment}; } } print($out "\t/* $last_comment */") if ($verbose); @@ -265,14 +265,14 @@ sub print_to_utf8_combined_map "static const pg_local_to_utf_combined LUmap${charset}_combined[ %d ] = {", scalar(@$table)); my $first = 1; - foreach my $i (sort {$$a{code} <=> $$b{code}} @$table) + foreach my $i (sort {$a->{code} <=> $b->{code}} @$table) { print($out ",") if (!$first); $first = 0; print($out "\t/* $last_comment */") if ($verbose); - printf($out "\n {0x%04x, 0x%08x, 0x%08x}", $$i{code}, $$i{utf8}, $$i{utf8_second}); - $last_comment = "$$i{comment}"; + printf($out "\n {0x%04x, 0x%08x, 0x%08x}", $i->{code}, $i->{utf8}, $i->{utf8_second}); + $last_comment = "$i->{comment}"; } print($out "\t/* $last_comment */") if ($verbose); print $out "\n};\n";