Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-08-02 09:44:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added define operator

Browse Source
This commit is contained in:
Mark
2023-06-14 20:18:28 -07:00
parent b6343db0d6
commit 6bd7043971
10 changed files with 124 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/entry/unix/unix.rs
View File

@ -24,7 +24,7 @@ use crate::context::Context;
fn do_expression(
stdout: &mut RawTerminal<std::io::Stdout>,
s: &String,
context: &Context
context: &mut Context
) -> Result<parser::Token, ()> {
#[cfg(debug_assertions)]
RawTerminal::suspend_raw_mode(&stdout).unwrap();
@ -118,6 +118,16 @@ fn do_expression(
style::Reset,
color::Fg(color::Reset),
).unwrap();
},
Err(EvalError::BadDefineName) => {
write!(
stdout, "\n {}{}Evaluation Error: {}Invalid variable name{}\r\n\n",
style::Bold,
color::Fg(color::Red),
style::Reset,
color::Fg(color::Reset),
).unwrap();
}
}
}
@ -167,7 +177,7 @@ pub fn main() -> Result<(), std::io::Error> {
} else if command::is_command(&in_str) {
command::do_command(&mut stdout, &in_str)?;
} else {
let r = do_expression(&mut stdout, &in_str, &context);
let r = do_expression(&mut stdout, &in_str, &mut context);
if let Ok(t) = r { context.push_hist(t); }
}