aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lex.rs17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/lex.rs b/src/lex.rs
index 4bdd7b6..1c686a1 100644
--- a/src/lex.rs
+++ b/src/lex.rs
@@ -102,6 +102,7 @@ lazy_static! {
102 m.insert("asec", Function::token_from_fn("asec".into(), |x| (1./x).acos())); 102 m.insert("asec", Function::token_from_fn("asec".into(), |x| (1./x).acos()));
103 m.insert("acot", Function::token_from_fn("acot".into(), |x| (1./x).atan())); 103 m.insert("acot", Function::token_from_fn("acot".into(), |x| (1./x).atan()));
104 m.insert("exp", Function::token_from_fn("exp".into(), |x| x.exp())); 104 m.insert("exp", Function::token_from_fn("exp".into(), |x| x.exp()));
105 m.insert("exp2", Function::token_from_fn("exp2".into(), |x| x.exp2()));
105 // single arg function s can be added here 106 // single arg function s can be added here
106 m 107 m
107 }; 108 };
@@ -135,19 +136,23 @@ pub fn lexer(input: &str, prev_ans: Option<f64>) -> Result<Vec<Token>, CalcError
135 '0'..='9' | '.' => { 136 '0'..='9' | '.' => {
136 if !char_vec.is_empty() { 137 if !char_vec.is_empty() {
137 if FUNCTIONS.get(&char_vec[..]).is_some() { 138 if FUNCTIONS.get(&char_vec[..]).is_some() {
138 return Err(CalcError::Syntax(format!( 139 char_vec.push(letter);
139 "Function '{}' expected parentheses", 140 if !FUNCTIONS.get(&char_vec[..]).is_some() {
140 char_vec 141 return Err(CalcError::Syntax(format!(
141 ))); 142 "Function '{}' expected parentheses",
143 &char_vec[..char_vec.chars().count()-1]
144 )));
145 }
142 } else { 146 } else {
143 return Err(CalcError::Syntax(format!( 147 return Err(CalcError::Syntax(format!(
144 "Unexpected character '{}'", 148 "Unexpected character '{}'",
145 char_vec 149 char_vec
146 ))); 150 )));
147 } 151 }
152 } else {
153 num_vec.push(letter);
154 last_char_is_op = false;
148 } 155 }
149 num_vec.push(letter);
150 last_char_is_op = false;
151 } 156 }
152 '_' => { 157 '_' => {
153 if prev_ans.is_none() { 158 if prev_ans.is_none() {