j/Conlang
1
1
Fork 0
Code Issues 5 Pull Requests Packages Projects 2 Releases Wiki Activity

repline: stop clobbering the input buffer every time you can't figure out an escape sequence

Browse Source
This commit is contained in:
John 2025-10-22 13:11:41 -04:00
parent 35edfdbb17
commit 4a2cd9303e
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
repline/src/repline.rs
View File

@ -14,6 +14,7 @@ use std::{
pub struct Repline<'a, R: Read> { pub struct Repline<'a, R: Read> {
input: Chars<Flatten<Result<u8>, Bytes<R>>>, input: Chars<Flatten<Result<u8>, Bytes<R>>>,
history_cap: usize,
history: VecDeque<String>, // previous lines history: VecDeque<String>, // previous lines
hindex: usize, // current index into the history buffer hindex: usize, // current index into the history buffer
@ -31,6 +32,7 @@ impl<'a, R: Read> Repline<'a, R> {
pub fn with_input(input: R, color: &'a str, begin: &'a str, again: &'a str) -> Self { pub fn with_input(input: R, color: &'a str, begin: &'a str, again: &'a str) -> Self {
Self { Self {
input: Chars(Flatten(input.bytes())), input: Chars(Flatten(input.bytes())),
history_cap: 200,
history: Default::default(), history: Default::default(),
hindex: 0, hindex: 0,
ed: Editor::new(color, begin, again), ed: Editor::new(color, begin, again),
@ -39,6 +41,7 @@ impl<'a, R: Read> Repline<'a, R> {
pub fn swap_input<S: Read>(self, new_input: S) -> Repline<'a, S> { pub fn swap_input<S: Read>(self, new_input: S) -> Repline<'a, S> {
Repline { Repline {
input: Chars(Flatten(new_input.bytes())), input: Chars(Flatten(new_input.bytes())),
history_cap: self.history_cap,
history: self.history, history: self.history,
hindex: self.hindex, hindex: self.hindex,
ed: self.ed, ed: self.ed,
@ -108,7 +111,10 @@ impl<'a, R: Read> Repline<'a, R> {
} }
c if c.is_ascii_control() => { c if c.is_ascii_control() => {
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
self.ed.extend(c.escape_debug(), stdout)?; self.print_err(
stdout,
format_args!("\t\x1b[30mUnhandled ASCII C0 {c:?}\x1b[0m"),
)?;
} }
} }
c => { c => {
@ -133,9 +139,14 @@ impl<'a, R: Read> Repline<'a, R> {
/// Handle ANSI Escape /// Handle ANSI Escape
fn escape<W: Write>(&mut self, w: &mut W) -> ReplResult<()> { fn escape<W: Write>(&mut self, w: &mut W) -> ReplResult<()> {
match self.input.next().ok_or(Error::EndOfInput)?? { match self.input.next().ok_or(Error::EndOfInput)?? {
'\r' => Err(Error::EndOfInput)?,
'[' => self.csi(w)?, '[' => self.csi(w)?,
'O' => todo!("Process alternate character mode"), 'O' => todo!("Process alternate character mode"),
other => self.ed.extend(other.escape_debug(), w)?, other => {
if cfg!(debug_assertions) {
self.print_err(w, format_args!("\t\x1b[30mANSI escape: {other:?}\x1b[0m"))?;
}
}
} }
Ok(()) Ok(())
} }
@ -173,7 +184,10 @@ impl<'a, R: Read> Repline<'a, R> {
} }
other => { other => {
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
self.print_err(w, other.escape_debug())?; self.print_err(
w,
format_args!("\t\x1b[30mUnhandled control sequence: {other:?}\x1b[0m"),
)?;
} }
} }
} }
@ -203,7 +217,7 @@ impl<'a, R: Read> Repline<'a, R> {
.expect("should have just found this"); .expect("should have just found this");
}; };
self.history.push_back(buf); self.history.push_back(buf);
while self.history.len() > 20 { while self.history.len() > self.history_cap {
self.history.pop_front(); self.history.pop_front();
} }
} }