nomen-lang 0.6.6 → 0.6.8

package/package.json

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

package/src/args.ts

@@ -160,7 +160,7 @@ export function print_help(): void {
 			"  nomen check --in [file/folder]    Parse and check only",
 			"  nomen format [--in folder]        Reformat every .nm file",
 			"  nomen docs [--in file]            Generate markdown documentation",
-			"  nomen test [--in folder]          Discover and run *.test.nm files",
+			"  nomen test [--in folder]          Discover and run *.test.nm files (binary CWD = --in folder)",
 			"  nomen init <name>                 Scaffold a new project in ./<name>",
 			"  nomen lib-path                    Print the bundled System library path",
 			"",

package/src/index.ts

@@ -109,6 +109,7 @@ try {
 			filter,
 			audit: args.audit,
 			audit_runtime: args.audit_runtime,
+			release: args.release,
 		});
 		process.exit(ok ? 0 : 1);
 	}

package/src/test.ts

@@ -278,6 +278,8 @@ export function run_test_file(
 	arch: string,
 	audit = false,
 	audit_runtime?: string,
+	release = false,
+	cwd?: string,
 ): TestFileResult {
 	const start = performance.now();
 	const source_text = fs.readFileSync(entry_path, "utf8");
@@ -318,6 +320,7 @@ export function run_test_file(
 	const buildResult = build(parsed.root, {
 		arch: arch as "aarch64" | "c",
 		audit,
+		optimize: release,
 	});
 	if (buildResult.errors && buildResult.errors.length) {
 		result.ok = false;
@@ -363,11 +366,28 @@ export function run_test_file(
 	fs.writeFileSync(path.join(buildDir, "main.h"), buildResult.headers ?? "");
 	fs.writeFileSync(codefile, buildResult.code);
 
+	// Companion C (raw-block functions + the pool/fiber/file-scope C infra):
+	// `run`/`build` compile and link it next to the main TU. The aarch64 .s
+	// references its symbols via `bl` (spawn machinery), so dropping it makes
+	// companion-bearing test files fail to link. Same .m/.c rule as the
+	// run/build command's companion emission.
+	let companionfile: string | undefined;
+	if (buildResult.companion) {
+		const comp_ext = platform === "macos" || platform === "ios" ? ".m" : ".c";
+		companionfile = path.join(buildDir, path.basename(entry_path, ".nm") + "_companion" + comp_ext);
+		fs.writeFileSync(companionfile, buildResult.companion);
+	}
+
 	// Link the harness binary. Frameworks are passed on Apple platforms for
 	// the same reason as the run/build command: the joined source may reference
 	// ObjC runtime symbols even when the test body doesn't, and unused
-	// frameworks cost nothing at link time.
+	// frameworks cost nothing at link time. Release mode compiles the C (and
+	// companion C) with -O2, matching the run/build command; the aarch64 .s is
+	// assembled verbatim — its optimizations are the passes enabled via
+	// `optimize` above.
 	const link_args = ["-o", outfile, codefile];
+	if (companionfile) link_args.push(companionfile);
+	if (release) link_args.unshift("-O2");
 	if (audit_obj) link_args.push(audit_obj);
 	if (platform === "macos" || platform === "ios") {
 		link_args.push(
@@ -396,7 +416,11 @@ export function run_test_file(
 
 	// Run the binary and collect the records it streams over stdout. A
 	// non-zero exit (crash, abort) still surfaces whatever records were
-	// emitted before the crash; a timeout is treated as a crash.
+	// emitted before the crash; a timeout is treated as a crash. The
+	// documented CWD contract: the binary runs in the `--in` root (the
+	// folder `nomen test` scanned for *.test.nm files), so fixture paths in
+	// tests resolve against that folder regardless of where the CLI was
+	// invoked from.
 	let runStdout = "";
 	let crashed: string | undefined;
 	try {
@@ -405,6 +429,7 @@ export function run_test_file(
 			stdio: ["ignore", "pipe", "pipe"],
 			timeout: 30_000,
 			maxBuffer: 16 * 1024 * 1024,
+			cwd: cwd ?? process.cwd(),
 		});
 	} catch (err: any) {
 		runStdout = err.stdout ? err.stdout.toString() : "";
@@ -519,6 +544,7 @@ export interface RunTestsOptions {
 	filter?: RegExp;
 	audit?: boolean;
 	audit_runtime?: string;
+	release?: boolean;
 }
 
 /**
@@ -547,10 +573,21 @@ export function runTests(root: string, options: RunTestsOptions = {}): boolean {
 	console.log(`Found ${files.length} test file(s)\n`);
 
 	const startTime = performance.now();
+	// The CWD contract: test binaries run in the --in root, so relative
+	// fixture paths resolve there no matter where the CLI was invoked from.
+	const binary_cwd = path.resolve(root);
 
 	const results: TestFileResult[] = [];
 	for (const file of files) {
-		const result = run_test_file(file, lib, arch, options.audit, options.audit_runtime);
+		const result = run_test_file(
+			file,
+			lib,
+			arch,
+			options.audit,
+			options.audit_runtime,
+			options.release,
+			binary_cwd,
+		);
 		report_file(result);
 		results.push(result);
 	}