com php-src: Update ucgendat for more bidi properties: ext/mbstring/ucgendat/ucgendat.c ext/mbstring/unicode_data. h
| From: | Nikita Popov | Date: | Sun, 23 Jul 2017 14:03:11 +0000 |
| Subject: | com php-src: Update ucgendat for more bidi properties: ext/mbstring/ucgendat/ucgendat.c ext/mbstring/unicode_data. h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98753@lists.php.net to get a copy of this message | ||
Commit: 24cfbfd56fb2f382b720c9dd5f53ced72e8230f3
Author: Nikita Popov <nikita.ppv@gmail.com> Sun, 23 Jul 2017 16:03:11 +0200
Parents: 077e61fad3c5fbdbe8df4371b88f64bcc4a6bccd
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24cfbfd56fb2f382b720c9dd5f53ced72e8230f3
Log:
Update ucgendat for more bidi properties
Handle them the same way as others -- by classifying as Other
Neutral.
Changed paths:
M ext/mbstring/ucgendat/ucgendat.c
M ext/mbstring/unicode_data.h
Diff:
diff --git a/ext/mbstring/ucgendat/ucgendat.c b/ext/mbstring/ucgendat/ucgendat.c
index 4244108...c0d9b43 100644
--- a/ext/mbstring/ucgendat/ucgendat.c
+++ b/ext/mbstring/ucgendat/ucgendat.c
@@ -336,7 +336,9 @@ ordered_range_insert(ac_uint4 c, char *name, int len)
(len == 3 &&
(memcmp(name, "NSM", 3) == 0 || memcmp(name, "PDF", 3) == 0 ||
memcmp(name, "LRE", 3) == 0 || memcmp(name, "LRO", 3) == 0 ||
- memcmp(name, "RLE", 3) == 0 || memcmp(name, "RLO", 3) == 0))) {
+ memcmp(name, "RLE", 3) == 0 || memcmp(name, "RLO", 3) == 0 ||
+ memcmp(name, "LRI", 3) == 0 || memcmp(name, "RLI", 3) == 0 ||
+ memcmp(name, "FSI", 3) == 0 || memcmp(name, "PDI", 3) == 0))) {
/*
* Mark all of these as Other Neutral to preserve compatibility with
* older versions.
@@ -350,8 +352,10 @@ ordered_range_insert(ac_uint4 c, char *name, int len)
break;
}
- if (i == NUMPROPS)
- return;
+ if (i == NUMPROPS) {
+ printf("Unknown property %s\n", name);
+ return;
+ }
/*
* Have a match, so insert the code in order.
diff --git a/ext/mbstring/unicode_data.h b/ext/mbstring/unicode_data.h
index c176128..580caaa 100644
--- a/ext/mbstring/unicode_data.h
+++ b/ext/mbstring/unicode_data.h
@@ -1887,7 +1887,7 @@ static const unsigned int _ucprop_ranges[] = {
0x0000200b, 0x0000200d, 0x00002010, 0x00002027,
0x0000202a, 0x0000202e, 0x00002035, 0x00002043,
0x00002045, 0x0000205e, 0x00002060, 0x00002064,
- 0x0000206a, 0x0000206f, 0x0000207c, 0x0000207e,
+ 0x00002066, 0x0000206f, 0x0000207c, 0x0000207e,
0x0000208c, 0x0000208e, 0x000020d0, 0x000020f0,
0x00002100, 0x00002101, 0x00002103, 0x00002106,
0x00002108, 0x00002109, 0x00002114, 0x00002114,