nomen-lang 0.0.19 → 0.2.0

package/package.json

@@ -1,35 +1,39 @@
 {
-	"name": "nomen-lang",
-	"version": "0.0.19",
-	"description": "The CLI for the Nomen programming language.",
-	"keywords": [],
-	"license": "ISC",
-	"author": "",
-	"bin": {
-		"nomen": "dist/index.mjs"
-	},
-	"files": [
-		"dist",
-		"src",
-		"core",
-		"NOMEN_AGENTS.md"
-	],
-	"type": "module",
-	"scripts": {
-		"build": "node scripts/bundle-assets.mjs && vp pack",
-		"dev": "node scripts/bundle-assets.mjs && vp pack --watch",
-		"test": "vp test",
-		"check": "vp check",
-		"format": "vp check --fix",
-		"prepare": "vp config",
-		"go": "tsx src/index.ts",
-		"register": "pnpm build && pnpm add -g ."
-	},
-	"devDependencies": {
-		"@types/node": "^26.2.0",
-		"chokidar": "^5.0.0",
-		"tsx": "^4.23.12",
-		"typescript": "^7.0.2",
-		"vite-plus": "catalog:"
-	}
-}
+  "name": "nomen-lang",
+  "version": "0.2.0",
+  "description": "The CLI for the Nomen programming language.",
+  "keywords": [],
+  "license": "ISC",
+  "author": "",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/andrewjk/nomen",
+    "directory": "cli"
+  },
+  "bin": {
+    "nomen": "dist/index.mjs"
+  },
+  "files": [
+    "dist",
+    "src",
+    "core",
+    "NOMEN_AGENTS.md"
+  ],
+  "type": "module",
+  "devDependencies": {
+    "@types/node": "^26.2.0",
+    "chokidar": "^5.0.0",
+    "tsx": "^4.23.12",
+    "typescript": "^7.0.2",
+    "vite-plus": "0.2.9"
+  },
+  "scripts": {
+    "build": "node scripts/bundle-assets.mjs && vp pack",
+    "dev": "node scripts/bundle-assets.mjs && vp pack --watch",
+    "test": "vp test",
+    "check": "vp check",
+    "format": "vp check --fix",
+    "go": "tsx src/index.ts",
+    "register": "pnpm build && pnpm add -g ."
+  }
+}

package/src/args.ts

@@ -12,6 +12,10 @@ export interface Args {
 	audit: boolean;
 	audit_runtime?: string;
 	check: boolean;
+	release: boolean;
+	/** Opt in to FP reassociation: float reductions vectorize under NEON
+	 *  (results may differ in the last ulp vs the scalar loop). */
+	fast_math: boolean;
 	// Everything after a bare `--` on the command line — forwarded verbatim to
 	// the compiled program by `nomen run`. Lets a program receive its own argv
 	// (`nomen run --in app/main.nm -- arg1 arg2`).
@@ -42,6 +46,9 @@ const BOOLEAN_OPTIONS: Map<string, string> = new Map([
 	["w", "watch"],
 	["audit", "audit"],
 	["check", "check"],
+	["release", "release"],
+	["r", "release"],
+	["fast-math", "fast_math"],
 ]);
 
 const DEFAULTS: Partial<Args> = {
@@ -49,6 +56,8 @@ const DEFAULTS: Partial<Args> = {
 	watch: false,
 	audit: false,
 	check: false,
+	release: false,
+	fast_math: false,
 };
 
 function set(args: Args, key: string, value: string | boolean): void {
@@ -166,6 +175,8 @@ export function print_help(): void {
 			"  --lib, -l <path>        Path to System library directory (containing package.jsonc)",
 			"  --audit                 Audit the generated program for memory issues",
 			"  --audit-runtime <path>  Path to audit_runtime.c, linked in when --audit is set",
+			"  --release, -r           Build with optimizations (clang -O2; asm passes on aarch64)",
+			"  --fast-math             Allow FP reassociation (float loop reductions vectorize on aarch64)",
 			"  --check                 For `nomen format`: report files that would change",
 			"  -h, --help              Show this help",
 		].join("\n"),

package/src/index.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);
 	}
 
@@ -163,6 +168,8 @@ try {
 		if (args.lib) config.lib = args.lib;
 		if (args.audit) config.audit = args.audit;
 		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;
 
 		// Is the --in path a folder
 		if (fs.lstatSync(args.in).isDirectory()) {
@@ -349,7 +356,13 @@ function processFile(filename: string, config: Config, mode: Mode, program_args:
 		return;
 	}
 
-	const result = build(parsed.root, { arch, platform, audit: config.audit });
+	const result = build(parsed.root, {
+		arch,
+		platform,
+		audit: config.audit,
+		optimize: config.release,
+		fast_math: config.fast_math,
+	});
 
 	if (result.errors && result.errors.length > 0) {
 		console.log(render_errors(input, result.errors));
@@ -391,7 +404,12 @@ function processFile(filename: string, config: Config, mode: Mode, program_args:
 		platform === "macos" || platform === "ios"
 			? " -framework CoreGraphics -framework Foundation -framework AppKit -lobjc"
 			: "";
-	execSync(`clang -o ${outfile} ${link_inputs}${framework_flags}`);
+	// Release mode compiles the C (and aarch64 companion C) with -O2,
+	// matching the optimized builds other toolchains produce by default.
+	// The aarch64 .s itself is assembled verbatim — its optimizations are
+	// the codegen passes enabled via `optimize` above.
+	const opt_flags = config.release ? " -O2" : "";
+	execSync(`clang${opt_flags} -o ${outfile} ${link_inputs}${framework_flags}`);
 
 	if (mode === "build") {
 		const buildTime = performance.now();

package/src/init.ts

@@ -31,7 +31,7 @@ pub func main = (Init init) {
 `;
 
 const TEST_NM = `import System
-import System/Test
+import System::Test
 
 pub func test_add = (ref Tester t) {
 	t.expect(add(2, 2) == 4, "2 + 2 should equal 4")

package/src/test.ts

@@ -183,7 +183,7 @@ export function generate_harness(tests: TestFunction[], benches: BenchFunction[]
 		})
 		.join("\n");
 
-	let main = "\nimport System\nimport System/Test\n\npub func main = () {\n";
+	let main = "\nimport System\nimport System::Test\n\npub func main = () {\n";
 	main += "\tvar Tester t = Tester()\n";
 	for (const test of tests) {
 		main += `\tt.begin_test("${escape_nm_string(test.name)}")\n`;
@@ -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

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