ztr/CPC
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix panic when input contains only whitespace and/or commas

Browse Source
This commit is contained in:
Kasper 2021-04-21 21:06:02 +02:00
parent d9a08b0b85
commit 6585366b0d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lexer.rs
View File

@ -21,10 +21,6 @@ pub const fn is_alphabetic_extended(input: &char) -> bool {
/// Lex an input string and return a [`TokenVector`] /// Lex an input string and return a [`TokenVector`]
pub fn lex(input: &str, allow_trailing_operators: bool, default_degree: Unit) -> Result<TokenVector, String> { pub fn lex(input: &str, allow_trailing_operators: bool, default_degree: Unit) -> Result<TokenVector, String> {
if input == "" {
return Err(format!("Input was empty"))
}
let mut input = input.replace(",", ""); // ignore commas let mut input = input.replace(",", ""); // ignore commas
input = input.to_lowercase(); input = input.to_lowercase();
@ -399,8 +395,6 @@ pub fn lex(input: &str, allow_trailing_operators: bool, default_degree: Unit) ->
} }
} }
} }
}, },
'.' | '0'..='9' => { '.' | '0'..='9' => {
let start_index = byte_index; let start_index = byte_index;
@ -455,6 +449,10 @@ pub fn lex(input: &str, allow_trailing_operators: bool, default_degree: Unit) ->
} }
} }
if tokens.len() == 0 {
return Err(format!("Input was empty"))
}
let mut token_index = 0; let mut token_index = 0;
loop { loop {
match tokens[token_index] { match tokens[token_index] {