Mark
/
daisy
mirror of https://github.com/rm-dr/daisy
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate to new formattedtext & promptbuffer

pull/6/head
Mark 2023-09-21 12:03:01 -07:00
parent 7d78d0d74d
commit cb9f69948c
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.rs
View File

@ -1,5 +1,3 @@
pub mod promptbuffer;
use std::io::stdout; use std::io::stdout;
use std::io::stdin; use std::io::stdin;
use std::env; use std::env;
@ -11,11 +9,10 @@ use termion::{
color::DetectColors color::DetectColors
}; };
use promptbuffer::PromptBuffer; use daisycalc::PromptBuffer;
use daisycalc::command; use daisycalc::command;
use daisycalc::Context; use daisycalc::Context;
use daisycalc::FormattedText; use daisycalc::FormattedText;
use daisycalc::do_string; use daisycalc::do_string;
#[cfg(test)] #[cfg(test)]
@ -70,7 +67,8 @@ pub fn main() -> Result<(), std::io::Error> {
'outer: loop { 'outer: loop {
pb.write_prompt(&mut context, &mut stdout)?; let t = pb.write_prompt(&mut context);
t.write(&context, &mut stdout)?;
let stdin = stdin(); let stdin = stdin();
for c in stdin.keys() { for c in stdin.keys() {
@ -79,7 +77,10 @@ pub fn main() -> Result<(), std::io::Error> {
'\n' => { '\n' => {
// Print again without cursor, in case we pressed enter // Print again without cursor, in case we pressed enter
// while inside a substitution // while inside a substitution
pb.write_prompt_nocursor(&mut context, &mut stdout)?; let t = pb.write_prompt_nocursor(&mut context);
t.write(&context, &mut stdout)?;
let in_str = pb.enter(); let in_str = pb.enter();
FormattedText::newline(&mut stdout)?; FormattedText::newline(&mut stdout)?;
if in_str == "" { break; } if in_str == "" { break; }
@ -115,7 +116,8 @@ pub fn main() -> Result<(), std::io::Error> {
}; };
}; };
pb.write_prompt(&mut context, &mut stdout)?; let t = pb.write_prompt(&mut context);
t.write(&context, &mut stdout)?;
} }
} }