database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-12 16:21:30 +03:00
Code

Revert "Rename unicode_combining_table to unicode_width_table"

Browse Source 
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
This commit is contained in:
John Naylor 2021-08-26 10:06:12 -04:00
parent f8c8a8bccc
commit 1563ecbc1b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/unicode/Makefile
View File

@ -18,7 +18,7 @@ LIBS += $(PTHREAD_LIBS)
# By default, do nothing. # By default, do nothing.
all: 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/ mv $^ ../../../src/include/common/
$(MAKE) normalization-check $(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 unicode_norm_table.h: generate-unicode_norm_table.pl UnicodeData.txt CompositionExclusions.txt
$(PERL) generate-unicode_norm_table.pl $(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) $^ >$@ $(PERL) $^ >$@
unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizationProps.txt unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizationProps.txt

2
src/common/unicode/generate-unicode_width_table.pl → src/common/unicode/generate-unicode_combining_table.pl
View File

@ -15,7 +15,7 @@ my $prev_codepoint;
my $count = 0; my $count = 0;
print 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"; print "static const struct mbinterval combining[] = {\n";

2
src/common/wchar.c
View File

@ -644,7 +644,7 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max)
static int static int
ucs_wcwidth(pg_wchar ucs) ucs_wcwidth(pg_wchar ucs)
{ {
#include "common/unicode_width_table.h" #include "common/unicode_combining_table.h"
/* test for 8-bit control characters */ /* test for 8-bit control characters */
if (ucs == 0) if (ucs == 0)

2
src/include/common/unicode_width_table.h → src/include/common/unicode_combining_table.h
View File

@ -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[] = { static const struct mbinterval combining[] = {
{0x0300, 0x036F}, {0x0300, 0x036F},