encoding.utf8: remove const unicode_con_table_up_to_low table (#9672)

vlang · Apr 11, 2021 · cca06fc · cca06fc
1 parent acb58d4
commit cca06fc
Show file tree

Hide file tree

Showing 5 changed files with 955 additions and 1,540 deletions.
diff --git a/cmd/tools/vtest-cleancode.v b/cmd/tools/vtest-cleancode.v
@@ -43,6 +43,7 @@ const (
 		'vlib/builtin/',
 		'vlib/cli/',
 		'vlib/dl/',
+		'vlib/encoding/utf8/',
 		'vlib/flag/',
 		'vlib/gg/',
 		'vlib/math/bits/bits.v',

diff --git a/vlib/encoding/utf8/east_asian/east_asian_width.v b/vlib/encoding/utf8/east_asian/east_asian_width.v
@@ -37,7 +37,7 @@ pub fn east_asian_width_property_at(s string, index int) EastAsianWidthProperty
 	mut left, mut right := 0, east_asian.east_asian_width_data.len - 1
 	for left <= right {
 		middle := left + ((right - left) / 2)
-		entry := east_asian_width_data[middle]
+		entry := east_asian.east_asian_width_data[middle]
 		if codepoint < entry.point {
 			right = middle - 1
 			continue

diff --git a/vlib/encoding/utf8/utf8.v b/vlib/encoding/utf8/utf8.v
@@ -11,10 +11,10 @@ pub fn validate_str(str string) bool {
 	return validate(str.str, str.len)
 }
 
-pub fn validate(data byteptr, len int) bool {
+pub fn validate(data &byte, len int) bool {
 	mut state := Utf8State{}
 	for i := 0; i < len; i++ {
-		s := unsafe {data[i]}
+		s := unsafe { data[i] }
 		if s == 0 {
 			break
 		}