From c0d736e93e2dc5fb36e8856919940821f6786936 Mon Sep 17 00:00:00 2001 From: dd di cesare Date: Wed, 26 Jul 2023 12:23:14 +0200 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=C2=A0Adding=20"/"=20and=20"-"=20chars?= =?UTF-8?q?=20for=20the=20new=20condition=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- limitador/src/limit.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/limitador/src/limit.rs b/limitador/src/limit.rs index d541007d..51d24c9d 100644 --- a/limitador/src/limit.rs +++ b/limitador/src/limit.rs @@ -613,7 +613,7 @@ mod conditions { fn valid_id_char(&mut self) -> bool { let char = self.input[self.pos]; - char.is_alphanumeric() || char == '.' || char == '_' + char.is_alphanumeric() || char == '.' || char == '_' || char == '-' || char == '/' } fn scan_string(&mut self, until: char) -> Result { From b7d19c3a0f092ca8740f7d012a7678ef629627ae Mon Sep 17 00:00:00 2001 From: dd di cesare Date: Wed, 26 Jul 2023 12:37:12 +0200 Subject: [PATCH 2/2] [test] Modifying test case to match new conditions --- limitador/src/limit.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/limitador/src/limit.rs b/limitador/src/limit.rs index 51d24c9d..2d093318 100644 --- a/limitador/src/limit.rs +++ b/limitador/src/limit.rs @@ -777,14 +777,14 @@ mod conditions { #[test] fn test_charset() { - let tokens = - Scanner::scan(" 変数 == ' 💖 '".to_owned()).expect("Should parse alright!"); + let tokens = Scanner::scan(" love.en-US/愛.jp == ' 💖 '".to_owned()) + .expect("Should parse alright!"); assert_eq!(tokens.len(), 3); assert_eq!( tokens[0], Token { token_type: TokenType::Identifier, - literal: Some(Identifier("変数".to_owned())), + literal: Some(Identifier("love.en-US/愛.jp".to_owned())), pos: 2, } ); @@ -793,7 +793,7 @@ mod conditions { Token { token_type: TokenType::EqualEqual, literal: None, - pos: 5, + pos: 18, } ); assert_eq!( @@ -801,7 +801,7 @@ mod conditions { Token { token_type: TokenType::String, literal: Some(Literal::String(" 💖 ".to_owned())), - pos: 8, + pos: 21, } ); }