stonewareslord/rpn_rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 6 Wiki Activity

Set cancel return type to result

Browse Source
This commit is contained in:
Austen Adler 2021-05-02 23:16:53 -04:00
parent d81fb1f45d
commit 062cd97609
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calc.rs
View File

@ -205,7 +205,8 @@ impl<'a> Calculator<'a> {
for c in value.chars() {
self.take_input(c).map_err(|e| {
self.cancel();
// Try cancelling, but if you cannot, that is okay
self.cancel().unwrap_or(());
e
})?;
}
@ -239,9 +240,15 @@ impl<'a> Calculator<'a> {
}
}
pub fn cancel(&mut self) {
pub fn cancel(&mut self) -> CalculatorResult<()> {
self.state = CalculatorState::Normal;
self.active_macros.clear();
// We died in a macro. Quit and push an end macro state
if !self.active_macros.is_empty() {
self.active_macros.clear();
// Should always be successful, but report the error if there is one
self.op(CalculatorOperation::Macro(MacroState::End))?;
}
Ok(())
}
pub fn backspace(&mut self) -> CalculatorResult<()> {
self.l.pop();

4
src/main.rs
View File

@ -268,7 +268,7 @@ fn handle_key(app: &mut App, events: &Events, key: Key) -> CalculatorResult<bool
(AppState::Help, _) => match key {
Key::Esc | Key::Char('q') => {
app.state = AppState::Calculator;
app.calculator.cancel();
app.calculator.cancel()?;
}
_ => {}
},
@ -277,7 +277,7 @@ fn handle_key(app: &mut App, events: &Events, key: Key) -> CalculatorResult<bool
| (AppState::Calculator, CalculatorState::WaitingForMacro) => match key {
Key::Esc => {
app.state = AppState::Calculator;
app.calculator.cancel();
app.calculator.cancel()?;
}
Key::Char(c) => {
app.calculator.take_input(c)?;