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

Merge pull request #3316 from josd/master

Browse Source 
Improve CharReader buffering
This commit is contained in:
Mark Thom
2026-05-22 22:52:27 -06:00
committed by GitHub
parent 3faa838ee2 b2dad66270
commit 5a1423d0f0
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/parser/char_reader.rs
View File

@@ -110,10 +110,10 @@ impl<R: Read> CharReader<R> {
if self.pos >= self.buf.len() { if self.pos >= self.buf.len() {
self.buf.clear(); self.buf.clear();
let mut word = [0u8; std::mem::size_of::<char>()]; let mut chunk = [0u8; 8 * 1024];
let nread = self.inner.read(&mut word)?; let nread = self.inner.read(&mut chunk)?;
self.buf.extend_from_slice(&word[..nread]); self.buf.extend_from_slice(&chunk[..nread]);
self.pos = 0; self.pos = 0;
} }
@@ -234,19 +234,17 @@ impl<R: Read> CharRead for CharReader<R> {
#[inline(always)] #[inline(always)]
fn put_back_char(&mut self, c: char) { fn put_back_char(&mut self, c: char) {
let src_len = self.buf.len() - self.pos;
debug_assert!(src_len <= self.buf.capacity());
let c_len = c.len_utf8(); let c_len = c.len_utf8();
let mut shifted_slice = [0u8; 32];
shifted_slice[0..src_len].copy_from_slice(&self.buf[self.pos..self.buf.len()]); let mut shifted_slice = SmallVec::<[u8; 32]>::new();
shifted_slice.extend_from_slice(&self.buf[self.pos..]);
self.buf.clear();
self.buf.resize(c_len, 0); self.buf.resize(c_len, 0);
self.buf.extend_from_slice(&shifted_slice[0..src_len]); c.encode_utf8(&mut self.buf[..c_len]);
self.pos = 0;
c.encode_utf8(&mut self.buf[0..c_len]); self.buf.extend_from_slice(&shifted_slice);
self.pos = 0;
} }
#[inline(always)] #[inline(always)]