Regular-Expresso Changeset

Changeset - 3cdbf505e6f8

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Laman - 11 months ago 2024-06-19 23:47:58

replaced the Token trait with a Token enum

2 files changed with 61 insertions and 25 deletions:

src/regexp.rs

src/regexp/token.rs

0 comments (0 inline, 0 general)

src/regexp.rs

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet} @@
 mod token;
 pub use token::ParsingError;
-use token::{Token, parse};
 use token::parse;
 const START: usize = usize::MAX;

src/regexp/token.rs

➞

Show inline comments

@@ @@ -27,30 +27,30 @@ impl fmt::Display for ParsingError { @@
+	}
+}
 pub trait Token {
 	fn is_skippable(&self) -> bool {false}
 	fn list_first(&self) -> Vec<usize>;
 	fn list_last(&self) -> Vec<usize>;
 	fn list_neighbours(&self) -> Vec<(usize, usize)>;
+}
 pub struct Symbol {
 	position: usize
+}
 pub struct Asterisk {
-	content: Box<dyn Token>
 	content: Box<Token>
+}
 pub struct Plus {
-	content: Box<dyn Token>
 	content: Box<Token>
+}
 pub struct Chain {
-	content: Vec<Box<dyn Token>>
 	content: Vec<Box<Token>>
+}
 impl Token for Symbol {
 pub enum Token {
 	Symbol(Symbol),
 	Asterisk(Asterisk),
 	Plus(Plus),
 	Chain(Chain)
+}
 impl Symbol {
 	fn list_first(&self) -> Vec<usize> {
 		return vec![self.position];
+	}
@@ @@ -64,9 +64,7 @@ impl Token for Symbol { @@
+	}
+}
 impl Token for Asterisk {
 	fn is_skippable(&self) -> bool {true}
 impl Asterisk {
 	fn list_first(&self) -> Vec<usize> {
 		return self.content.list_first();
+	}
@@ @@ -88,7 +86,7 @@ impl Token for Asterisk { @@
+	}
+}
-impl Token for Plus {
 impl Plus {
 	fn list_first(&self) -> Vec<usize> {
 		return self.content.list_first();
+	}
@@ @@ -110,7 +108,7 @@ impl Token for Plus { @@
+	}
+}
-impl Token for Chain {
 impl Chain {
 	fn is_skippable(&self) -> bool {
 		return self.content.iter().all(|x| x.is_skippable());
+	}
@@ @@ -137,7 +135,7 @@ impl Token for Chain { @@
 	fn list_neighbours(&self) -> Vec<(usize, usize)> {
 		let mut res = Vec::new();
-		let mut previous: Vec<&Box<dyn Token>> = Vec::new();
 		let mut previous: Vec<&Box<Token>> = Vec::new();
 		for token in self.content.iter() {
 			for t in previous.iter() {
 				for x in t.list_last() {
@@ @@ -159,6 +157,44 @@ impl Token for Chain { @@
+	}
+}
 impl Token {
 	pub fn is_skippable(&self) -> bool {
 		match self {
 			Token::Symbol(_) => false,
 			Token::Asterisk(_) => true,
 			Token::Plus(_) => false,
 			Token::Chain(t) => t.is_skippable()
+		}
+	}
 	pub fn list_first(&self) -> Vec<usize> {
 		match self {
 			Token::Symbol(t) => t.list_first(),
 			Token::Asterisk(t) => t.list_first(),
 			Token::Plus(t) => t.list_first(),
 			Token::Chain(t) => t.list_first()
+		}
+	}
 	pub fn list_last(&self) -> Vec<usize> {
 		match self {
 			Token::Symbol(t) => t.list_last(),
 			Token::Asterisk(t) => t.list_last(),
 			Token::Plus(t) => t.list_last(),
 			Token::Chain(t) => t.list_last()
+		}
+	}
 	pub fn list_neighbours(&self) -> Vec<(usize, usize)> {
 		match self {
 			Token::Symbol(t) => t.list_neighbours(),
 			Token::Asterisk(t) => t.list_neighbours(),
 			Token::Plus(t) => t.list_neighbours(),
 			Token::Chain(t) => t.list_neighbours()
+		}
+	}
+}
 fn find_closing_parenthesis(s: &String) -> Option<usize> {
 	let chars: Vec<char> = s.chars().collect();
 	let mut counter = 0;
@@ @@ -172,9 +208,9 @@ fn find_closing_parenthesis(s: &String) @@
 	return None;
+}
-pub fn parse(pattern: &String, offset: usize) -> Result<Chain, ParsingError> {
+pub fn parse(pattern: &String, offset: usize) -> Result<Token, ParsingError> {
 	let chars: Vec<char> = pattern.chars().collect();
-	let mut res: Vec<Box<dyn Token>> = Vec::new();
 	let mut res: Vec<Box<Token>> = Vec::new();
 	let mut i = 0;
 	while i < pattern.len() {
 		let c = chars[i];
@@ @@ -187,25 +223,25 @@ pub fn parse(pattern: &String, offset: u @@
+			}
 			'*' => {
 				let token = res.pop().ok_or(ParsingError::Asterisk{s: pattern.clone(), pos: i})?;
 				res.push(Box::new(Asterisk{content: token}));
+				res.push(Box::new(Token::Asterisk(Asterisk{content: token})));
 				i += 1;
+			}
 			'+' => {
 				let token = res.pop().ok_or(ParsingError::Plus{s: pattern.clone(), pos: i})?;
 				res.push(Box::new(Plus{content: token}));
+				res.push(Box::new(Token::Plus(Plus{content: token})));
 				i += 1;
+			}
 			')' => {
 				return Err(ParsingError::OpeningParenthesis {s: pattern.clone(), pos: i});
+			}
 			c => {
 				res.push(Box::new(Symbol{position: i+offset}));
 			_c => {
 				res.push(Box::new(Token::Symbol(Symbol{position: i+offset})));
 				i += 1;
+			}
+		}
+	}
 	return Ok(Chain{content: res});
+	return Ok(Token::Chain(Chain{content: res}));
+}
 mod test {

0 comments (0 inline, 0 general)