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 = {
closing_parens: c == &')', let isnumber = is_number(c);
number: is_number(c), let isvariable = is_variable(c);
letter: is_letter(c), BoolSlice {
variable: is_variable(c), closing_parens: c == &')',
masked_num: if is_number(c) { number: isnumber,
prev_char.masked_num letter: is_letter(c),
} else { variable: isvariable,
false masked_num: match isnumber {
}, true => prev_char.masked_num,
masked_var: if is_variable(c) { false => false,
prev_char.masked_var },
} else { masked_var: match isvariable {
false true => prev_char.masked_var,
}, false => false,
exists: true, },
exists: true,
}
}; };
let buffer_string = buffer.iter().collect::<String>(); let buffer_string = buffer.iter().collect::<String>();