mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
all: replace []byte with []u8
This commit is contained in:
@@ -7,7 +7,7 @@ import strconv
|
||||
|
||||
struct Scanner {
|
||||
mut:
|
||||
text []byte
|
||||
text []u8
|
||||
pos int
|
||||
line int
|
||||
col int
|
||||
@@ -31,7 +31,7 @@ enum TokenKind {
|
||||
}
|
||||
|
||||
pub struct Token {
|
||||
lit []byte
|
||||
lit []u8
|
||||
kind TokenKind
|
||||
line int
|
||||
col int
|
||||
@@ -108,7 +108,7 @@ fn (s Scanner) error(description string) Token {
|
||||
}
|
||||
|
||||
// tokenize returns a token based on the given lit and kind.
|
||||
fn (s Scanner) tokenize(lit []byte, kind TokenKind) Token {
|
||||
fn (s Scanner) tokenize(lit []u8, kind TokenKind) Token {
|
||||
return Token{
|
||||
lit: lit
|
||||
kind: kind
|
||||
@@ -121,7 +121,7 @@ fn (s Scanner) tokenize(lit []byte, kind TokenKind) Token {
|
||||
[manualfree]
|
||||
fn (mut s Scanner) text_scan() Token {
|
||||
mut has_closed := false
|
||||
mut chrs := []byte{}
|
||||
mut chrs := []u8{}
|
||||
for {
|
||||
s.pos++
|
||||
s.col++
|
||||
@@ -148,7 +148,7 @@ fn (mut s Scanner) text_scan() Token {
|
||||
if s.pos + 5 < s.text.len {
|
||||
s.pos++
|
||||
s.col++
|
||||
mut codepoint := []byte{}
|
||||
mut codepoint := []u8{}
|
||||
codepoint_start := s.pos
|
||||
for s.pos < s.text.len && s.pos < codepoint_start + 4 {
|
||||
s.pos++
|
||||
@@ -201,7 +201,7 @@ fn (mut s Scanner) num_scan() Token {
|
||||
// -[digit][?[dot][digit]][?[E/e][?-/+][digit]]
|
||||
mut is_fl := false
|
||||
mut dot_index := -1
|
||||
mut digits := []byte{}
|
||||
mut digits := []u8{}
|
||||
if s.text[s.pos] == `-` {
|
||||
digits << `-`
|
||||
if !s.text[s.pos + 1].is_digit() {
|
||||
@@ -262,7 +262,7 @@ fn (mut s Scanner) scan() Token {
|
||||
s.move()
|
||||
}
|
||||
if s.pos >= s.text.len {
|
||||
return s.tokenize([]byte{}, .eof)
|
||||
return s.tokenize([]u8{}, .eof)
|
||||
} else if s.pos + 3 < s.text.len && (s.text[s.pos] == `t` || s.text[s.pos] == `n`) {
|
||||
ident := s.text[s.pos..s.pos + 4].bytestr()
|
||||
if ident == 'true' || ident == 'null' {
|
||||
@@ -298,7 +298,7 @@ fn (mut s Scanner) scan() Token {
|
||||
return s.invalid_token()
|
||||
} else if s.text[s.pos] in json2.char_list {
|
||||
chr := s.text[s.pos]
|
||||
tok := s.tokenize([]byte{}, TokenKind(int(chr)))
|
||||
tok := s.tokenize([]u8{}, TokenKind(int(chr)))
|
||||
s.move()
|
||||
return tok
|
||||
} else if s.text[s.pos] == `"` {
|
||||
|
||||
@@ -114,8 +114,8 @@ pub fn (mut bmp BitMap) save_as_ppm(file_name string) {
|
||||
bmp.buf = tmp_buf
|
||||
}
|
||||
|
||||
pub fn (mut bmp BitMap) get_raw_bytes() []byte {
|
||||
mut f_buf := []byte{len: bmp.buf_size / 4}
|
||||
pub fn (mut bmp BitMap) get_raw_bytes() []u8 {
|
||||
mut f_buf := []u8{len: bmp.buf_size / 4}
|
||||
mut i := 0
|
||||
for i < bmp.buf_size {
|
||||
unsafe {
|
||||
|
||||
@@ -45,7 +45,7 @@ mut:
|
||||
******************************************************************************/
|
||||
pub struct TTF_File {
|
||||
pub mut:
|
||||
buf []byte
|
||||
buf []u8
|
||||
pos u32
|
||||
length u16
|
||||
scalar_type u32
|
||||
@@ -319,7 +319,7 @@ fn (mut tf TTF_File) read_simple_glyph(mut in_glyph Glyph) {
|
||||
num_points++
|
||||
|
||||
mut i := 0
|
||||
mut flags := []byte{}
|
||||
mut flags := []u8{}
|
||||
for i < num_points {
|
||||
flag := tf.get_u8()
|
||||
flags << flag
|
||||
|
||||
@@ -151,7 +151,7 @@ ffbf ffff bf00 0000 0000 0000 0000 0000
|
||||
0000 0000 0000 0000 0000 0000 0000 0000
|
||||
'
|
||||
|
||||
fn save_raw_data_as_array(buf_bin []byte, file_name string) {
|
||||
fn save_raw_data_as_array(buf_bin []u8, file_name string) {
|
||||
mut buf := strings.new_builder(buf_bin.len * 5)
|
||||
for x in buf_bin {
|
||||
buf.write_string('0x${x:02x},')
|
||||
@@ -212,8 +212,8 @@ fn test_main() {
|
||||
}
|
||||
}
|
||||
|
||||
fn get_raw_data(data string) []byte {
|
||||
mut buf := []byte{}
|
||||
fn get_raw_data(data string) []u8 {
|
||||
mut buf := []u8{}
|
||||
mut c := 0
|
||||
mut b := u32(0)
|
||||
for ch in data {
|
||||
|
||||
Reference in New Issue
Block a user