Merge pull request #121 from lucalewin/node_file_structure

Node file structure

src/html5_parser.rs

@@ -3,7 +3,5 @@ pub mod element_class;
 pub mod error_logger;
 pub mod input_stream;
 pub mod node;
-mod node_arena;
-pub mod node_data;
 pub mod parser;
 pub mod tokenizer;

src/html5_parser/node.rs

@@ -1,8 +1,8 @@
 use crate::html5_parser::element_class::ElementClass;
-use crate::html5_parser::node_data::comment_data::CommentData;
-use crate::html5_parser::node_data::document_data::DocumentData;
-use crate::html5_parser::node_data::element_data::ElementData;
-use crate::html5_parser::node_data::text_data::TextData;
+use crate::html5_parser::node::data::comment::CommentData;
+use crate::html5_parser::node::data::document::DocumentData;
+use crate::html5_parser::node::data::element::ElementData;
+use crate::html5_parser::node::data::text::TextData;
 use derive_more::Display;
 use std::collections::HashMap;
 
@@ -13,6 +13,9 @@ pub const XLINK_NAMESPACE: &str = "http://www.w3.org/1999/xlink";
 pub const XML_NAMESPACE: &str = "http://www.w3.org/XML/1998/namespace";
 pub const XMLNS_NAMESPACE: &str = "http://www.w3.org/2000/xmlns/";
 
+pub mod arena;
+pub mod data;
+
 /// Different types of nodes
 #[derive(Debug, PartialEq)]
 pub enum NodeType {

src/html5_parser/node_arena.rs → src/html5_parser/node/arena.rs

@@ -1,7 +1,7 @@
 use crate::html5_parser::node::Node;
 use std::collections::HashMap;
 
-use super::node::NodeId;
+use super::NodeId;
 
 pub struct NodeArena {
     nodes: HashMap<NodeId, Node>, // Current nodes
@@ -85,6 +85,12 @@ impl NodeArena {
     }
 }
 
+impl Default for NodeArena {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 fn has_child_recursive(arena: &mut NodeArena, parent_id: NodeId, child_id: NodeId) -> bool {
     let node = arena.get_node_mut(parent_id).cloned();
     if node.is_none() {

src/html5_parser/node/data.rs

@@ -0,0 +1,4 @@
+pub mod comment;
+pub mod document;
+pub mod element;
+pub mod text;

src/html5_parser/parser.rs

@@ -8,8 +8,8 @@ use super::node::NodeId;
 use crate::html5_parser::element_class::ElementClass;
 use crate::html5_parser::error_logger::{ErrorLogger, ParseError, ParserError};
 use crate::html5_parser::input_stream::InputStream;
+use crate::html5_parser::node::data::text::TextData;
 use crate::html5_parser::node::{Node, NodeData, HTML_NAMESPACE, MATHML_NAMESPACE, SVG_NAMESPACE};
-use crate::html5_parser::node_data::text_data::TextData;
 use crate::html5_parser::parser::adoption_agency::AdoptionResult;
 use crate::html5_parser::parser::attr_replacements::{
     MATHML_ADJUSTMENTS, SVG_ADJUSTMENTS, XML_ADJUSTMENTS,

src/html5_parser/parser/adoption_agency.rs

@@ -1,5 +1,5 @@
+use crate::html5_parser::node::data::element::ElementData;
 use crate::html5_parser::node::{Node, NodeData, NodeId, HTML_NAMESPACE};
-use crate::html5_parser::node_data::element_data::ElementData;
 use crate::html5_parser::parser::{ActiveElement, Html5Parser, Scope};
 use crate::html5_parser::tokenizer::token::Token;
 use std::collections::HashMap;

src/html5_parser/parser/document.rs

@@ -1,10 +1,8 @@
+use crate::html5_parser::node::arena::NodeArena;
+use crate::html5_parser::node::data::{comment::CommentData, element::ElementData, text::TextData};
 use crate::html5_parser::node::NodeTrait;
 use crate::html5_parser::node::NodeType;
 use crate::html5_parser::node::{Node, NodeData, NodeId};
-use crate::html5_parser::node_arena::NodeArena;
-use crate::html5_parser::node_data::{
-    comment_data::CommentData, element_data::ElementData, text_data::TextData,
-};
 use crate::html5_parser::parser::quirks::QuirksMode;
 use crate::html5_parser::parser::HashMap;
 use std::fmt;