restructure

lexa-diky · May 9, 2024 · b4c6fdf · b4c6fdf
1 parent 350a76f
commit b4c6fdf
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 13 deletions.
diff --git a/src/cli.rs b/src/cli.rs
@@ -14,7 +14,7 @@ use pest::Parser as PestParser;
 
 use crate::resolver::resolve_cst;
 use crate::{cst_legacy, render};
-use crate::ast::{AstParser, AstParserError};
+use crate::compiler::ast::{AstParser, AstParserError};
 use crate::render::RenderError;
 
 #[derive(Parser)]

diff --git a/src/ast/mod.rs → src/compiler/ast/mod.rs b/src/ast/mod.rs → src/compiler/ast/mod.rs
diff --git a/src/ast/node.rs → src/compiler/ast/node.rs b/src/ast/node.rs → src/compiler/ast/node.rs
diff --git a/src/ast/parser.rs → src/compiler/ast/parser.rs b/src/ast/parser.rs → src/compiler/ast/parser.rs
@@ -3,7 +3,7 @@ use pest::iterators::Pair;
 use pest::Parser;
 use pest_derive::Parser;
 
-use crate::ast::{AstNode, AstNodeType};
+use crate::compiler::ast::{AstNode, AstNodeType};
 
 #[derive(Debug)]
 pub(crate) enum AstParserError {

diff --git a/src/compiler/compiler.rs b/src/compiler/compiler.rs
@@ -1,6 +1,6 @@
-use crate::ast::{AstParser, AstParserError};
+use crate::compiler::ast::{AstParser, AstParserError};
 use crate::compiler::{Compilation, CompilerSource, HexoCompilerContext};
-use crate::cst::{CstParser, CstParserError};
+use crate::compiler::cst::{CstParser, CstParserError};
 
 #[derive(Debug)]
 pub(crate) enum CompilerError {

diff --git a/src/cst/mod.rs → src/compiler/cst/mod.rs b/src/cst/mod.rs → src/compiler/cst/mod.rs
diff --git a/src/cst/node.rs → src/compiler/cst/node.rs b/src/cst/node.rs → src/compiler/cst/node.rs
diff --git a/src/cst/parser.rs → src/compiler/cst/parser.rs b/src/cst/parser.rs → src/compiler/cst/parser.rs
@@ -1,8 +1,8 @@
 use std::path::PathBuf;
 
-use crate::ast::{AstNode, AstNodeType};
-use crate::cst::{CstActualParameter, CstAtom, CstConstantStatement, CstEmitStatement, CstFunctionStatement};
-use crate::cst::node::CstFile;
+use crate::compiler::ast::{AstNode, AstNodeType};
+use crate::compiler::cst::{CstActualParameter, CstAtom, CstConstantStatement, CstEmitStatement, CstFunctionStatement};
+use crate::compiler::cst::node::CstFile;
 use crate::encoding;
 
 #[derive(Debug)]

diff --git a/src/compiler/mod.rs b/src/compiler/mod.rs
@@ -3,6 +3,10 @@ mod compiler;
 mod compiler_source;
 mod compilation_result;
 mod source_finder;
+mod cst;
+mod rst;
+mod util;
+pub mod ast;
 
 pub(crate) use compiler_context::HexoCompilerContext;
 pub(crate) use compiler::{HexoCompiler, CompilerError};

diff --git a/src/rst/mod.rs → src/compiler/rst/mod.rs b/src/rst/mod.rs → src/compiler/rst/mod.rs
diff --git a/src/rst/node.rs → src/compiler/rst/node.rs b/src/rst/node.rs → src/compiler/rst/node.rs
diff --git a/src/util/byte_buffer.rs → src/compiler/util/byte_buffer.rs b/src/util/byte_buffer.rs → src/compiler/util/byte_buffer.rs
@@ -35,7 +35,7 @@ impl ByteBuffer {
 }
 
 mod test {
-    use crate::util::ByteBuffer;
+    use crate::compiler::util::ByteBuffer;
 
     #[test]
     fn byte_push() {

diff --git a/src/util/mod.rs → src/compiler/util/mod.rs b/src/util/mod.rs → src/compiler/util/mod.rs
diff --git a/src/cst_legacy.rs b/src/cst_legacy.rs
@@ -1,4 +1,4 @@
-use crate::ast::{AstNode, AstNodeType};
+use crate::compiler::ast::{AstNode, AstNodeType};
 use crate::cst_legacy::CstParseError::NodeValueMissing;
 use crate::encoding;
 use crate::encoding::to_shrunk_bytes;

diff --git a/src/main.rs b/src/main.rs
@@ -13,10 +13,6 @@ mod encoding;
 mod render;
 mod resolver;
 mod compiler;
-mod ast;
-mod cst;
-mod rst;
-mod util;
 
 fn main() {
     let compiler = HexoCompiler::new(HexoCompilerContext::new());