Commit1563ecb

committed

Revert "Rename unicode_combining_table to unicode_width_table"

This reverts commiteb0d0d2.After I had committedeb0d0d2 and78ab944, I decided to adda sanity check for a "can't happen" scenario just to be cautious.It turned out that it already happened in the official Unicode sourcedata, namely that a character can be both wide and a combiningcharacter. This fact renders the aforementioned commits unnecessary,so revert both of them.Discussion:https://www.postgresql.org/message-id/CAFBsxsH5ejH4-1xaTLpSK8vWoK1m6fA1JBtTM6jmBsLfmDki1g%40mail.gmail.com

1 parentf8c8a8b commit1563ecbCopy full SHA for 1563ecb

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ LIBS += $(PTHREAD_LIBS)`
`18`	`18`	`# By default, do nothing.`
`19`	`19`	`all:`
`20`	`20`
`21`		`-update-unicode: unicode_norm_table.hunicode_width_table.h unicode_normprops_table.h unicode_norm_hashfunc.h`
	`21`	`+update-unicode: unicode_norm_table.hunicode_combining_table.h unicode_normprops_table.h unicode_norm_hashfunc.h`
`22`	`22`	`mv$^ ../../../src/include/common/`
`23`	`23`	`$(MAKE) normalization-check`
`24`	`24`
`@@ -35,7 +35,7 @@ unicode_norm_hashfunc.h: unicode_norm_table.h`
`35`	`35`	`unicode_norm_table.h: generate-unicode_norm_table.pl UnicodeData.txt CompositionExclusions.txt`
`36`	`36`	`$(PERL) generate-unicode_norm_table.pl`
`37`	`37`
`38`		`-unicode_width_table.h: generate-unicode_width_table.pl UnicodeData.txt`
	`38`	`+unicode_combining_table.h: generate-unicode_combining_table.pl UnicodeData.txt`
`39`	`39`	`$(PERL)$^>$@`
`40`	`40`
`41`	`41`	`unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizationProps.txt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`my$count = 0;`
`16`	`16`
`17`	`17`	`print`
`18`		`-"/* generated by src/common/unicode/generate-unicode_width_table.pl, do not edit */\n\n";`
	`18`	`+"/* generated by src/common/unicode/generate-unicode_combining_table.pl, do not edit */\n\n";`
`19`	`19`
`20`	`20`	`print"static const struct mbinterval combining[] = {\n";`
`21`	`21`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max)`
`644`	`644`	`staticint`
`645`	`645`	`ucs_wcwidth(pg_wcharucs)`
`646`	`646`	`{`
`647`		`-#include"common/unicode_width_table.h"`
	`647`	`+#include"common/unicode_combining_table.h"`
`648`	`648`
`649`	`649`	`/* test for 8-bit control characters */`
`650`	`650`	`if (ucs==0)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* generated by src/common/unicode/generate-unicode_width_table.pl, do not edit */`
	`1`	`+/* generated by src/common/unicode/generate-unicode_combining_table.pl, do not edit */`
`2`	`2`
`3`	`3`	`staticconststructmbintervalcombining[]= {`
`4`	`4`	`{0x0300,0x036F},`

Comments

(0)