Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-07-01 06:33:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added prompt replacement

Browse Source
This commit is contained in:
Mark
2023-03-25 10:32:51 -07:00
parent 3e1fa97ce8
commit f3b86c3c7a
4 changed files with 100 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.rs
View File

@ -12,7 +12,7 @@ use crate::promptbuffer::PromptBuffer;
use crate::parser::Token;
//use crate::parser::ParserError;
use crate::parser::LineLocation;
//use crate::parser::LineLocation;
fn draw_line(
@ -54,14 +54,13 @@ fn main() -> Result<(), std::io::Error> {
'outer: loop {
let s = parser::substitute(&pb.get_contents());
draw_line(
&mut stdout,
pb.get_contents(),
if pb.get_contents().len() >= last_len
{ 0 } else {last_len - pb.get_contents().len()}
&mut stdout, &s,
if s.chars().count() >= last_len
{ 0 } else {last_len - s.chars().count()}
)?;
last_len = pb.get_contents().len();
last_len = s.chars().count();
let stdin = stdin();
for c in stdin.keys() {
@ -102,8 +101,6 @@ fn main() -> Result<(), std::io::Error> {
break;
},
'/' => { pb.add_char('÷'); },
'*' => { pb.add_char('×'); },
_ => { pb.add_char(*q); }
};
} else {
@ -121,13 +118,13 @@ fn main() -> Result<(), std::io::Error> {
};
};
let s = parser::substitute(&pb.get_contents());
draw_line(
&mut stdout,
pb.get_contents(),
if pb.get_contents().len() >= last_len
{ 0 } else {last_len - pb.get_contents().len()}
&mut stdout, &s,
if s.chars().count() >= last_len
{ 0 } else {last_len - s.chars().count()}
)?;
last_len = pb.get_contents().len();
last_len = s.chars().count();
}
}