j/Conlang
1
1
Fork 0
Code Issues 5 Pull Requests Packages Projects 2 Releases Wiki Activity

cl-structures: Clean up IndexMap and fix doctests

Browse Source
This commit is contained in:
John
2024-07-10 14:56:17 -05:00
parent 16baaa32f1
commit 58c5a01312
3 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/cl-typeck/examples/typeck.rs
View File

@@ -126,7 +126,7 @@ fn query_type_expression(prj: &mut Project) -> Result<(), RlError> {
fn resolve_all(prj: &mut Project) -> Result<(), Box<dyn Error>> {
prj.resolve_imports()?;
for id in prj.pool.key_iter() {
for id in prj.pool.keys() {
resolve(prj, id)?;
}
println!("Types resolved successfully!");
@@ -135,7 +135,8 @@ fn resolve_all(prj: &mut Project) -> Result<(), Box<dyn Error>> {
fn list_types(prj: &mut Project) {
println!(" name\x1b[30G type");
for (idx, Def { kind, node: Node { vis, kind: source, .. }, .. }) in prj.pool.iter().enumerate()
for (idx, Def { kind, node: Node { vis, kind: source, .. }, .. }) in
prj.pool.values().enumerate()
{
print!("{idx:3}: {vis}");
if let Some(Some(name)) = source.as_ref().map(NodeSource::name) {

6
compiler/cl-typeck/src/use_importer.rs
View File

@@ -24,7 +24,7 @@ type UseResult = Result<(), String>;
impl<'a> Project<'a> {
pub fn resolve_imports(&mut self) -> UseResult {
for id in self.pool.key_iter() {
for id in self.pool.keys() {
self.visit_def(id)?;
}
Ok(())
@@ -58,9 +58,7 @@ impl<'a> Project<'a> {
}
UseTree::Name(name) => self.visit_use_leaf(name, parent, c)?,
UseTree::Alias(from, to) => {
self.visit_use_alias(from, to, parent, c)?
}
UseTree::Alias(from, to) => self.visit_use_alias(from, to, parent, c)?,
UseTree::Glob => self.visit_use_glob(parent, c)?,
}
Ok(())