Refactored trait methods AST representation to be included in trait AST

src/ast/traits.rs

@@ -1,9 +1,18 @@
-use super::Privacy;
+use super::{Parameters, Privacy, Type};
 use crate::source_files::Source;
 
 #[derive(Clone, Debug)]
 pub struct Trait {
     pub name: String,
     pub source: Source,
     pub privacy: Privacy,
+    pub methods: Vec<TraitMethod>,
+}
+
+#[derive(Clone, Debug)]
+pub struct TraitMethod {
+    pub name: String,
+    pub parameters: Parameters,
+    pub return_type: Type,
+    pub source: Source,
 }

src/parser/parse_trait.rs

@@ -4,19 +4,11 @@ use super::{
     Parser,
 };
 use crate::{
-    ast::{Parameters, Privacy, Trait, Type},
+    ast::{Parameters, Privacy, Trait, TraitMethod},
     inflow::Inflow,
-    source_files::Source,
     token::{Token, TokenKind},
 };
 
-pub struct TraitMethod {
-    pub name: String,
-    pub parameters: Parameters,
-    pub return_type: Type,
-    pub source: Source,
-}
-
 impl<'a, I: Inflow<Token>> Parser<'a, I> {
     pub fn parse_trait(&mut self, annotations: Vec<Annotation>) -> Result<Trait, ParseError> {
         let source = self.source_here();
@@ -51,6 +43,7 @@ impl<'a, I: Inflow<Token>> Parser<'a, I> {
             name,
             source,
             privacy,
+            methods,
         })
     }