mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

toml: fix hex values starting with a, e or E and comments ending with crlf (#12367)

Browse Source
This commit is contained in:
Larpon
2021-11-02 18:07:27 +01:00
committed by GitHub
parent 3fdbfca202
commit 99fd84dfe4
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vlib/toml/scanner/scanner.v
View File

@@ -273,6 +273,12 @@ pub fn (s &Scanner) at() byte {
return byte(-1)
}
// at_crlf returns `true` if the scanner is at a `\r` character
// and the next character is a `\n`.
fn (s Scanner) at_crlf() bool {
return s.at() == `\r` && s.peek(1) == `\n`
}
// peek returns the character code from the input text at position + `n`.
// peek returns `-1` if it can't peek `n` characters ahead.
[direct_array_access; inline]
@@ -322,6 +328,10 @@ fn (mut s Scanner) ignore_line() ?string {
for c := s.at(); c != -1 && c != `\n`; c = s.at() {
s.next()
util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'skipping "${byte(c).ascii_str()}"')
if s.at_crlf() {
util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'letting `\\r\\n` slip through')
return s.text[start..s.pos]
}
}
return s.text[start..s.pos]
}