Revert "change type to UChar32 to fix IsValidCodepoint"

stweil · stweil · commit 07f1400e6f7b · 2017-09-18T07:42:00.000+02:00
This reverts commit a404c9c. That code no longer matched the specification (see code comment). Signed-off-by: Stefan Weil <sw@weilnetz.de>
diff --git a/training/normstrngs.cpp b/training/normstrngs.cpp
@@ -217,7 +217,7 @@ bool IsOCREquivalent(char32 ch1, char32 ch2) {
 
 bool IsValidCodepoint(const char32 ch) {
   // In the range [0, 0xD800) or [0xE000, 0x10FFFF]
-  return (static_cast<UChar32>(ch) < 0xD800) || (ch >= 0xE000 && ch <= 0x10FFFF);
+  return (static_cast<uint32_t>(ch) < 0xD800) || (ch >= 0xE000 && ch <= 0x10FFFF);
 }
 
 bool IsWhitespace(const char32 ch) {

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ bool IsOCREquivalent(char32 ch1, char32 ch2) {`
`217`	`217`
`218`	`218`	`bool IsValidCodepoint(const char32 ch) {`
`219`	`219`	`// In the range [0, 0xD800) or [0xE000, 0x10FFFF]`
`220`		`- return (static_cast<UChar32>(ch) < 0xD800) \|\| (ch >= 0xE000 && ch <= 0x10FFFF);`
	`220`	`+ return (static_cast<uint32_t>(ch) < 0xD800) \|\| (ch >= 0xE000 && ch <= 0x10FFFF);`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`bool IsWhitespace(const char32 ch) {`