Added tests for extend-expression codec feature

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "semantic-analyzer"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Evgeny Ukhanov <mrlsd@ya.ru>"]
 description = "Semantic analyzer library for compilers written in Rust for semantic analysis of programming languages AST"
 keywords = ["compiler", "semantic-analisis", "semantic-alalyzer", "compiler-design", "semantic"]
@@ -20,7 +20,7 @@ doctest = false
 
 [dependencies]
 nom_locate = "4.2"
-serde = { version =  "1", features = ["derive"], optional = true }
+serde = { version = "1", features = ["derive"], optional = true }
 
 [dev-dependencies]
 serde_json = "1"

src/types/semantic.rs

@@ -82,12 +82,9 @@ pub trait ExtendedSemanticContext<I: SemanticContextInstruction> {
 }
 
 /// Semantic Context trait contains custom instruction implementation
-/// to flexibly extend context instructions.
-pub trait SemanticContextInstruction: Debug + Clone + PartialEq {
-    /// Custom instruction implementation.
-    /// Ast should be received from `GetAst` trait.
-    fn instruction(&self) -> Box<Self>;
-}
+/// to flexibly extend context instructions. It represents ivs derided
+/// traits: `Debug` and `Serialize` + `Deserialize`
+pub trait SemanticContextInstruction: Debug + Clone + PartialEq {}
 
 /// Extended Expression for semantic analyzer.
 pub trait ExtendedExpression<I: SemanticContextInstruction>: Debug + Clone + PartialEq {
@@ -426,7 +423,9 @@ impl<I: SemanticContextInstruction> ExtendedSemanticContext<I> for SemanticStack
     /// AS argument trait, that contains instruction method that returns
     /// instruction parameters.
     fn extended_expression(&mut self, expr: &I) {
-        self.push(SemanticStackContext::ExtendedExpression(expr.instruction()));
+        self.push(SemanticStackContext::ExtendedExpression(Box::new(
+            expr.clone(),
+        )));
     }
 }
 

tests/expressions_tests.rs

@@ -1332,17 +1332,13 @@ fn custom_expression() {
     }
 
     #[derive(Clone, Debug, PartialEq)]
-    #[allow(dead_code)]
+    #[cfg_attr(feature = "codec", derive(serde::Serialize, serde::Deserialize))]
     pub enum CustomExpressionInstruction {
         GoIn { index: u32, value: u32 },
         GoOut { result: u32 },
     }
 
-    impl SemanticContextInstruction for CustomExpressionInstruction {
-        fn instruction(&self) -> Box<Self> {
-            Box::new(self.clone())
-        }
-    }
+    impl SemanticContextInstruction for CustomExpressionInstruction {}
 
     impl ExtendedExpression<CustomExpressionInstruction>
         for CustomExpression<CustomExpressionInstruction>
@@ -1438,4 +1434,12 @@ fn custom_expression() {
             register_number: 3,
         }
     );
+
+    #[cfg(feature = "codec")]
+    {
+        let json = serde_json::to_string(&bs).unwrap();
+        let bs_decoded: Vec<SemanticStackContext<CustomExpressionInstruction>> =
+            serde_json::from_str(&json).unwrap();
+        assert_eq!(bs, bs_decoded);
+    }
 }

tests/utils/mod.rs

@@ -34,11 +34,7 @@ impl<I: SemanticContextInstruction> ExtendedExpression<I> for CustomExpression<I
 #[cfg_attr(feature = "codec", derive(Serialize, Deserialize))]
 pub struct CustomExpressionInstruction;
 
-impl SemanticContextInstruction for CustomExpressionInstruction {
-    fn instruction(&self) -> Box<Self> {
-        Box::new(Self)
-    }
-}
+impl SemanticContextInstruction for CustomExpressionInstruction {}
 
 pub struct SemanticTest<I: SemanticContextInstruction> {
     pub state: State<CustomExpression<I>, I>,