refactor: split language module in two (language & tree)

src/language/language_set/interface.rs → src/language/interface.rs

@@ -3,8 +3,8 @@ use super::compiled::{
     LanguageCompiled, LanguageId, NotationSetId, SortId,
 };
 use super::specs::{LanguageSpec, NotationSetSpec};
-use crate::language::storage::Storage;
-use crate::language::LanguageError;
+use super::storage::Storage;
+use super::LanguageError;
 use crate::style::ValidNotation;
 use crate::util::{bug, IndexedMap};
 

src/language/mod.rs

@@ -1,18 +1,13 @@
-mod forest;
-mod language_set;
-mod location;
-mod node;
+mod compiled;
+mod interface;
+mod specs;
 mod storage;
-mod text;
 
 use partial_pretty_printer as ppp;
 use std::fmt;
 
-pub use language_set::{
-    AritySpec, ConstructSpec, GrammarSpec, LanguageSpec, NotationSetSpec, SortSpec,
-};
-pub use location::Location;
-pub use node::{Node, NodeId};
+pub use interface::{Arity, Construct, Language};
+pub use specs::{AritySpec, ConstructSpec, GrammarSpec, LanguageSpec, NotationSetSpec, SortSpec};
 pub use storage::Storage;
 
 #[derive(thiserror::Error, fmt::Debug)]

src/language/storage.rs

@@ -1,25 +1,21 @@
-use super::forest::Forest;
-use super::language_set::{
-    compile_language, compile_notation_set, Language, LanguageCompiled, LanguageSpec,
-    NotationSetSpec,
-};
-use super::node::{Node, NodeData, NodeId};
+use super::compiled::{compile_language, compile_notation_set, LanguageCompiled};
+use super::interface::Language;
+use super::specs::{LanguageSpec, NotationSetSpec};
 use super::LanguageError;
+use crate::tree::NodeForest;
 use crate::util::IndexedMap;
 
 /// Stores all documents and languages.
 pub struct Storage {
     pub(super) languages: IndexedMap<LanguageCompiled>,
-    pub(super) forest: Forest<NodeData>,
-    pub(super) next_id: NodeId,
+    pub(crate) node_forest: NodeForest,
 }
 
 impl Storage {
     pub fn new() -> Storage {
         Storage {
             languages: IndexedMap::new(),
-            forest: Forest::new(NodeData::invalid_dummy()),
-            next_id: NodeId(0),
+            node_forest: NodeForest::new(),
         }
     }
 
@@ -49,12 +45,6 @@ impl Storage {
     pub fn get_language(&self, name: &str) -> Option<Language> {
         Some(Language::from_id(self.languages.id(name)?))
     }
-
-    pub(super) fn next_id(&mut self) -> NodeId {
-        let id = self.next_id.0;
-        self.next_id.0 += 1;
-        NodeId(id)
-    }
 }
 
 impl Default for Storage {

src/lib.rs

@@ -4,10 +4,11 @@
 mod language;
 mod pretty_doc;
 mod style;
+mod tree;
 mod util;
 
 pub use language::{
-    AritySpec, ConstructSpec, GrammarSpec, LanguageSpec, Location, Node, NotationSetSpec, SortSpec,
-    Storage,
+    AritySpec, ConstructSpec, GrammarSpec, LanguageSpec, NotationSetSpec, SortSpec, Storage,
 };
 pub use pretty_doc::DocRef;
+pub use tree::{Location, Node};

src/pretty_doc.rs

@@ -1,8 +1,9 @@
-use crate::language::{Location, Node, NodeId, Storage};
+use crate::language::Storage;
 use crate::style::{
     Condition, CursorHalf, Style, StyleLabel, ValidNotation, HOLE_STYLE, LEFT_CURSOR_STYLE,
     RIGHT_CURSOR_STYLE,
 };
+use crate::tree::{Location, Node, NodeId};
 use crate::util::{bug, SynlessBug};
 use partial_pretty_printer as ppp;
 use std::fmt;

src/language/location.rs → src/tree/location.rs

@@ -1,5 +1,5 @@
 use super::node::Node;
-use super::storage::Storage;
+use crate::language::Storage;
 
 /// A location between nodes, or within text, where a cursor could go.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

src/tree/mod.rs

@@ -0,0 +1,8 @@
+mod forest;
+mod location;
+mod node;
+mod text;
+
+pub use location::Location;
+pub(crate) use node::NodeForest;
+pub use node::{Node, NodeId};