utilities/eva
utilities/eva
1
0
Fork 0
mirror of https://github.com/NerdyPepper/eva synced 2024-07-03 07:28:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate references to functions & constants

Browse Source
This commit is contained in:
Maximilian Bosch 2021-12-26 15:31:13 +01:00
parent acf947b608
commit 7d1db014eb
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/readline.rs
View File

@ -15,6 +15,7 @@ use regex::Regex;
use crate::error::CalcError;
use crate::eval_math_expression;
use crate::lex::{CONSTANTS, FUNCTIONS};
pub struct RLHelper {
completer: FilenameCompleter,
@ -52,20 +53,16 @@ impl Highlighter for LineHighlighter {
let op = eval_math_expression(line, prev_ans);
match op {
Ok(_) => {
let constants = ["e", "pi"];
let functions = [
"sin", "cos", "tan", "csc", "sec", "cot", "sinh", "cosh", "tanh", "ln", "log",
"sqrt", "ceil", "floor", "rad", "deg", "abs", "asin", "acos", "atan", "acsc",
"asec", "acot", "exp2", "exp"
];
let constants = CONSTANTS.keys();
let functions = FUNCTIONS.keys();
let ops = Regex::new(r"(?P<o>[\+-/\*%\^!])").unwrap();
let mut coloured: String = ops.replace_all(line, "\x1b[35m$o\x1b[0m").into();
for c in &constants {
for c in constants {
let re = Regex::new(format!("(?P<o>{})(?P<r>(\x1b\\[35m)?([\\+-/\\*%\\^! ]|$))", c).as_str()).unwrap();
coloured = re.replace_all(&coloured, "\x1b[33m$o\x1b[0m$r").into();
}
for f in &functions {
for f in functions {
let re = Regex::new(format!("(?P<o>{})(?P<r>(\\(|$))", f).as_str()).unwrap();
coloured = re.replace_all(&coloured, "\x1b[34m$o\x1b[0m$r").into();
}