diff options
| author | John Naylor | 2021-08-20 14:34:26 +0000 |
|---|---|---|
| committer | John Naylor | 2021-08-25 17:01:35 +0000 |
| commit | eb0d0d2c7300c9c5c22b35975c11265aa4becc84 (patch) | |
| tree | 9604d1e906ec97ad7b8658e7058463c287b7f91d | |
| parent | 373e08a9f771e724efd3bd29f78c39515792dcf3 (diff) | |
Rename unicode_combining_table to unicode_width_table
No functional changes. A future commit will use this table for
other purposes besides combining characters.
| -rw-r--r-- | src/common/unicode/Makefile | 4 | ||||
| -rw-r--r-- | src/common/unicode/generate-unicode_width_table.pl (renamed from src/common/unicode/generate-unicode_combining_table.pl) | 2 | ||||
| -rw-r--r-- | src/common/wchar.c | 2 | ||||
| -rw-r--r-- | src/include/common/unicode_width_table.h (renamed from src/include/common/unicode_combining_table.h) | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/common/unicode/Makefile b/src/common/unicode/Makefile index eb14add28ad..499e31d59f0 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_combining_table.h unicode_normprops_table.h unicode_norm_hashfunc.h +update-unicode: unicode_norm_table.h unicode_width_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_combining_table.h: generate-unicode_combining_table.pl UnicodeData.txt +unicode_width_table.h: generate-unicode_width_table.pl UnicodeData.txt $(PERL) $^ >$@ unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizationProps.txt diff --git a/src/common/unicode/generate-unicode_combining_table.pl b/src/common/unicode/generate-unicode_width_table.pl index 86aed789070..90b57af075e 100644 --- a/src/common/unicode/generate-unicode_combining_table.pl +++ b/src/common/unicode/generate-unicode_width_table.pl @@ -15,7 +15,7 @@ my $prev_codepoint; my $count = 0; print - "/* generated by src/common/unicode/generate-unicode_combining_table.pl, do not edit */\n\n"; + "/* generated by src/common/unicode/generate-unicode_width_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 0636b8765ba..bb97b5f54f4 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_combining_table.h" +#include "common/unicode_width_table.h" /* test for 8-bit control characters */ if (ucs == 0) diff --git a/src/include/common/unicode_combining_table.h b/src/include/common/unicode_width_table.h index a9f10c31bc8..3a02ed5c626 100644 --- a/src/include/common/unicode_combining_table.h +++ b/src/include/common/unicode_width_table.h @@ -1,4 +1,4 @@ -/* generated by src/common/unicode/generate-unicode_combining_table.pl, do not edit */ +/* generated by src/common/unicode/generate-unicode_width_table.pl, do not edit */ static const struct mbinterval combining[] = { {0x0300, 0x036F}, |