cleaned up error messages

source/compiler/codegen/expression/helper.ts

@@ -1,4 +1,5 @@
 import type * as Syntax from "~/bnf/syntax.d.ts";
+import { red } from "https://deno.land/[email protected]/fmt/colors.ts";
 
 import { AssertUnreachable, LatentOffset } from "~/helper.ts";
 import { BasePointerType, LinearType } from "~/compiler/codegen/expression/type.ts";
@@ -60,9 +61,15 @@ export function ResolveLinearType(ctx: Context, type: LinearType, ref: Reference
 	if (strict) {
 		const errs = type.getCompositionErrors();
 		if (errs) {
-			console.error(`Unable to compose value due to some arguments being uninitialized since: ${errs.map(x => x.start.toString()).join(", ")}\n`
+			const range = ref.clone();
+			for (const err of errs) {
+				range.span(err);
+			}
+
+			console.error(`${red("Error")}: Unable to compose value due to some arguments being uninitialized since: ${errs.map(x => x.start.toString()).join(", ")}\n`
 				+ errs.map(x => SourceView(ctx.file.path, ctx.file.name, x, true)).join("")
-				+ SourceView(ctx.file.path, ctx.file.name, ref, false)
+				+ SourceView(ctx.file.path, ctx.file.name, ref, true)
+				+ `  ${ctx.file.name} ${range.toString()}\n`
 			);
 
 			ctx.file.markFailure();

source/compiler/package.ts

@@ -6,21 +6,23 @@ import { File } from "~/compiler/file.ts"
 export default class Package {
 	project: Project;
 	files: File[];
+	name: string;
 	cwd: string;
 
 	failed: boolean;
 
-	constructor(project: Project, base: string) {
+	constructor(project: Project, base: string, name: string = "~") {
 		this.project = project;
 		this.failed = false;
 		this.files = [];
+
+		this.name = name;
 		this.cwd = dirname(base);
 	}
 
 	import(filePath: string) {
-		const name = relative(this.cwd, filePath);
 		const data = Deno.readTextFileSync(filePath);
-		const file = new File(this, filePath, name, data);
+		const file = new File(this, filePath, `${this.name}/${relative(this.cwd, filePath)}`, data);
 		this.files.push(file);
 
 		return file;

source/parser.ts

@@ -67,14 +67,14 @@ function SingleLine(path: string, name: string, range: ReferenceRange, compact?:
 	line = line.trimStart();
 	pad -= line.length;
 
-	const margin = `${range.start.line} │ `;
+	const margin = ` ${range.start.line} │ `;
 	const underline = "\n"
 		+ " ".repeat(margin.length + range.start.col - pad)
 		+ "^".repeat(Math.max(1, range.end.col - range.start.col))
 		+ "\n";
 
 	const body = margin + line + underline;
-	return compact ? body : `  ${name}: ${range.toString()}\n`;
+	return compact ? body : `${body}  ${name}: ${range.toString()}\n`;
 }
 
 function MultiLine(path: string, name: string, range: ReferenceRange, compact?: boolean) {