mirror of
https://github.com/nushell/nushell.git
synced 2024-11-23 00:43:33 +01:00
Add starts with operator (#5061)
* add starts_with operator * added a test
This commit is contained in:
parent
a088081695
commit
2cb815b7b4
@ -376,6 +376,19 @@ pub(super) fn compute_series_single_value(
|
|||||||
rhs_span: right.span()?,
|
rhs_span: right.span()?,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
Operator::StartsWith => match &right {
|
||||||
|
Value::String { val, .. } => {
|
||||||
|
let starts_with_pattern = format!("^{}", val);
|
||||||
|
contains_series_pat(&lhs, &starts_with_pattern, lhs_span)
|
||||||
|
}
|
||||||
|
_ => Err(ShellError::OperatorMismatch {
|
||||||
|
op_span: operator.span,
|
||||||
|
lhs_ty: left.get_type(),
|
||||||
|
lhs_span: left.span()?,
|
||||||
|
rhs_ty: right.get_type(),
|
||||||
|
rhs_span: right.span()?,
|
||||||
|
}),
|
||||||
|
},
|
||||||
_ => Err(ShellError::OperatorMismatch {
|
_ => Err(ShellError::OperatorMismatch {
|
||||||
op_span: operator.span,
|
op_span: operator.span,
|
||||||
lhs_ty: left.get_type(),
|
lhs_ty: left.get_type(),
|
||||||
|
@ -411,6 +411,10 @@ pub fn eval_expression(
|
|||||||
let rhs = eval_expression(engine_state, stack, rhs)?;
|
let rhs = eval_expression(engine_state, stack, rhs)?;
|
||||||
lhs.pow(op_span, &rhs)
|
lhs.pow(op_span, &rhs)
|
||||||
}
|
}
|
||||||
|
Operator::StartsWith => {
|
||||||
|
let rhs = eval_expression(engine_state, stack, rhs)?;
|
||||||
|
lhs.starts_with(op_span, &rhs)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Expr::Subexpression(block_id) => {
|
Expr::Subexpression(block_id) => {
|
||||||
|
@ -3940,6 +3940,7 @@ pub fn parse_operator(
|
|||||||
b">" => Operator::GreaterThan,
|
b">" => Operator::GreaterThan,
|
||||||
b">=" => Operator::GreaterThanOrEqual,
|
b">=" => Operator::GreaterThanOrEqual,
|
||||||
b"=~" => Operator::Contains,
|
b"=~" => Operator::Contains,
|
||||||
|
b"=^" => Operator::StartsWith,
|
||||||
b"!~" => Operator::NotContains,
|
b"!~" => Operator::NotContains,
|
||||||
b"+" => Operator::Plus,
|
b"+" => Operator::Plus,
|
||||||
b"-" => Operator::Minus,
|
b"-" => Operator::Minus,
|
||||||
|
@ -319,6 +319,24 @@ pub fn math_result_type(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Operator::StartsWith => match (&lhs.ty, &rhs.ty) {
|
||||||
|
(Type::String, Type::String) => (Type::Bool, None),
|
||||||
|
(Type::Unknown, _) => (Type::Bool, None),
|
||||||
|
(_, Type::Unknown) => (Type::Bool, None),
|
||||||
|
_ => {
|
||||||
|
*op = Expression::garbage(op.span);
|
||||||
|
(
|
||||||
|
Type::Unknown,
|
||||||
|
Some(ParseError::UnsupportedOperation(
|
||||||
|
op.span,
|
||||||
|
lhs.span,
|
||||||
|
lhs.ty.clone(),
|
||||||
|
rhs.span,
|
||||||
|
rhs.ty.clone(),
|
||||||
|
)),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
},
|
||||||
Operator::In => match (&lhs.ty, &rhs.ty) {
|
Operator::In => match (&lhs.ty, &rhs.ty) {
|
||||||
(t, Type::List(u)) if type_compatible(t, u) => (Type::Bool, None),
|
(t, Type::List(u)) if type_compatible(t, u) => (Type::Bool, None),
|
||||||
(Type::Int | Type::Float, Type::Range) => (Type::Bool, None),
|
(Type::Int | Type::Float, Type::Range) => (Type::Bool, None),
|
||||||
|
@ -34,6 +34,7 @@ impl Expression {
|
|||||||
Operator::Plus | Operator::Minus => 90,
|
Operator::Plus | Operator::Minus => 90,
|
||||||
Operator::NotContains
|
Operator::NotContains
|
||||||
| Operator::Contains
|
| Operator::Contains
|
||||||
|
| Operator::StartsWith
|
||||||
| Operator::LessThan
|
| Operator::LessThan
|
||||||
| Operator::LessThanOrEqual
|
| Operator::LessThanOrEqual
|
||||||
| Operator::GreaterThan
|
| Operator::GreaterThan
|
||||||
|
@ -23,6 +23,7 @@ pub enum Operator {
|
|||||||
And,
|
And,
|
||||||
Or,
|
Or,
|
||||||
Pow,
|
Pow,
|
||||||
|
StartsWith,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Display for Operator {
|
impl Display for Operator {
|
||||||
@ -46,6 +47,7 @@ impl Display for Operator {
|
|||||||
Operator::Pow => write!(f, "**"),
|
Operator::Pow => write!(f, "**"),
|
||||||
Operator::LessThanOrEqual => write!(f, "<="),
|
Operator::LessThanOrEqual => write!(f, "<="),
|
||||||
Operator::GreaterThanOrEqual => write!(f, ">="),
|
Operator::GreaterThanOrEqual => write!(f, ">="),
|
||||||
|
Operator::StartsWith => write!(f, "=^"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2031,6 +2031,27 @@ impl Value {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn starts_with(&self, op: Span, rhs: &Value) -> Result<Value, ShellError> {
|
||||||
|
let span = span(&[self.span()?, rhs.span()?]);
|
||||||
|
|
||||||
|
match (self, rhs) {
|
||||||
|
(Value::String { val: lhs, .. }, Value::String { val: rhs, .. }) => Ok(Value::Bool {
|
||||||
|
val: lhs.starts_with(rhs),
|
||||||
|
span,
|
||||||
|
}),
|
||||||
|
(Value::CustomValue { val: lhs, span }, rhs) => {
|
||||||
|
lhs.operation(*span, Operator::StartsWith, op, rhs)
|
||||||
|
}
|
||||||
|
_ => Err(ShellError::OperatorMismatch {
|
||||||
|
op_span: op,
|
||||||
|
lhs_ty: self.get_type(),
|
||||||
|
lhs_span: self.span()?,
|
||||||
|
rhs_ty: rhs.get_type(),
|
||||||
|
rhs_span: rhs.span()?,
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn not_contains(&self, op: Span, rhs: &Value) -> Result<Value, ShellError> {
|
pub fn not_contains(&self, op: Span, rhs: &Value) -> Result<Value, ShellError> {
|
||||||
let span = span(&[self.span()?, rhs.span()?]);
|
let span = span(&[self.span()?, rhs.span()?]);
|
||||||
|
|
||||||
|
@ -315,6 +315,14 @@ fn capture_row_condition() -> TestResult {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn starts_with_operator_succeeds() -> TestResult {
|
||||||
|
run_test(
|
||||||
|
r#"[Moe Larry Curly] | where $it =^ L | str collect"#,
|
||||||
|
"Larry",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn proper_missing_param() -> TestResult {
|
fn proper_missing_param() -> TestResult {
|
||||||
fail_test(r#"def foo [x y z w] { }; foo a b c"#, "missing w")
|
fail_test(r#"def foo [x y z w] { }; foo a b c"#, "missing w")
|
||||||
|
Loading…
Reference in New Issue
Block a user