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

typeck: Replace unsafe static mut with tree interning,

Browse Source 
I used tree interning here, because the interner already contains the necessary locks to make it Sync, and I was lazy. Be my guest if you want to do something else.

The computational overhead of interning the ASTs here is negligible, since this is all CLI code anyway.
This commit is contained in:
John 2025-01-16 21:16:46 -06:00
parent e5a51ba6c2
commit 3cda3d83d9
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
use cl_structures::intern::string_interner::StringInterner;
use cl_typeck::{entry::Entry, stage::*, table::Table, type_expression::TypeExpression}; use cl_typeck::{entry::Entry, stage::*, table::Table, type_expression::TypeExpression};
use cl_ast::{ use cl_ast::{
@ -8,10 +7,12 @@ use cl_ast::{
}; };
use cl_lexer::Lexer; use cl_lexer::Lexer;
use cl_parser::{inliner::ModuleInliner, Parser}; use cl_parser::{inliner::ModuleInliner, Parser};
use cl_structures::intern::string_interner::StringInterner;
use repline::{error::Error as RlError, prebaked::*}; use repline::{error::Error as RlError, prebaked::*};
use std::{ use std::{
error::Error, error::Error,
path::{self, PathBuf}, path::{self, PathBuf},
sync::LazyLock,
}; };
// Path to display in standard library errors // Path to display in standard library errors
@ -30,11 +31,6 @@ const C_BYID: &str = "\x1b[95m";
const C_ERROR: &str = "\x1b[31m"; const C_ERROR: &str = "\x1b[31m";
const C_LISTING: &str = "\x1b[38;5;117m"; const C_LISTING: &str = "\x1b[38;5;117m";
/// A home for immutable intermediate ASTs
///
/// TODO: remove this.
static mut TREES: TreeManager = TreeManager::new();
fn main() -> Result<(), Box<dyn Error>> { fn main() -> Result<(), Box<dyn Error>> {
let mut prj = Table::default(); let mut prj = Table::default();
@ -48,7 +44,7 @@ fn main() -> Result<(), Box<dyn Error>> {
}; };
// This code is special - it gets loaded from a hard-coded project directory (for now) // This code is special - it gets loaded from a hard-coded project directory (for now)
let code = inline_modules(code, concat!(env!("CARGO_MANIFEST_DIR"), "/../../stdlib")); let code = inline_modules(code, concat!(env!("CARGO_MANIFEST_DIR"), "/../../stdlib"));
Populator::new(&mut prj).visit_file(unsafe { TREES.push(code) }); Populator::new(&mut prj).visit_file(interned(code));
main_menu(&mut prj)?; main_menu(&mut prj)?;
Ok(()) Ok(())
@ -98,8 +94,8 @@ fn enter_code(prj: &mut Table) -> Result<(), RlError> {
let code = Parser::new(Lexer::new(line)).parse()?; let code = Parser::new(Lexer::new(line)).parse()?;
let code = inline_modules(code, ""); let code = inline_modules(code, "");
let code = WhileElseDesugar.fold_file(code); let code = WhileElseDesugar.fold_file(code);
// Safety: this is totally unsafe
Populator::new(prj).visit_file(unsafe { TREES.push(code) }); Populator::new(prj).visit_file(interned(code));
Ok(Response::Accept) Ok(Response::Accept)
}) })
} }
@ -222,7 +218,7 @@ fn import_files(table: &mut Table) -> Result<(), RlError> {
} }
}; };
Populator::new(table).visit_file(unsafe { TREES.push(code) }); Populator::new(table).visit_file(interned(code));
println!("...Imported!"); println!("...Imported!");
Ok(Response::Accept) Ok(Response::Accept)
@ -322,18 +318,11 @@ fn banner() {
); );
} }
/// Keeps leaked references to past ASTs, for posterity:tm: /// Interns a [File](cl_ast::File), returning a static reference to it.
struct TreeManager { fn interned(file: cl_ast::File) -> &'static cl_ast::File {
trees: Vec<&'static cl_ast::File>, use cl_structures::intern::{interned::Interned, typed_interner::TypedInterner};
} static INTERNER: LazyLock<TypedInterner<'static, cl_ast::File>> =
LazyLock::new(Default::default);
impl TreeManager { Interned::to_ref(&INTERNER.get_or_insert(file))
const fn new() -> Self {
Self { trees: vec![] }
}
fn push(&mut self, tree: cl_ast::File) -> &'static cl_ast::File {
let ptr = Box::leak(Box::new(tree));
self.trees.push(ptr);
ptr
}
} }