Noratrieb/riverdelta
1
0
Fork 0
mirror of https://github.com/Noratrieb/riverdelta.git synced 2026-01-14 16:35:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move rt to separate file and make loader understand it

Browse source
This commit is contained in:
nora 2023-08-02 20:19:14 +02:00
parent 309a286a1a
commit a1d04d264e
5 changed files with 100 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/loader.ts
View file

@ -13,9 +13,22 @@ export function loadModuleFile(
moduleName: string,
span: Span
): LoadedFile {
let searchDir: string;
if (relativeTo.endsWith(".mod.nil")) {
// x/uwu.mod.nil searches in x/
searchDir = path.dirname(relativeTo);
} else if (relativeTo.endsWith(".nil")) {
throw new CompilerError(
`.nil files cannot have submodules. use .mod.nil in a subdirectory`,
span
);
} else {
searchDir = relativeTo;
}
const options = [
path.join(relativeTo, `${moduleName}.nil`),
path.join(relativeTo, moduleName, `${moduleName}.mod.nil`),
path.join(searchDir, `${moduleName}.nil`),
path.join(searchDir, moduleName, `${moduleName}.mod.nil`),
];
let content: string | undefined = undefined;
@ -45,15 +58,17 @@ export const loadCrate: CrateLoader = (
// We really, really want a good algorithm for finding crates.
// But right now we just look for files in the CWD.
const existing = gcx.finalizedCrates.find((crate) => crate.packageName === name);
const existing = gcx.finalizedCrates.find(
(crate) => crate.packageName === name
);
if (existing) {
return existing;
}
const file = loadModuleFile(".", name, span);
return withErrorPrinter(
(): DepCrate => {
const file = loadModuleFile(".", name, span);
const crateId = gcx.crateId.next();
const tokens = tokenize(file);