Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

toml: simplify decode_quoted_escapes #21472

Merged
merged 3 commits into from
May 8, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
81 changes: 33 additions & 48 deletions vlib/toml/decoder/decoder.v
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,8 @@ pub fn decode_quoted_escapes(mut q ast.Quoted) ! {
mut s := scanner.new_simple_text(q.text)!
q.text = q.text.replace('\\"', '"')

for {
ch := s.next()
if ch == scanner.end_of_text {
break
}
for ch := s.next(); ch != scanner.end_of_text; ch = s.next() {
ch_byte := u8(ch)

if eat_whitespace && ch_byte.is_space() {
continue
}
Expand All @@ -102,53 +97,44 @@ pub fn decode_quoted_escapes(mut q ast.Quoted) ! {
ch_next := s.at()
ch_next_byte := u8(ch_next)

if ch_next == `\\` {
decoded_s += ch_next_byte.ascii_str()
s.next()
continue
}

if q.is_multiline {
if ch_next_byte.is_space() {
eat_whitespace = true
continue
}
}

if ch_next == `"` {
decoded_s += '"'
s.next()
continue
}

if ch_next == `n` {
decoded_s += '\n'
s.next()
continue
}

if ch_next == `t` {
decoded_s += '\t'
s.next()
continue
}

if ch_next == `b` {
decoded_s += '\b'
s.next()
continue
}

if ch_next == `r` {
decoded_s += '\r'
s.next()
continue
}

if ch_next == `f` {
decoded_s += '\f'
s.next()
continue
match rune(ch_next) {
`\\`, `"` {
decoded_s += ch_next_byte.ascii_str()
s.next()
continue
}
`n` {
decoded_s += '\n'
s.next()
continue
}
`t` {
decoded_s += '\t'
s.next()
continue
}
`b` {
decoded_s += '\b'
s.next()
continue
}
`r` {
decoded_s += '\r'
s.next()
continue
}
`f` {
decoded_s += '\f'
s.next()
continue
}
else {}
}

escape := ch_byte.ascii_str() + ch_next_byte.ascii_str()
Expand All @@ -171,7 +157,6 @@ pub fn decode_quoted_escapes(mut q ast.Quoted) ! {
if slen <= s.remaining() {
pos := s.state().pos
sequence := s.text[pos..pos + slen + 1]

decoded, unicode_val, sequence_length = decode_unicode_escape(sequence) or {
decoded_s += escape
continue
Expand Down