scanner: remove the restriction for \x00 in strings (#13493)

pull/13496/head
Delyan Angelov 2022-02-16 23:41:05 +02:00 committed by GitHub
parent 54b10e99a1
commit 89b99ad4c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 23 deletions

View File

@ -980,3 +980,7 @@ fn test_string_f32() {
assert '-123'.f32() - (-123) < f32_epsilon assert '-123'.f32() - (-123) < f32_epsilon
assert '-123.456'.f32() - (-123.456) <= f32_epsilon assert '-123.456'.f32() - (-123.456) <= f32_epsilon
} }
fn test_string_with_zero_byte_escape() {
assert '\x00'.bytes() == [byte(0)]
}

View File

@ -1,5 +0,0 @@
vlib/v/checker/tests/string_char_null_err.vv:2:31: error: cannot use `\0` (NULL character) in the string literal
1 | fn main() {
2 | println('Null character: \0')
| ^
3 | }

View File

@ -1,3 +0,0 @@
fn main() {
println('Null character: \0')
}

View File

@ -1204,21 +1204,6 @@ fn (mut s Scanner) ident_string() string {
if c == scanner.b_lf { if c == scanner.b_lf {
s.inc_line_number() s.inc_line_number()
} }
// Don't allow \0
if c == `0` && s.pos > 2 && prevc == scanner.backslash {
if (s.pos < s.text.len - 1 && s.text[s.pos + 1].is_digit())
|| s.count_symbol_before(s.pos - 1, scanner.backslash) % 2 == 0 {
} else if !is_cstr && !is_raw {
s.error(r'cannot use `\0` (NULL character) in the string literal')
}
}
// Don't allow \x00
if c == `0` && s.pos > 5 && s.expect('\\x0', s.pos - 3) {
if s.count_symbol_before(s.pos - 3, scanner.backslash) % 2 == 0 {
} else if !is_cstr && !is_raw {
s.error(r'cannot use `\x00` (NULL character) in the string literal')
}
}
// Escape `\x` `\u` // Escape `\x` `\u`
if backslash_count % 2 == 1 && !is_raw && !is_cstr { if backslash_count % 2 == 1 && !is_raw && !is_cstr {
// Escape `\x` // Escape `\x`