Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deps.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"kvspace": "v0.2.2",
"kvspace-c": "v0.2.2",
"kvspace-durable": "v0.2.2",
"kvspace": "v0.2.3",
"kvspace-c": "v0.2.3",
"kvspace-durable": "v0.2.3",
"blockmalloc": "v0.1.4",
"slotsboxmalloc": "v0.1.4"
}
28 changes: 25 additions & 3 deletions layout/src/scanner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,16 @@ fn single_char_token(c: u8) -> Option<Kind> {
})
}

fn escaped_byte(c: u8) -> u8 {
match c {
b'n' => b'\n',
b't' => b'\t',
b'r' => b'\r',
b'0' => 0,
other => other,
}
}

fn scan_quoted(src: &[u8], mut i: usize, quote: u8) -> (String, usize) {
i += 1;
let mut b: Vec<u8> = Vec::new();
Expand All @@ -153,7 +163,7 @@ fn scan_quoted(src: &[u8], mut i: usize, quote: u8) -> (String, usize) {
if c == b'\\' {
i += 1;
if i < src.len() {
b.push(src[i]);
b.push(escaped_byte(src[i]));
i += 1;
}
continue;
Expand All @@ -177,7 +187,7 @@ fn scan_triple_quoted(src: &[u8], mut i: usize) -> (String, usize) {
if c == b'\\' {
i += 1;
if i < src.len() {
b.push(src[i]);
b.push(escaped_byte(src[i]));
i += 1;
}
continue;
Expand Down Expand Up @@ -401,9 +411,21 @@ pub fn scan(src: &str) -> Vec<Token> {
let start = i;
i += 1;
while i < src.len() {
// ·(U+00B7)在绝对路径里是路径字符,不是成员分隔符
// ·(U+00B7)与 .(释放给小数 key)是路径字符;· 后的坐标段 [0,1] 是成员链。
if src[i] == 0xC2 && i + 1 < src.len() && src[i + 1] == 0xB7 {
i += 2;
if i < src.len() && src[i] == b'[' {
while i < src.len() && src[i] != b']' {
i += 1;
}
if i < src.len() {
i += 1; // 跳过 ]
}
}
continue;
}
if src[i] == b'.' {
i += 1;
continue;
}
if is_token_delim(src[i]) {
Expand Down
Loading