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

Fixed pound not lexed at the end of the input

Browse Source
This commit is contained in:
Kasper 2021-07-06 06:16:43 +02:00
parent c34a21afe1
commit b435833b98
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lexer.rs
View File

@ -179,6 +179,8 @@ pub fn parse_word(word: &str, lexer: &mut Lexer) -> Result<(), String> {
"pi" => Token::Constant(Pi), "pi" => Token::Constant(Pi),
"e" => Token::Constant(E), "e" => Token::Constant(E),
"plus" => Token::Operator(Plus),
"mod" => Token::Operator(Modulo), "mod" => Token::Operator(Modulo),
"sqrt" => Token::FunctionIdentifier(Sqrt), "sqrt" => Token::FunctionIdentifier(Sqrt),
@ -352,7 +354,10 @@ pub fn parse_word(word: &str, lexer: &mut Lexer) -> Result<(), String> {
parse_token(c, lexer)?; parse_token(c, lexer)?;
return Ok(()); return Ok(());
}, },
None => return Ok(()), None => {
lexer.tokens.push(Token::Unit(Pound));
return Ok(());
},
} }
}, },
"stone" | "stones" => Token::Unit(Stone), "stone" | "stones" => Token::Unit(Stone),
@ -569,13 +574,13 @@ pub struct Lexer<'a> {
} }
/// Lex an input string and returns [`Token`]s /// Lex an input string and returns [`Token`]s
pub fn lex(input: &str, allow_trailing_operators: bool, default_degree: Unit) -> Result<Vec<Token>, String> { pub fn lex(input: &str, remove_trailing_operator: bool, default_degree: Unit) -> Result<Vec<Token>, String> {
let mut input = input.replace(",", ""); // ignore commas let mut input = input.replace(",", ""); // ignore commas
input = input.to_lowercase(); input = input.to_lowercase();
if allow_trailing_operators { if remove_trailing_operator {
match &input.chars().last().unwrap_or('x') { match &input.chars().last().unwrap_or('x') {
'+' | '-' | '*' | '/' | '^' | '(' => { '+' | '-' | '*' | '/' | '^' | '(' => {
input.pop(); input.pop();
@ -773,5 +778,6 @@ mod tests {
run_lex("50 metric tonnes", vec![numtok!(50), Token::Unit(MetricTon)]); run_lex("50 metric tonnes", vec![numtok!(50), Token::Unit(MetricTon)]);
run_lex("5432 newton metres", vec![numtok!(5432), Token::Unit(NewtonMeter)]); run_lex("5432 newton metres", vec![numtok!(5432), Token::Unit(NewtonMeter)]);
run_lex("2345 newton-meters", vec![numtok!(2345), Token::Unit(NewtonMeter)]); run_lex("2345 newton-meters", vec![numtok!(2345), Token::Unit(NewtonMeter)]);
run_lex("12 pound+", vec![numtok!(12), Token::Unit(Pound), Token::Operator(Plus)]);
} }
} }