RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00
Code Issues Activity

expr: make error messages align with GNU expr

Browse source
This commit is contained in:
ALXD 2023-11-20 14:19:20 +01:00 • committed by Sylvestre Ledru
parent e9bc1eeab5
commit d2ede92736
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/uu/expr/src/syntax_tree.rs
View file

@ -13,6 +13,7 @@
use num_bigint::BigInt; use num_bigint::BigInt;
use num_traits::Zero; use num_traits::Zero;
use onig::{Regex, RegexOptions, Syntax}; use onig::{Regex, RegexOptions, Syntax};
use uucore::display::Quotable;
use crate::tokens::Token; use crate::tokens::Token;
@ -214,7 +215,7 @@ pub fn tokens_to_ast(
assert!(op_stack.is_empty()); assert!(op_stack.is_empty());
maybe_dump_rpn(&out_stack); maybe_dump_rpn(&out_stack);
let result = ast_from_rpn(&mut out_stack); let result = ast_from_rpn(&mut out_stack, None);
if out_stack.is_empty() { if out_stack.is_empty() {
maybe_dump_ast(&result); maybe_dump_ast(&result);
result result
@ -253,9 +254,12 @@ fn maybe_dump_rpn(rpn: &TokenStack) {
} }
} }
fn ast_from_rpn(rpn: &mut TokenStack) -> Result<Box<AstNode>, String> { fn ast_from_rpn(rpn: &mut TokenStack, op_type: Option<&str>) -> Result<Box<AstNode>, String> {
match rpn.pop() { match rpn.pop() {
None => Err("syntax error (premature end of expression)".to_owned()), None => Err(match op_type {
Some(value) => format!("syntax error: unexpected argument {}", value.quote()),
None => "missing operand".to_owned(),
}),
Some((token_idx, Token::Value { value })) => Ok(AstNode::new_leaf(token_idx, &value)), Some((token_idx, Token::Value { value })) => Ok(AstNode::new_leaf(token_idx, &value)),
@ -281,7 +285,7 @@ fn maybe_ast_node(
) -> Result<Box<AstNode>, String> { ) -> Result<Box<AstNode>, String> {
let mut operands = Vec::with_capacity(arity); let mut operands = Vec::with_capacity(arity);
for _ in 0..arity { for _ in 0..arity {
let operand = ast_from_rpn(rpn)?; let operand = ast_from_rpn(rpn, Some(op_type))?;
operands.push(operand); operands.push(operand);
} }
operands.reverse(); operands.reverse();