nomen-lang 0.1.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nomen-lang",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "The CLI for the Nomen programming language.",
   "keywords": [],
   "license": "ISC",

package/src/index.ts

@@ -14,7 +14,7 @@ import { parse_args, print_help, type Args } from "./args.ts";
 import { run_docs } from "./docs.ts";
 import render_errors, { render_warnings } from "./format_errors.ts";
 import { find_bundled, run_init } from "./init.ts";
-import { build_dir_for } from "./paths.ts";
+import { build_dir_for, outfile_for } from "./paths.ts";
 import { runTests } from "./test.ts";
 import type Config from "./types/Config.ts";
 
@@ -104,7 +104,12 @@ try {
 		const root = args.in ?? process.cwd();
 		const filter = args.filter ? new RegExp(args.filter) : undefined;
 		const arch = args.arch ?? "aarch64";
-		const ok = runTests(root, { arch, filter });
+		const ok = runTests(root, {
+			arch,
+			filter,
+			audit: args.audit,
+			audit_runtime: args.audit_runtime,
+		});
 		process.exit(ok ? 0 : 1);
 	}
 
@@ -165,6 +170,7 @@ try {
 		if (args.audit_runtime) config.audit_runtime = args.audit_runtime;
 		if (args.release) config.release = args.release;
 		if (args.fast_math) config.fast_math = args.fast_math;
+		if (args.out) config.out = args.out;
 
 		// Is the --in path a folder
 		if (fs.lstatSync(args.in).isDirectory()) {
@@ -365,7 +371,8 @@ function processFile(filename: string, config: Config, mode: Mode, program_args:
 	}
 
 	const basename = path.basename(filename, ".nm");
-	// Output lives in the project's `build/` — `build/test` for *.test.nm.
+	// Output lives in the project's `build/` — `build/test` for *.test.nm —
+	// unless an explicit --out names the linked binary.
 	const buildDir = build_dir_for(resolved_path, filename.endsWith(".test.nm"));
 	if (!fs.existsSync(buildDir)) {
 		fs.mkdirSync(buildDir, { recursive: true });
@@ -373,7 +380,10 @@ function processFile(filename: string, config: Config, mode: Mode, program_args:
 	const ext = arch === "aarch64" ? ".s" : platform === "macos" || platform === "ios" ? ".m" : ".c";
 	const headerfile = path.join(buildDir, "main.h");
 	const codefile = path.join(buildDir, basename + ext);
-	const outfile = path.join(buildDir, basename);
+	const outfile = outfile_for(resolved_path, filename.endsWith(".test.nm"), config.out);
+	if (!fs.existsSync(path.dirname(outfile))) {
+		fs.mkdirSync(path.dirname(outfile), { recursive: true });
+	}
 	fs.writeFileSync(headerfile, result.headers);
 	fs.writeFileSync(codefile, result.code);
 

package/src/paths.ts

@@ -26,3 +26,12 @@ export function build_dir_for(input_path: string, is_test: boolean): string {
 		? path.join(project_root_for(input_path), "build", "test")
 		: path.join(project_root_for(input_path), "build");
 }
+
+/**
+ * The linked binary path for `input_path`: an explicit `--out` wins,
+ * otherwise `<build dir>/<entry basename>`.
+ */
+export function outfile_for(input_path: string, is_test: boolean, out?: string): string {
+	if (out) return path.resolve(out);
+	return path.join(build_dir_for(input_path, is_test), path.basename(input_path, ".nm"));
+}

package/src/test.ts

@@ -259,6 +259,8 @@ export function run_test_file(
 	entry_path: string,
 	lib_path: string | undefined,
 	arch: string,
+	audit = false,
+	audit_runtime?: string,
 ): TestFileResult {
 	const start = performance.now();
 	const source_text = fs.readFileSync(entry_path, "utf8");
@@ -294,7 +296,10 @@ export function run_test_file(
 		return result;
 	}
 
-	const buildResult = build(parsed.root, { arch: arch as "aarch64" | "c", audit: false });
+	const buildResult = build(parsed.root, {
+		arch: arch as "aarch64" | "c",
+		audit,
+	});
 	if (buildResult.errors && buildResult.errors.length) {
 		result.ok = false;
 		result.crashed = buildResult.errors
@@ -306,6 +311,24 @@ export function run_test_file(
 
 	const buildDir = build_dir_for(resolved, true);
 	if (!fs.existsSync(buildDir)) fs.mkdirSync(buildDir, { recursive: true });
+	// With --audit, compile the audit runtime (malloc/free counting) and link
+	// it in; the generated main calls nomen_audit_check() at exit, printing
+	// "LEAK: N allocation(s)" when the balance is nonzero.
+	let audit_obj: string | undefined;
+	if (audit) {
+		const runtime_src = audit_runtime
+			? path.resolve(audit_runtime)
+			: find_audit_runtime(path.dirname(resolved));
+		if (!runtime_src || !fs.existsSync(runtime_src)) {
+			result.ok = false;
+			result.crashed =
+				"Audit enabled but audit_runtime.c was not found. Pass --audit-runtime <path>.";
+			result.ms = performance.now() - start;
+			return result;
+		}
+		audit_obj = path.join(buildDir, "audit_runtime.o");
+		execFileSync("clang", ["-c", runtime_src, "-o", audit_obj]);
+	}
 	const ext = arch === "aarch64" ? ".s" : ".c";
 	const codefile = path.join(buildDir, path.basename(entry_path, ".nm") + ext);
 	const outfile = path.join(buildDir, path.basename(entry_path, ".nm"));
@@ -316,8 +339,10 @@ export function run_test_file(
 
 	// Link the harness binary. The harness uses only Console/Time (printf,
 	// clock_gettime), so no platform frameworks are required.
+	const link_args = ["-o", outfile, codefile];
+	if (audit_obj) link_args.push(audit_obj);
 	try {
-		execFileSync("clang", ["-o", outfile, codefile], {
+		execFileSync("clang", link_args, {
 			encoding: "utf8",
 			stdio: ["ignore", "pipe", "pipe"],
 		});
@@ -427,6 +452,25 @@ export function report_file(result: TestFileResult): void {
 export interface RunTestsOptions {
 	arch?: string;
 	filter?: RegExp;
+	audit?: boolean;
+	audit_runtime?: string;
+}
+
+/**
+ * Locate audit_runtime.c for an audited test build: an explicit path wins,
+ * otherwise walk up from `dir` looking for a `src/audit_runtime.c` (the same
+ * convention the run/build commands use).
+ */
+function find_audit_runtime(dir: string): string | undefined {
+	let cur = dir;
+	for (let i = 0; i < 20; i++) {
+		const candidate = path.join(cur, "src", "audit_runtime.c");
+		if (fs.existsSync(candidate)) return candidate;
+		const parent = path.dirname(cur);
+		if (parent === cur) break;
+		cur = parent;
+	}
+	return undefined;
 }
 
 /** Discover, run, and report every `*.test.nm` under `root`. */
@@ -441,7 +485,7 @@ export function runTests(root: string, options: RunTestsOptions = {}): boolean {
 
 	const results: TestFileResult[] = [];
 	for (const file of files) {
-		const result = run_test_file(file, lib, arch);
+		const result = run_test_file(file, lib, arch, options.audit, options.audit_runtime);
 		report_file(result);
 		results.push(result);
 	}

package/src/types/Config.ts

@@ -6,4 +6,5 @@ export default interface Config {
 	audit_runtime?: string;
 	release?: boolean;
 	fast_math?: boolean;
+	out?: string;
 }