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

crates work

Browse source
This commit is contained in:
nora 2023-07-31 18:22:59 +02:00
parent b3b0bc2e6f
commit c4cfa19fa9
7 changed files with 125 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/resolve.ts
View file

@ -20,7 +20,7 @@ import {
Typecked,
} from "./ast";
import { CompilerError, Span, spanMerge } from "./error";
import { Ids, unwrap } from "./utils";
import { ComplexMap, Ids, unwrap } from "./utils";
const BUILTIN_SET = new Set<string>(BUILTINS);
@ -34,8 +34,8 @@ export type CrateLoader = (
type Context = {
ast: Crate<Built>;
crates: Crate<Typecked>[];
modContentsCache: Map<ItemId, Map<string, ItemId>>;
newItemsById: Map<ItemId, Item<Resolved>>;
modContentsCache: ComplexMap<ItemId, Map<string, ItemId>>;
newItemsById: ComplexMap<ItemId, Item<Resolved>>;
crateLoader: CrateLoader;
crateId: Ids;
};
@ -56,15 +56,21 @@ function resolveModItem(
if ("contents" in mod) {
contents = new Map(mod.contents.map((item) => [item.node.name, item.id]));
} else {
console.log("resolve...");
const [loadedCrate, itsDeps] = cx.crateLoader(
item.node.name,
item.span,
cx.crateId,
cx.crates
);
console.log("hmm");
cx.crates.push(loadedCrate);
cx.crates.push(...itsDeps);
console.log(cx.crates);
contents = new Map(
loadedCrate.rootItems.map((item) => [item.node.name, item.id])
);
@ -83,8 +89,8 @@ export function resolve(
const cx: Context = {
ast,
crates: [],
modContentsCache: new Map(),
newItemsById: new Map(),
modContentsCache: new ComplexMap(),
newItemsById: new ComplexMap(),
crateLoader,
crateId,
};
@ -106,7 +112,7 @@ function resolveModule(
modName: string[],
contents: Item<Built>[]
): Item<Resolved>[] {
const items = new Map<string, number>();
const items = new Map<string, ItemId>();
contents.forEach((item) => {
const existing = items.get(item.node.name);
@ -266,11 +272,7 @@ function resolveModule(
if (res.kind === "item") {
const module = unwrap(cx.ast.itemsById.get(res.id));
console.log("nested", module.kind, res.id, cx.ast.itemsById);
if (module.kind === "mod" || module.kind === "extern") {
console.log("resolve");
if (typeof expr.field.value === "number") {
throw new CompilerError(
"module contents cannot be indexed with a number",