mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-08-02 14:07:46 +00:00
expr: Change error messages when missing closing parenthesis
This situation now has two errors - one if we parse a character that isn't a closing parenthesis, and the other if we don't parse anything.
This commit is contained in:
parent
b6f6d93a90
commit
aa010b71b8
2 changed files with 32 additions and 6 deletions
|
@ -34,6 +34,7 @@ pub enum ExprError {
|
|||
DivisionByZero,
|
||||
InvalidRegexExpression,
|
||||
ExpectedClosingBraceAfter(String),
|
||||
ExpectedClosingBraceInsteadOf(String),
|
||||
}
|
||||
|
||||
impl Display for ExprError {
|
||||
|
@ -50,7 +51,10 @@ impl Display for ExprError {
|
|||
Self::DivisionByZero => write!(f, "division by zero"),
|
||||
Self::InvalidRegexExpression => write!(f, "Invalid regex expression"),
|
||||
Self::ExpectedClosingBraceAfter(s) => {
|
||||
write!(f, "expected ')' after {}", s.quote())
|
||||
write!(f, "syntax error: expecting ')' after {}", s.quote())
|
||||
}
|
||||
Self::ExpectedClosingBraceInsteadOf(s) => {
|
||||
write!(f, "syntax error: expecting ')' instead of {}", s.quote())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -442,13 +442,21 @@ impl<'a> Parser<'a> {
|
|||
},
|
||||
"(" => {
|
||||
let s = self.parse_expression()?;
|
||||
let close_paren = self.next()?;
|
||||
if close_paren != ")" {
|
||||
match self.next() {
|
||||
Ok(")") => {}
|
||||
// Since we have parsed at least a '(', there will be a token
|
||||
// at `self.index - 1`. So this indexing won't panic.
|
||||
return Err(ExprError::ExpectedClosingBraceAfter(
|
||||
self.input[self.index - 1].into(),
|
||||
));
|
||||
Ok(_) => {
|
||||
return Err(ExprError::ExpectedClosingBraceInsteadOf(
|
||||
self.input[self.index - 1].into(),
|
||||
));
|
||||
}
|
||||
Err(ExprError::MissingArgument(_)) => {
|
||||
return Err(ExprError::ExpectedClosingBraceAfter(
|
||||
self.input[self.index - 1].into(),
|
||||
));
|
||||
}
|
||||
Err(e) => return Err(e),
|
||||
}
|
||||
s
|
||||
}
|
||||
|
@ -484,6 +492,8 @@ pub fn is_truthy(s: &NumOrStr) -> bool {
|
|||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use crate::ExprError;
|
||||
|
||||
use super::{AstNode, BinOp, NumericOp, RelationOp, StringOp};
|
||||
|
||||
impl From<&str> for AstNode {
|
||||
|
@ -587,4 +597,16 @@ mod test {
|
|||
)),
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn missing_closing_parenthesis() {
|
||||
assert_eq!(
|
||||
AstNode::parse(&["(", "42"]),
|
||||
Err(ExprError::ExpectedClosingBraceAfter("42".to_string()))
|
||||
);
|
||||
assert_eq!(
|
||||
AstNode::parse(&["(", "42", "a"]),
|
||||
Err(ExprError::ExpectedClosingBraceInsteadOf("a".to_string()))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue