From 1563ecbc1be8b8e5c57651cf5c87f90dea9aea8f Mon Sep 17 00:00:00 2001 From: John Naylor Date: Thu, 26 Aug 2021 10:06:12 -0400 Subject: [PATCH] Revert "Rename unicode_combining_table to unicode_width_table" This reverts commit eb0d0d2c7300c9c5c22b35975c11265aa4becc84. After I had committed eb0d0d2c7 and 78ab944cd, I decided to add a sanity check for a "can't happen" scenario just to be cautious. It turned out that it already happened in the official Unicode source data, namely that a character can be both wide and a combining character. This fact renders the aforementioned commits unnecessary, so revert both of them. Discussion: https://www.postgresql.org/message-id/CAFBsxsH5ejH4-1xaTLpSK8vWoK1m6fA1JBtTM6jmBsLfmDki1g%40mail.gmail.com --- src/common/unicode/Makefile | 4 ++-- ...ode_width_table.pl => generate-unicode_combining_table.pl} | 2 +- src/common/wchar.c | 2 +- .../{unicode_width_table.h => unicode_combining_table.h} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/common/unicode/{generate-unicode_width_table.pl => generate-unicode_combining_table.pl} (91%) rename src/include/common/{unicode_width_table.h => unicode_combining_table.h} (97%) diff --git a/src/common/unicode/Makefile b/src/common/unicode/Makefile index 499e31d59f0..eb14add28ad 100644 --- a/src/common/unicode/Makefile +++ b/src/common/unicode/Makefile @@ -18,7 +18,7 @@ LIBS += $(PTHREAD_LIBS) # By default, do nothing. all: -update-unicode: unicode_norm_table.h unicode_width_table.h unicode_normprops_table.h unicode_norm_hashfunc.h +update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_normprops_table.h unicode_norm_hashfunc.h mv $^ ../../../src/include/common/ $(MAKE) normalization-check @@ -35,7 +35,7 @@ unicode_norm_hashfunc.h: unicode_norm_table.h unicode_norm_table.h: generate-unicode_norm_table.pl UnicodeData.txt CompositionExclusions.txt $(PERL) generate-unicode_norm_table.pl -unicode_width_table.h: generate-unicode_width_table.pl UnicodeData.txt +unicode_combining_table.h: generate-unicode_combining_table.pl UnicodeData.txt $(PERL) $^ >$@ unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizationProps.txt diff --git a/src/common/unicode/generate-unicode_width_table.pl b/src/common/unicode/generate-unicode_combining_table.pl similarity index 91% rename from src/common/unicode/generate-unicode_width_table.pl rename to src/common/unicode/generate-unicode_combining_table.pl index 90b57af075e..86aed789070 100644 --- a/src/common/unicode/generate-unicode_width_table.pl +++ b/src/common/unicode/generate-unicode_combining_table.pl @@ -15,7 +15,7 @@ my $prev_codepoint; my $count = 0; print - "/* generated by src/common/unicode/generate-unicode_width_table.pl, do not edit */\n\n"; + "/* generated by src/common/unicode/generate-unicode_combining_table.pl, do not edit */\n\n"; print "static const struct mbinterval combining[] = {\n"; diff --git a/src/common/wchar.c b/src/common/wchar.c index bb97b5f54f4..0636b8765ba 100644 --- a/src/common/wchar.c +++ b/src/common/wchar.c @@ -644,7 +644,7 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max) static int ucs_wcwidth(pg_wchar ucs) { -#include "common/unicode_width_table.h" +#include "common/unicode_combining_table.h" /* test for 8-bit control characters */ if (ucs == 0) diff --git a/src/include/common/unicode_width_table.h b/src/include/common/unicode_combining_table.h similarity index 97% rename from src/include/common/unicode_width_table.h rename to src/include/common/unicode_combining_table.h index 3a02ed5c626..a9f10c31bc8 100644 --- a/src/include/common/unicode_width_table.h +++ b/src/include/common/unicode_combining_table.h @@ -1,4 +1,4 @@ -/* generated by src/common/unicode/generate-unicode_width_table.pl, do not edit */ +/* generated by src/common/unicode/generate-unicode_combining_table.pl, do not edit */ static const struct mbinterval combining[] = { {0x0300, 0x036F},