Rename unicode_combining_table to unicode_width_table

No functional changes. A future commit will use this table for
other purposes besides combining characters.
This commit is contained in:
John Naylor 2021-08-20 10:34:26 -04:00
parent 373e08a9f7
commit eb0d0d2c73
4 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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";

View File

@ -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)

View File

@ -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},