NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit78ab944

committed

Change mbbisearch to return the character range

Add a width field to mbinterval and have mbbisearch return apointer to the found range rather than just bool for success.A future commit will add another width besides zero, and thiswill allow that to use the same search.Reviewed by Jacob ChampionDiscussion:https://www.postgresql.org/message-id/CAFBsxsGOCpzV7c-f3a8ADsA1n4uZ%3D8puCctQp%2Bx7W0vgkv%3Dw%2Bg%40mail.gmail.com

1 parenteb0d0d2 commit78ab944Copy full SHA for 78ab944

File tree

3 files changed

+208

-203

lines changed

src
- common
  - unicode
    - generate-unicode_width_table.pl
  - wchar.c
- include/common
  - unicode_width_table.h

3 files changed

+208

-203

lines changed

`‎src/common/unicode/generate-unicode_width_table.pl`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`print`
`18`	`18`	`"/* generated by src/common/unicode/generate-unicode_width_table.pl, do not edit */\n\n";`
`19`	`19`
`20`		`-print"static const struct mbintervalcombining[] = {\n";`
	`20`	`+print"static const struct mbintervalwcwidth[] = {\n";`
`21`	`21`
`22`	`22`	`foreachmy$line (<ARGV>)`
`23`	`23`	`{`
`@@ -40,7 +40,7 @@`
`40`	`40`	`# not a combining character, print out previous range if any`
`41`	`41`	`if (defined($range_start))`
`42`	`42`	`{`
`43`		`-printf"\t{0x%04X, 0x%04X},\n",$range_start,$prev_codepoint;`
	`43`	`+printf"\t{0x%04X, 0x%04X, 0},\n",$range_start,$prev_codepoint;`
`44`	`44`	`$range_start =undef;`
`45`	`45`	`}`
`46`	`46`	`}`

`‎src/common/wchar.c`

Lines changed: 13 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -585,17 +585,18 @@ struct mbinterval`
`585`	`585`	`{`
`586`	`586`	`unsigned shortfirst;`
`587`	`587`	`unsigned shortlast;`
	`588`	`+signedintwidth;`
`588`	`589`	`};`
`589`	`590`
`590`	`591`	`/* auxiliary function for binary search in interval table */`
`591`		`-staticint`
	`592`	`+staticconststructmbinterval*`
`592`	`593`	`mbbisearch(pg_wcharucs,conststructmbinterval*table,intmax)`
`593`	`594`	`{`
`594`	`595`	`intmin=0;`
`595`	`596`	`intmid;`
`596`	`597`
`597`	`598`	`if (ucs<table[0].first\|\|ucs>table[max].last)`
`598`		`-return0;`
	`599`	`+returnNULL;`
`599`	`600`	`while (max >=min)`
`600`	`601`	`{`
`601`	`602`	`mid= (min+max) /2;`
`@@ -604,10 +605,10 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max)`
`604`	`605`	`elseif (ucs<table[mid].first)`
`605`	`606`	`max=mid-1;`
`606`	`607`	`else`
`607`		`-return1;`
	`608`	`+return&table[mid];`
`608`	`609`	`}`
`609`	`610`
`610`		`-return0;`
	`611`	`+returnNULL;`
`611`	`612`	`}`
`612`	`613`
`613`	`614`
`@@ -646,17 +647,21 @@ ucs_wcwidth(pg_wchar ucs)`
`646`	`647`	`{`
`647`	`648`	`#include"common/unicode_width_table.h"`
`648`	`649`
	`650`	`+conststructmbinterval*range;`
	`651`	`+`
`649`	`652`	`/* test for 8-bit control characters */`
`650`	`653`	`if (ucs==0)`
`651`	`654`	`return0;`
`652`	`655`
`653`	`656`	`if (ucs<0x20\|\| (ucs >=0x7f&&ucs<0xa0)\|\|ucs>0x0010ffff)`
`654`	`657`	`return-1;`
`655`	`658`
`656`		`-/* binary search in table of non-spacing characters */`
`657`		`-if (mbbisearch(ucs,combining,`
`658`		`-sizeof(combining) /sizeof(structmbinterval)-1))`
`659`		`-return0;`
	`659`	`+/* binary search in table of character widths */`
	`660`	`+range=mbbisearch(ucs,wcwidth,`
	`661`	`+sizeof(wcwidth) /sizeof(structmbinterval)-1);`
	`662`	`+`
	`663`	`+if (range!=NULL)`
	`664`	`+returnrange->width;`
`660`	`665`
`661`	`666`	`/*`
`662`	`667`	`* if we arrive here, ucs is not a combining or C0/C1 control character`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit78ab944

File tree

3 files changed

3 files changed

`‎src/common/unicode/generate-unicode_width_table.pl`

`‎src/common/wchar.c`

0 commit comments