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

Improve e handling

Browse Source
This commit is contained in:
Austen Adler 2021-04-26 18:11:23 -04:00
parent c1d54f8b5e
commit d18b995228
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.rs
View File

@ -326,6 +326,14 @@ fn handle_key(app: &mut App, events: &Events, key: Key) {
app.input.push(c); app.input.push(c);
} }
Key::Char(c @ 'e') | Key::Char(c @ '.') => { Key::Char(c @ 'e') | Key::Char(c @ '.') => {
if app.input.is_empty() {
if let Ok(x) = app.calculator.pop() {
app.input = x.to_string();
} else {
return;
}
}
if !app.input.contains(c) { if !app.input.contains(c) {
app.input.push(c); app.input.push(c);
} }
@ -333,9 +341,16 @@ fn handle_key(app: &mut App, events: &Events, key: Key) {
Key::Char('\n') | Key::Char(' ') => { Key::Char('\n') | Key::Char(' ') => {
if app.input.is_empty() { if app.input.is_empty() {
calc_operation(app, '\n'); calc_operation(app, '\n');
} else if let Ok(f) = app.input.parse::<f64>() { } else {
if app.calculator.push(f).is_ok() { let mut tmp_input = app.input.clone();
app.input.clear(); if tmp_input.ends_with('e') {
let tmp_input = tmp_input.push('0');
}
if let Ok(f) = tmp_input.parse::<f64>() {
if app.calculator.push(f).is_ok() {
app.input.clear();
}
} }
} }
} }