Skip to content

Commit

Permalink
Add support for != in conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexsnaps
alexsnaps committed Aug 31, 2022
1 parent a3dbdef commit c060999
Showing 1 changed file with 52 additions and 15 deletions.
67 changes: 52 additions & 15 deletions limitador/src/limit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,24 @@ impl TryFrom<String> for Condition {
&tokens[1].token_type,
&tokens[2].token_type,
) {
(TokenType::Identifier, TokenType::EqualEqual, TokenType::String) => {
(
TokenType::Identifier,
TokenType::EqualEqual | TokenType::NotEqual,
TokenType::String,
) => {
if let (
Some(Literal::Identifier(var_name)),
Some(Literal::String(operand)),
) = (&tokens[0].literal, &tokens[2].literal)
{
let predicate = match &tokens[1].token_type {
TokenType::EqualEqual => Predicate::Equal,
TokenType::NotEqual => Predicate::NotEqual,
_ => unreachable!(),
};
Ok(Condition {
var_name: var_name.clone(),
predicate: Predicate::EQUAL,
predicate,
operand: operand.clone(),
})
} else {
Expand All @@ -131,15 +140,24 @@ impl TryFrom<String> for Condition {
)
}
}
(TokenType::String, TokenType::EqualEqual, TokenType::Identifier) => {
(
TokenType::String,
TokenType::EqualEqual | TokenType::NotEqual,
TokenType::Identifier,
) => {
if let (
Some(Literal::String(operand)),
Some(Literal::Identifier(var_name)),
) = (&tokens[0].literal, &tokens[2].literal)
{
let predicate = match &tokens[1].token_type {
TokenType::EqualEqual => Predicate::Equal,
TokenType::NotEqual => Predicate::NotEqual,
_ => unreachable!(),
};
Ok(Condition {
var_name: var_name.clone(),
predicate: Predicate::EQUAL,
predicate,
operand: operand.clone(),
})
} else {
Expand All @@ -159,7 +177,7 @@ impl TryFrom<String> for Condition {
deprecated::deprecated_syntax_used();
Ok(Condition {
var_name: var_name.clone(),
predicate: Predicate::EQUAL,
predicate: Predicate::Equal,
operand: operand.clone(),
})
} else {
Expand All @@ -179,7 +197,7 @@ impl TryFrom<String> for Condition {
deprecated::deprecated_syntax_used();
Ok(Condition {
var_name: var_name.clone(),
predicate: Predicate::EQUAL,
predicate: Predicate::Equal,
operand: operand.to_string(),
})
} else {
Expand All @@ -193,7 +211,7 @@ impl TryFrom<String> for Condition {
let faulty = match (t1, t2) {
(
TokenType::Identifier | TokenType::String,
TokenType::EqualEqual,
TokenType::EqualEqual | TokenType::NotEqual,
) => 2,
(TokenType::Identifier | TokenType::String, _) => 1,
(_, _) => 0,
Expand Down Expand Up @@ -248,21 +266,24 @@ impl From<Condition> for String {

#[derive(PartialEq, Eq, Debug, Clone, Hash)]
pub enum Predicate {
EQUAL,
Equal,
NotEqual,
}

impl Predicate {
fn test(&self, lhs: &str, rhs: &str) -> bool {
match self {
Predicate::EQUAL => lhs == rhs,
Predicate::Equal => lhs == rhs,
Predicate::NotEqual => lhs != rhs,
}
}
}

impl From<Predicate> for String {
fn from(op: Predicate) -> Self {
match op {
Predicate::EQUAL => "==".to_string(),
Predicate::Equal => "==".to_string(),
Predicate::NotEqual => "!=".to_string(),
}
}
}
Expand Down Expand Up @@ -456,6 +477,7 @@ mod conditions {
pub enum TokenType {
// Predicates
EqualEqual,
NotEqual,

//Literals
Identifier,
Expand Down Expand Up @@ -491,6 +513,7 @@ mod conditions {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
match self.token_type {
TokenType::EqualEqual => write!(f, "Equality (==)"),
TokenType::NotEqual => write!(f, "Unequal (!=)"),
TokenType::Identifier => {
write!(f, "Identifier: {}", self.literal.as_ref().unwrap())
}
Expand Down Expand Up @@ -548,6 +571,20 @@ mod conditions {
})
}
}
'!' => {
if self.next_matches('=') {
Ok(Some(Token {
token_type: TokenType::NotEqual,
literal: None,
pos: self.pos - 1,
}))
} else {
Err(SyntaxError {
pos: self.pos,
error: ErrorType::InvalidCharacter(self.input[self.pos - 1]),
})
}
}
'"' | '\'' => self.scan_string(character).map(Some),
' ' | '\n' | '\r' | '\t' => Ok(None),
_ => {
Expand Down Expand Up @@ -911,7 +948,7 @@ mod tests {
result,
Condition {
var_name: "x".to_string(),
predicate: Predicate::EQUAL,
predicate: Predicate::Equal,
operand: "5".to_string(),
}
);
Expand All @@ -922,7 +959,7 @@ mod tests {
result,
Condition {
var_name: "foobar".to_string(),
predicate: Predicate::EQUAL,
predicate: Predicate::Equal,
operand: "ok".to_string(),
}
);
Expand All @@ -933,7 +970,7 @@ mod tests {
result,
Condition {
var_name: "foobar".to_string(),
predicate: Predicate::EQUAL,
predicate: Predicate::Equal,
operand: "ok".to_string(),
}
);
Expand All @@ -954,7 +991,7 @@ mod tests {
.expect("should fail parsing");
assert_eq!(
result.to_string(),
"SyntaxError: Invalid character `!` at offset 3 of condition \"x != 5 && x > 12\""
"SyntaxError: Invalid character `&` at offset 8 of condition \"x != 5 && x > 12\""
.to_string()
);
}
Expand All @@ -963,7 +1000,7 @@ mod tests {
fn condition_serialization() {
let condition = Condition {
var_name: "foobar".to_string(),
predicate: Predicate::EQUAL,
predicate: Predicate::Equal,
operand: "ok".to_string(),
};
let result = serde_json::to_string(&condition).expect("Should serialize");
Expand Down

0 comments on commit c060999

Please sign in to comment.