Refactor module structure

Author: object-Object

src/bin/mlog.rs

@@ -3,11 +3,11 @@ use std::{error::Error, time::Instant};
 use clap::Parser;
 use clap_stdin::FileOrStdin;
 use mindustry_rs::{
-    logic::vm::{
+    types::{Object, ProcessorConfig, ProcessorLinkConfig},
+    vm::{
         Building, BuildingData, HYPER_PROCESSOR, LOGIC_PROCESSOR, LogicVMBuilder, MEMORY_BANK,
         MEMORY_CELL, MESSAGE, MICRO_PROCESSOR, WORLD_PROCESSOR,
     },
-    types::{Object, ProcessorConfig, ProcessorLinkConfig},
 };
 use strum_macros::EnumString;
 use widestring::U16String;

src/bin/mlogv32.rs

@@ -18,13 +18,12 @@ use cursive::views::{
 };
 use indicatif::ProgressIterator;
 use itertools::Itertools;
-use mindustry_rs::logic::vm::{LObject, LVar};
 use mindustry_rs::{
-    logic::vm::{
-        Building, BuildingData, LValue, LogicVM, LogicVMBuilder, MEMORY_BANK, MESSAGE,
-        MICRO_PROCESSOR, SWITCH, WORLD_PROCESSOR,
-    },
     types::{Object, PackedPoint2, ProcessorConfig, schematics::Schematic},
+    vm::{
+        Building, BuildingData, LObject, LValue, LVar, LogicVM, LogicVMBuilder, MEMORY_BANK,
+        MESSAGE, MICRO_PROCESSOR, SWITCH, WORLD_PROCESSOR,
+    },
 };
 use serde::Deserialize;
 use widestring::{U16String, u16str};

src/lib.rs

@@ -5,6 +5,7 @@ extern crate alloc;
 #[cfg(feature = "std")]
 extern crate std;
 
-pub mod logic;
+pub mod parser;
 pub mod types;
 mod utils;
+pub mod vm;

src/logic/ast.rs src/parser/ast.rssrc/logic/ast.rs renamed to src/parser/ast.rs

@@ -1,7 +1,6 @@
 pub mod ast;
 #[cfg(feature = "std")]
 mod grammar_util;
-pub mod vm;
 
 #[cfg(feature = "std")]
 lalrpop_util::lalrpop_mod!(
@@ -21,9 +20,10 @@ use core::error::Error;
 use std::{boxed::Box, string::ToString};
 
 #[cfg(feature = "std")]
-use crate::types::{PackedPoint2, content};
-#[cfg(feature = "std")]
-use vm::{Building, LogicVMBuilder, ProcessorBuilder};
+use crate::{
+    types::{PackedPoint2, content},
+    vm::{Building, LogicVMBuilder, ProcessorBuilder},
+};
 
 #[cfg(feature = "std")]
 pub fn parse_and_serialize_ast(

src/logic/grammar.lalrpop src/parser/grammar.lalrpopsrc/logic/grammar.lalrpop renamed to src/parser/grammar.lalrpop

@@ -17,19 +17,17 @@ use super::{
     variables::{Content, LValue, LVar, RAD_DEG},
 };
 use crate::{
-    logic::{
-        ast::{self, ConditionOp, LogicOp, TileLayer},
-        vm::{
-            LObject,
-            variables::{F64_DEG_RAD, F64_RAD_DEG, LString},
-        },
-    },
+    parser::ast::{self, ConditionOp, LogicOp, TileLayer},
     types::{
         ContentType, LAccess, PackedPoint2, Team,
         colors::{self, f32_to_double_bits, f64_from_double_bits},
         content,
     },
     utils::{RapidHashMap, u16format},
+    vm::{
+        LObject,
+        variables::{F64_DEG_RAD, F64_RAD_DEG, LString},
+    },
 };
 
 const MAX_IPT: i32 = 1000;

src/logic/grammar_util.rs src/parser/grammar_util.rssrc/logic/grammar_util.rs renamed to src/parser/grammar_util.rs

@@ -274,11 +274,9 @@ mod tests {
     use widestring::u16str;
 
     use crate::{
-        logic::{
-            ast,
-            vm::{Building, BuildingData, LObject, LVar, processor::ProcessorBuilder},
-        },
+        parser::ast,
         types::{PackedPoint2, content},
+        vm::{Building, BuildingData, LObject, LVar, processor::ProcessorBuilder},
     };
 
     use super::LogicVMBuilder;
@@ -377,18 +375,18 @@ mod tests {
     use widestring::{U16Str, U16String, u16str};
 
     use crate::{
-        logic::vm::{
+        types::{
+            ContentID, ContentType, Object, PackedPoint2, ProcessorConfig, ProcessorLinkConfig,
+            Team, colors::COLORS, content,
+        },
+        utils::u16format,
+        vm::{
             buildings::{
                 HYPER_PROCESSOR, MEMORY_BANK, MEMORY_CELL, MESSAGE, MICRO_PROCESSOR, SWITCH,
                 WORLD_CELL,
             },
             variables::{Content, LValue, LVar},
         },
-        types::{
-            ContentID, ContentType, Object, PackedPoint2, ProcessorConfig, ProcessorLinkConfig,
-            Team, colors::COLORS, content,
-        },
-        utils::u16format,
     };
 
     use super::{
@@ -868,7 +866,7 @@ mod tests {
 
     #[test]
     fn test_link_max_range() {
-        let data = include_bytes!("../../../tests/logic/vm/test_link_max_range.msch");
+        let data = include_bytes!("../../tests/vm/test_link_max_range.msch");
         let schematic = Schematic::read(&mut Cursor::new(data)).unwrap();
         let mut vm = LogicVM::from_schematic(&schematic).unwrap();
 
@@ -1469,7 +1467,7 @@ mod tests {
                 .join("\n");
             let code = format!("setrate 1000\n{code}\nstop");
 
-            let data = include_bytes!("../../../tests/logic/vm/test_sensor_schematic.msch");
+            let data = include_bytes!("../../tests/vm/test_sensor_schematic.msch");
             let mut schematic = Schematic::read(&mut Cursor::new(data)).unwrap();
 
             // replace main processor code