refactor: Split plotnik-lib into bytecode, vm, compiler crates (#346)

Author: zharinov

Cargo.lock

@@ -1,6 +1,14 @@
 [workspace]
 resolver = "2"
-members = ["crates/plotnik-cli", "crates/plotnik-lib", "crates/plotnik-langs", "crates/plotnik-core"]
+members = [
+    "crates/plotnik-bytecode",
+    "crates/plotnik-cli",
+    "crates/plotnik-compiler",
+    "crates/plotnik-core",
+    "crates/plotnik-langs",
+    "crates/plotnik-lib",
+    "crates/plotnik-vm",
+]
 
 [workspace.package]
 version = "0.2.2"
@@ -9,6 +17,9 @@ repository = "https://github.com/plotnik-lang/plotnik"
 edition = "2024"
 
 [workspace.dependencies]
+plotnik-bytecode = { path = "crates/plotnik-bytecode", version = "0.2.2" }
+plotnik-compiler = { path = "crates/plotnik-compiler", version = "0.2.2" }
 plotnik-core = { path = "crates/plotnik-core", version = "0.2.2" }
 plotnik-langs = { path = "crates/plotnik-langs", version = "0.2.2" }
 plotnik-lib = { path = "crates/plotnik-lib", version = "0.2.2" }
+plotnik-vm = { path = "crates/plotnik-vm", version = "0.2.2" }

Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "plotnik-bytecode"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+description = "Bytecode format and runtime types for Plotnik"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
+
+[dependencies]
+plotnik-core.workspace = true
+regex-automata = { version = "0.4", features = ["dfa-search"] }
+thiserror = "2.0.17"
+
+[dev-dependencies]
+insta = { version = "=1.46.0", features = ["yaml"] }

crates/plotnik-bytecode/Cargo.toml

@@ -5,15 +5,14 @@
 use std::collections::BTreeMap;
 use std::fmt::Write as _;
 
-use crate::colors::Colors;
-
-use crate::parser::PredicateOp;
+use plotnik_core::Colors;
+use crate::predicate_op::PredicateOp;
 
 use super::format::{LineBuilder, Symbol, format_effect, nav_symbol, width_for_count};
 use super::ids::TypeId;
 use super::instructions::StepId;
-use super::ir::NodeTypeIR;
 use super::module::{Instruction, Module};
+use super::node_type_ir::NodeTypeIR;
 use super::nav::Nav;
 use super::type_meta::{TypeData, TypeKind};
 use super::{Call, Match, Return, Trampoline};
@@ -78,13 +77,13 @@ impl DumpContext {
         let mut node_type_names = BTreeMap::new();
         for i in 0..node_types.len() {
             let t = node_types.get(i);
-            node_type_names.insert(t.id(), strings.get(t.name()).to_string());
+            node_type_names.insert(t.id, strings.get(t.name).to_string());
         }
 
         let mut node_field_names = BTreeMap::new();
         for i in 0..node_fields.len() {
             let f = node_fields.get(i);
-            node_field_names.insert(f.id(), strings.get(f.name()).to_string());
+            node_field_names.insert(f.id, strings.get(f.name).to_string());
         }
 
         // Collect all strings for unlinked mode lookups
@@ -210,14 +209,14 @@ fn dump_types_defs(out: &mut String, module: &Module, ctx: &DumpContext) {
                     TypeKind::Struct => {
                         let fields: Vec<_> = types
                             .members_of(&def)
-                            .map(|m| strings.get(m.name()).to_string())
+                            .map(|m| strings.get(m.name).to_string())
                             .collect();
                         format!("{}  ; {{ {} }}{}", c.dim, fields.join(", "), c.reset)
                     }
                     TypeKind::Enum => {
                         let variants: Vec<_> = types
                             .members_of(&def)
-                            .map(|m| strings.get(m.name()).to_string())
+                            .map(|m| strings.get(m.name).to_string())
                             .collect();
                         format!("{}  ; {}{}", c.dim, variants.join(" | "), c.reset)
                     }
@@ -293,8 +292,8 @@ fn format_type_name(type_id: TypeId, module: &Module, ctx: &DumpContext) -> Stri
     // Try to find a name in types.names
     for i in 0..types.names_count() {
         let entry = types.get_name(i);
-        if entry.type_id() == type_id {
-            return strings.get(entry.name()).to_string();
+        if entry.type_id == type_id {
+            return strings.get(entry.name).to_string();
         }
     }
 

…/plotnik-lib/src/bytecode/aligned_vec.rs …nik-bytecode/src/bytecode/aligned_vec.rscrates/plotnik-lib/src/bytecode/aligned_vec.rs renamed to crates/plotnik-bytecode/src/bytecode/aligned_vec.rs crates/plotnik-lib/src/bytecode/aligned_vec.rs renamed to crates/plotnik-bytecode/src/bytecode/aligned_vec.rs

@@ -43,8 +43,8 @@ impl EffectOpcode {
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub struct EffectOp {
-    pub(crate) opcode: EffectOpcode,
-    pub(crate) payload: usize,
+    pub opcode: EffectOpcode,
+    pub payload: usize,
 }
 
 impl EffectOp {
@@ -69,11 +69,4 @@ impl EffectOp {
         let raw = ((self.opcode as u16) << 10) | ((self.payload as u16) & 0x3FF);
         raw.to_le_bytes()
     }
-
-    pub fn opcode(&self) -> EffectOpcode {
-        self.opcode
-    }
-    pub fn payload(&self) -> usize {
-        self.payload
-    }
 }

…ik-lib/src/bytecode/aligned_vec_tests.rs …tecode/src/bytecode/aligned_vec_tests.rscrates/plotnik-lib/src/bytecode/aligned_vec_tests.rs renamed to crates/plotnik-bytecode/src/bytecode/aligned_vec_tests.rs crates/plotnik-lib/src/bytecode/aligned_vec_tests.rs renamed to crates/plotnik-bytecode/src/bytecode/aligned_vec_tests.rs

@@ -5,25 +5,25 @@ fn roundtrip_with_payload() {
     let op = EffectOp::new(EffectOpcode::Set, 42);
     let bytes = op.to_bytes();
     let decoded = EffectOp::from_bytes(bytes);
-    assert_eq!(decoded.opcode(), EffectOpcode::Set);
-    assert_eq!(decoded.payload(), 42);
+    assert_eq!(decoded.opcode, EffectOpcode::Set);
+    assert_eq!(decoded.payload, 42);
 }
 
 #[test]
 fn roundtrip_no_payload() {
     let op = EffectOp::new(EffectOpcode::Node, 0);
     let bytes = op.to_bytes();
     let decoded = EffectOp::from_bytes(bytes);
-    assert_eq!(decoded.opcode(), EffectOpcode::Node);
-    assert_eq!(decoded.payload(), 0);
+    assert_eq!(decoded.opcode, EffectOpcode::Node);
+    assert_eq!(decoded.payload, 0);
 }
 
 #[test]
 fn max_payload() {
     let op = EffectOp::new(EffectOpcode::Enum, 1023);
     let bytes = op.to_bytes();
     let decoded = EffectOp::from_bytes(bytes);
-    assert_eq!(decoded.payload(), 1023);
+    assert_eq!(decoded.payload, 1023);
 }
 
 #[test]

…es/plotnik-lib/src/bytecode/constants.rs …otnik-bytecode/src/bytecode/constants.rscrates/plotnik-lib/src/bytecode/constants.rs renamed to crates/plotnik-bytecode/src/bytecode/constants.rs crates/plotnik-lib/src/bytecode/constants.rs renamed to crates/plotnik-bytecode/src/bytecode/constants.rs

@@ -8,12 +8,12 @@ use super::{StringId, TypeId};
 #[repr(C)]
 pub struct Entrypoint {
     /// Definition name.
-    pub(crate) name: StringId,
+    pub name: StringId,
     /// Starting instruction address.
-    pub(crate) target: StepAddr,
+    pub target: StepAddr,
     /// Result type.
-    pub(crate) result_type: TypeId,
-    pub(crate) _pad: u16,
+    pub result_type: TypeId,
+    _pad: u16,
 }
 
 const _: () = assert!(std::mem::size_of::<Entrypoint>() == 8);