Merge pull request #5 from GyulyVGC/serde

Serde

Author: GyulyVGC

Cargo.toml

@@ -4,3 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+serde = { version = "1.0.210", features = ["derive"] }

src/enums/infix_token.rs

@@ -1,7 +1,9 @@
 use crate::enums::operator::Operator;
 use crate::Parenthesis;
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case", tag = "type")]
 pub enum InfixToken<Predicate> {
     Parenthesis(Parenthesis),
     Operator(Operator),

src/enums/operator.rs

@@ -1,4 +1,7 @@
-#[derive(PartialEq, Copy, Clone, Debug)]
+use serde::{Deserialize, Serialize};
+
+#[derive(PartialEq, Copy, Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case", tag = "value")]
 pub enum Operator {
     And,
     Or,

src/enums/parenthesis.rs

@@ -1,4 +1,7 @@
-#[derive(Debug, PartialEq)]
+use serde::{Deserialize, Serialize};
+
+#[derive(PartialEq, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case", tag = "value")]
 pub enum Parenthesis {
     Open,
     Close,

src/enums/postfix_token.rs

@@ -1,6 +1,8 @@
 use crate::enums::operator::Operator;
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case", tag = "type")]
 pub enum PostfixToken<Predicate> {
     Operator(Operator),
     Predicate(Predicate),

src/structs/infix_expression.rs

@@ -1,8 +1,11 @@
 use crate::internals::infix_stack_item::InfixStackItem;
 use crate::{InfixToken, Parenthesis, PostfixExpression, PostfixToken};
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub struct InfixExpression<Predicate> {
+    #[serde(rename = "infix_tokens")]
     tokens: Vec<InfixToken<Predicate>>,
 }
 
@@ -58,6 +61,10 @@ impl<Predicate> InfixExpression<Predicate> {
         Self { tokens }
     }
 
+    pub fn is_valid(&self) -> bool {
+        Self::are_tokens_valid(&self.tokens)
+    }
+
     fn are_tokens_valid(tokens: &[InfixToken<Predicate>]) -> bool {
         let mut operator_stack: Vec<InfixStackItem> = Vec::new();
         let mut predicate_cnt: usize = 0;

src/structs/postfix_expression.rs

@@ -2,10 +2,13 @@ use crate::enums::postfix_token::PostfixToken;
 use crate::internals::postfix_stack_item::PostfixStackItem;
 use crate::traits::predicate_evaluator::PredicateEvaluator;
 use crate::{InfixExpression, InfixToken, Operator, Parenthesis};
+use serde::{Deserialize, Serialize};
 use std::collections::VecDeque;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub struct PostfixExpression<Predicate> {
+    #[serde(rename = "postfix_tokens")]
     tokens: Vec<PostfixToken<Predicate>>,
 }
 
@@ -85,6 +88,10 @@ impl<Predicate> PostfixExpression<Predicate> {
         Self { tokens }
     }
 
+    pub fn is_valid(&self) -> bool {
+        Self::are_tokens_valid(&self.tokens)
+    }
+
     fn are_tokens_valid(tokens: &[PostfixToken<Predicate>]) -> bool {
         let mut cnt: usize = 0;