schrottkatze/iowo
0
0
Fork 0
mirror of https://forge.katzen.cafe/katzen-cafe/iowo.git synced 2024-11-24 14:28:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

lang: smol module tree things and details

Browse source
This commit is contained in:
Schrottkatze 2024-06-06 09:53:28 +02:00
parent 7bc603f7e7
commit 1a533eb788
No known key found for this signature in database
4 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/lang/src/ast.rs
View file

@ -58,11 +58,4 @@ impl World {
module_tree, module_tree,
}) })
} }
// fn parse_mod_tree(files: &mut HashMap<PathBuf, SourceFile>)
} }
// struct SourceFile {
// tree: SyntaxNode,
// items: Vec<TopLevelItem>,
// }

14
crates/lang/src/ast/mod_tree.rs
View file

@ -18,7 +18,7 @@ use super::{
}; };
pub struct ModuleTree { pub struct ModuleTree {
modules: Rc<HashMap<String, Module>>, modules: Rc<HashMap<String, Rc<Module>>>,
} }
#[derive(Clone)] #[derive(Clone)]
@ -71,7 +71,7 @@ impl ModuleParsingContext {
&self, &self,
node: &SyntaxNode, node: &SyntaxNode,
name: Option<String>, name: Option<String>,
) -> HashMap<String, Module> { ) -> HashMap<String, Rc<Module>> {
let mut ctx = self.clone(); let mut ctx = self.clone();
if let Some(name) = name { if let Some(name) = name {
ctx.push_cur_path(name) ctx.push_cur_path(name)
@ -79,13 +79,13 @@ impl ModuleParsingContext {
node.children() node.children()
.filter_map(Mod::cast) .filter_map(Mod::cast)
.filter_map(|m| match Module::parse_mod(m, self.clone()) { .filter_map(|m| match Module::parse_mod(m, self.clone()) {
Ok(module) => Some((module.name(), module)), Ok(module) => Some((module.name(), Rc::new(module))),
Err(error) => { Err(error) => {
self.errors.borrow_mut().push(error); self.errors.borrow_mut().push(error);
None None
} }
}) })
.collect::<HashMap<String, Module>>() .collect::<HashMap<String, Rc<Module>>>()
} }
fn dissolve(self) -> (HashMap<PathBuf, SourceFile>, Vec<Error>) { fn dissolve(self) -> (HashMap<PathBuf, SourceFile>, Vec<Error>) {
@ -118,8 +118,8 @@ pub struct Module {
path: Vec<String>, path: Vec<String>,
name: String, name: String,
kind: ModuleKind, kind: ModuleKind,
children: Rc<HashMap<String, Module>>, children: Rc<HashMap<String, Rc<Module>>>,
parent: Option<Arc<Module>>, parent: Option<Rc<Module>>,
} }
impl Module { impl Module {
@ -214,7 +214,7 @@ impl Module {
} }
} }
fn print_tree(name: &str, children: Rc<HashMap<String, Module>>, level: u32) { fn print_tree(name: &str, children: Rc<HashMap<String, Rc<Module>>>, level: u32) {
const INDENT_STR: &str = " "; const INDENT_STR: &str = " ";
for _ in 0..level { for _ in 0..level {

2
testfiles/hello.owo
View file

@ -1 +1,3 @@
mod meow; mod meow;
def broken

4
testfiles/hello/meow.owo
View file

@ -1,2 +1,4 @@
mod mrawr {} mod mrawr {}
mod mrow {} mod mrow {
def gay = ;
}