holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change string contains operators to regex (#5117)

Browse Source
This commit is contained in:
Reilly Wood
2022-04-06 23:23:14 -07:00
committed by GitHub
parent 888369022f
commit b2c52b51b7
11 changed files with 130 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-parser/src/parser.rs
View File

@ -3967,9 +3967,9 @@ pub fn parse_operator(
b"<=" => Operator::LessThanOrEqual,
b">" => Operator::GreaterThan,
b">=" => Operator::GreaterThanOrEqual,
b"=~" => Operator::Contains,
b"=~" => Operator::RegexMatch,
b"=^" => Operator::StartsWith,
b"!~" => Operator::NotContains,
b"!~" => Operator::NotRegexMatch,
b"+" => Operator::Plus,
b"-" => Operator::Minus,
b"*" => Operator::Multiply,

4
crates/nu-parser/src/type_check.rs
View File

@ -283,7 +283,7 @@ pub fn math_result_type(
},
Operator::Equal => (Type::Bool, None),
Operator::NotEqual => (Type::Bool, None),
Operator::Contains => match (&lhs.ty, &rhs.ty) {
Operator::RegexMatch => match (&lhs.ty, &rhs.ty) {
(Type::String, Type::String) => (Type::Bool, None),
(Type::Any, _) => (Type::Bool, None),
(_, Type::Any) => (Type::Bool, None),
@ -301,7 +301,7 @@ pub fn math_result_type(
)
}
},
Operator::NotContains => match (&lhs.ty, &rhs.ty) {
Operator::NotRegexMatch => match (&lhs.ty, &rhs.ty) {
(Type::String, Type::String) => (Type::Bool, None),
(Type::Any, _) => (Type::Bool, None),
(_, Type::Any) => (Type::Bool, None),