chore: improve program type generation

Author: gengjiawen

parser/ast.rs

@@ -2,8 +2,7 @@ use core::fmt;
 use core::fmt::Result;
 use std::fmt::Formatter;
 use lexer::token::{Token, TokenKind, Span};
-use serde::{Deserialize, Serialize, Serializer};
-use serde::ser::SerializeStruct;
+use serde::{Deserialize, Serialize};
 
 // still wait for https://github.com/serde-rs/serde/issues/1402
 // or https://github.com/serde-rs/serde/issues/760
@@ -24,26 +23,13 @@ impl fmt::Display for Node {
     }
 }
 
-#[derive(Clone, Debug, Eq, Deserialize, Hash, PartialEq)]
+#[derive(Clone, Debug, Eq, Serialize, Deserialize, Hash, PartialEq)]
+#[serde(tag = "type")]
 pub struct Program {
     pub body: Vec<Statement>,
     pub span: Span,
 }
 
-// remove this if serde resolve resolve https://github.com/serde-rs/serde/issues/760
-impl Serialize for Program {
-    fn serialize<S>(&self, serializer: S) -> core::result::Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut state = serializer.serialize_struct("Program", 2)?;
-        state.serialize_field("body", &self.body)?;
-        state.serialize_field("span", &self.span)?;
-        state.serialize_field("type", "Program")?;
-        state.end()
-    }
-}
-
 impl Program {
     pub fn new() -> Self {
         Program { body: vec![], span: Span {

parser/snapshots/parser__ast_tree_test__tests__test_array.snap

@@ -4,6 +4,7 @@ expression: "[1, true]"
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Expr",
@@ -38,7 +39,6 @@ expression: "[1, true]"
     "span": {
       "start": 0,
       "end": 10
-    },
-    "type": "Program"
+    }
   }
 }

parser/snapshots/parser__ast_tree_test__tests__test_binary.snap

@@ -4,6 +4,7 @@ expression: 1 + 2 * 3
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Expr",
@@ -69,7 +70,6 @@ expression: 1 + 2 * 3
     "span": {
       "start": 0,
       "end": 10
-    },
-    "type": "Program"
+    }
   }
 }

parser/snapshots/parser__ast_tree_test__tests__test_func_call.snap

@@ -4,6 +4,7 @@ expression: "add(1, 2)"
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Expr",
@@ -45,7 +46,6 @@ expression: "add(1, 2)"
     "span": {
       "start": 0,
       "end": 10
-    },
-    "type": "Program"
+    }
   }
 }

parser/snapshots/parser__ast_tree_test__tests__test_func_declaration.snap

@@ -4,6 +4,7 @@ expression: "fn(x) { x };"
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Expr",
@@ -31,7 +32,6 @@ expression: "fn(x) { x };"
     "span": {
       "start": 0,
       "end": 13
-    },
-    "type": "Program"
+    }
   }
 }

parser/snapshots/parser__ast_tree_test__tests__test_hash.snap

@@ -4,6 +4,7 @@ expression: "{\"a\": 1}"
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Expr",
@@ -40,7 +41,6 @@ expression: "{\"a\": 1}"
     "span": {
       "start": 0,
       "end": 9
-    },
-    "type": "Program"
+    }
   }
 }

parser/snapshots/parser__ast_tree_test__tests__test_if.snap

@@ -4,6 +4,7 @@ expression: "if (x < y) { x } else { y }"
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Expr",
@@ -71,7 +72,6 @@ expression: "if (x < y) { x } else { y }"
     "span": {
       "start": 0,
       "end": 28
-    },
-    "type": "Program"
+    }
   }
 }

parser/snapshots/parser__ast_tree_test__tests__test_index.snap

@@ -4,6 +4,7 @@ expression: "a[1]"
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Expr",
@@ -34,7 +35,6 @@ expression: "a[1]"
     "span": {
       "start": 0,
       "end": 5
-    },
-    "type": "Program"
+    }
   }
 }

parser/snapshots/parser__ast_tree_test__tests__test_let.snap

@@ -4,6 +4,7 @@ expression: let a = 3
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Let",
@@ -35,7 +36,6 @@ expression: let a = 3
     "span": {
       "start": 0,
       "end": 10
-    },
-    "type": "Program"
+    }
   }
 }

parser/snapshots/parser__ast_tree_test__tests__test_return.snap

@@ -4,6 +4,7 @@ expression: return 3
 ---
 {
   "Program": {
+    "type": "Program",
     "body": [
       {
         "stmt_type": "Return",
@@ -19,7 +20,6 @@ expression: return 3
     "span": {
       "start": 0,
       "end": 9
-    },
-    "type": "Program"
+    }
   }
 }