rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add better no op detection in char_reader.rs (#2297)

Browse Source
This commit is contained in:
Mark
2024-01-16 21:50:53 -07:00
parent 29ced36a79
commit e3aa85e2a2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/parser/char_reader.rs
View File

@@ -191,7 +191,7 @@ impl<R: Read> CharRead for CharReader<R> {
return Some(Err(bad_bytes_error(buf)));
} else if self.pos >= self.buf.len() {
return None;
} else if self.buf.len() - self.pos >= 4 {
} else if self.buf.len() - self.pos >= 4 && self.pos < e.valid_up_to() {
return match str::from_utf8(&self.buf[self.pos..e.valid_up_to()]) {
Ok(s) => {
let mut chars = s.chars();
@@ -218,6 +218,11 @@ impl<R: Read> CharRead for CharReader<R> {
self.buf.truncate(buf_len - self.pos);
let buf_len = self.buf.len();
self.pos = 0;
if buf_len >= 4 {
continue;
}
let mut word = [0u8; 4];
let word_slice = &mut word[buf_len..4];
@@ -229,8 +234,6 @@ impl<R: Read> CharRead for CharReader<R> {
self.buf.extend_from_slice(&word_slice[0..nread]);
}
}
self.pos = 0;
}
} else {
return None;