simplify some code

This commit is contained in:
Simon Gardling 2022-05-03 13:09:58 -04:00
parent 13a47ec30b
commit 6ca535a5e7

View File

@ -54,22 +54,24 @@ fn split_function_chars(chars: &[char]) -> Vec<String> {
let mut prev_char: BoolSlice = BoolSlice::default(); let mut prev_char: BoolSlice = BoolSlice::default();
for c in chars { for c in chars {
let mut curr_c = BoolSlice { let mut curr_c = {
let isnumber = is_number(c);
let isvariable = is_variable(c);
BoolSlice {
closing_parens: c == &')', closing_parens: c == &')',
number: is_number(c), number: isnumber,
letter: is_letter(c), letter: is_letter(c),
variable: is_variable(c), variable: isvariable,
masked_num: if is_number(c) { masked_num: match isnumber {
prev_char.masked_num true => prev_char.masked_num,
} else { false => false,
false
}, },
masked_var: if is_variable(c) { masked_var: match isvariable {
prev_char.masked_var true => prev_char.masked_var,
} else { false => false,
false
}, },
exists: true, exists: true,
}
}; };
let buffer_string = buffer.iter().collect::<String>(); let buffer_string = buffer.iter().collect::<String>();