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

typeck.rs: Update for new stdlib layout; don't hardcode the root stdlib module.

Browse Source
This commit is contained in:
John 2024-07-25 07:09:12 -05:00
parent 479efbad73
commit 5ea8039a8a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,10 @@ use std::{
// Path to display in standard library errors // Path to display in standard library errors
const STDLIB_DISPLAY_PATH: &str = "stdlib/lib.cl"; const STDLIB_DISPLAY_PATH: &str = "stdlib/lib.cl";
// Statically included standard library // Statically included standard library
const STDLIB: &str = include_str!("../../../stdlib/lib.cl"); const PREAMBLE: &str = r"
pub mod std;
pub use std::preamble::*;
";
// Colors // Colors
const C_MAIN: &str = C_LISTING; const C_MAIN: &str = C_LISTING;
@ -33,7 +36,7 @@ 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();
let mut parser = Parser::new(Lexer::new(STDLIB)); let mut parser = Parser::new(Lexer::new(PREAMBLE));
let code = match parser.file() { let code = match parser.file() {
Ok(code) => code, Ok(code) => code,
Err(e) => { Err(e) => {
@ -41,9 +44,9 @@ fn main() -> Result<(), Box<dyn Error>> {
Err(e)? Err(e)?
} }
}; };
let code = inline_modules(code, concat!(env!("PWD"), "/stdlib")); // 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"));
Populator::new(&mut prj).visit_file(unsafe { TREES.push(code) }); Populator::new(&mut prj).visit_file(unsafe { TREES.push(code) });
// NameCollector::new(&mut prj).visit_file(unsafe { TREES.push(code) });
main_menu(&mut prj)?; main_menu(&mut prj)?;
Ok(()) Ok(())