c-next 0.2.11 → 0.2.13

package/grammar/C.g4

@@ -74,7 +74,7 @@ unaryExpression
     : ('++' | '--' | 'sizeof')* (
         postfixExpression
         | unaryOperator castExpression
-        | ('sizeof' | '_Alignof') '(' typeName ')'
+        | ('sizeof' | '_Alignof' | '__alignof__' | '__alignof') '(' typeName ')'
         | '&&' Identifier // GCC extension address of label
     )
     ;
@@ -200,6 +200,7 @@ storageClassSpecifier
     | 'extern'
     | 'static'
     | '_Thread_local'
+    | '__thread'      // GCC extension
     | 'auto'
     | 'register'
     ;
@@ -213,18 +214,23 @@ typeSpecifier
     | 'float'
     | 'double'
     | 'signed'
+    | '__signed'     // GCC extension
+    | '__signed__'   // GCC extension
     | 'unsigned'
     | '_Bool'
     | '_Complex'
     | '__m128'
     | '__m128d'
     | '__m128i'
+    | '__int128'     // GCC 128-bit integer
+    | '__int128_t'   // GCC 128-bit signed
+    | '__uint128_t'  // GCC 128-bit unsigned
     | '__extension__' '(' ('__m128' | '__m128d' | '__m128i') ')'
     | atomicTypeSpecifier
     | structOrUnionSpecifier
     | enumSpecifier
     | typedefName
-    | '__typeof__' '(' constantExpression ')' // GCC extension
+    | ('__typeof__' | '__typeof') '(' constantExpression ')' // GCC extension
     ;
 
 structOrUnionSpecifier
@@ -283,14 +289,21 @@ atomicTypeSpecifier
 
 typeQualifier
     : 'const'
+    | '__const'      // GCC extension
+    | '__const__'    // GCC extension
     | 'restrict'
+    | '__restrict'   // GCC extension
+    | '__restrict__' // GCC extension
     | 'volatile'
+    | '__volatile'   // GCC extension
+    | '__volatile__' // GCC extension
     | '_Atomic'
     ;
 
 functionSpecifier
     : 'inline'
     | '_Noreturn'
+    | '__inline'   // GCC extension
     | '__inline__' // GCC extension
     | '__stdcall'
     | gccAttributeSpecifier
@@ -329,7 +342,7 @@ vcSpecificModifer
     ;
 
 gccDeclaratorExtension
-    : '__asm' '(' StringLiteral+ ')'
+    : ('__asm' | '__asm__') '(' StringLiteral+ ')' // GCC asm in declarators
     | gccAttributeSpecifier
     ;
 
@@ -431,7 +444,7 @@ statement
     | selectionStatement
     | iterationStatement
     | jumpStatement
-    | ('__asm' | '__asm__') ('volatile' | '__volatile__') '(' (
+    | ('__asm' | '__asm__') ('volatile' | '__volatile' | '__volatile__') '(' (
         logicalOrExpression (',' logicalOrExpression)*
     )? (':' (logicalOrExpression (',' logicalOrExpression)*)?)* ')' ';'
     ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c-next",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "A safer C for embedded systems development. Transpiles to clean, readable C.",
   "packageManager": "npm@11.9.0",
   "type": "module",
@@ -92,12 +92,12 @@
   "devDependencies": {
     "@types/node": "^25.2.1",
     "@types/yargs": "^17.0.35",
-    "esbuild": "^0.27.3",
     "@vitest/coverage-v8": "^4.0.18",
     "antlr4ng-cli": "^2.0.0",
     "chalk": "^5.6.2",
     "cspell": "^9.6.4",
     "dependency-cruiser": "^17.3.7",
+    "esbuild": "^0.27.3",
     "husky": "^9.1.7",
     "knip": "^5.83.1",
     "lint-staged": "^16.2.7",
@@ -111,8 +111,8 @@
     "@n1ru4l/toposort": "^0.0.1",
     "antlr4ng": "^3.0.16",
     "cosmiconfig": "^9.0.0",
-    "fast-glob": "^3.3.3",
     "flat-cache": "^6.1.20",
+    "immer": "^11.1.4",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "yargs": "^18.0.0"

package/src/__tests__/index.test.ts

@@ -48,7 +48,7 @@ describe("index.ts (CLI entry point)", () => {
 
   it("calls Runner.execute when shouldRun is true", async () => {
     const mockConfig = {
-      inputs: ["test.cnx"],
+      input: "test.cnx",
       outputPath: "",
       includeDirs: [],
       defines: {},

package/src/cli/CleanCommand.ts

@@ -3,7 +3,7 @@
  * Deletes generated files (.c, .cpp, .h, .hpp) that have matching .cnx sources
  */
 
-import { basename, join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { unlinkSync } from "node:fs";
 import InputExpansion from "../transpiler/data/InputExpansion";
 import PathResolver from "../transpiler/data/PathResolver";
@@ -13,12 +13,12 @@ import PathResolver from "../transpiler/data/PathResolver";
  */
 class CleanCommand {
   /**
-   * Discover CNX files from inputs.
+   * Discover CNX files from entry point.
    * Returns null if none found or on error.
    */
-  private static discoverCnxFiles(inputs: string[]): string[] | null {
+  private static discoverCnxFiles(input: string): string[] | null {
     try {
-      const cnxFiles = InputExpansion.expandInputs(inputs);
+      const cnxFiles = InputExpansion.expandInputs([input]);
       if (cnxFiles.length === 0) {
         console.log("No .cnx files found. Nothing to clean.");
         return null;
@@ -54,21 +54,17 @@ class CleanCommand {
   /**
    * Execute the clean command
    *
-   * @param inputs - Input files or directories (source locations)
+   * @param input - Entry point .cnx file
    * @param outDir - Output directory for code files
    * @param headerOutDir - Optional separate output directory for headers
    */
-  static execute(
-    inputs: string[],
-    outDir: string,
-    headerOutDir?: string,
-  ): void {
+  static execute(input: string, outDir: string, headerOutDir?: string): void {
     if (!outDir) {
       console.log("No output directory specified. Nothing to clean.");
       return;
     }
 
-    const cnxFiles = this.discoverCnxFiles(inputs);
+    const cnxFiles = this.discoverCnxFiles(input);
     if (!cnxFiles) return;
 
     const resolvedOutDir = resolve(outDir);
@@ -77,7 +73,7 @@ class CleanCommand {
       : resolvedOutDir;
 
     const pathResolver = new PathResolver({
-      inputs,
+      inputs: [dirname(resolve(input))],
       outDir,
       headerOutDir,
     });

package/src/cli/Cli.ts

@@ -5,6 +5,7 @@
  */
 
 import { dirname, resolve } from "node:path";
+import { existsSync, statSync } from "node:fs";
 import ArgParser from "./ArgParser";
 import ConfigLoader from "./ConfigLoader";
 import ConfigPrinter from "./ConfigPrinter";
@@ -65,17 +66,39 @@ class Cli {
       return { shouldRun: false, exitCode: 0 };
     }
 
-    // Validate inputs
-    if (config.inputs.length === 0) {
-      console.error("Error: No input files specified");
-      console.error("Run 'cnext --help' for usage information");
+    // Validate single entry point
+    if (args.inputFiles.length > 1) {
+      console.error("Error: Only one entry point file is supported");
+      console.error(
+        "Other files are discovered automatically via #include directives",
+      );
+      return { shouldRun: false, exitCode: 1 };
+    }
+
+    if (!config.input) {
+      console.error("Error: No input file specified");
+      console.error("Usage: cnext <file.cnx>");
+      return { shouldRun: false, exitCode: 1 };
+    }
+
+    const resolvedInput = resolve(config.input);
+    if (!existsSync(resolvedInput)) {
+      console.error(`Error: Input not found: ${config.input}`);
+      return { shouldRun: false, exitCode: 1 };
+    }
+
+    if (statSync(resolvedInput).isDirectory()) {
+      console.error(
+        "Error: Directory input not supported. Specify an entry point file.",
+      );
+      console.error(`Example: cnext ${config.input}/main.cnx`);
       return { shouldRun: false, exitCode: 1 };
     }
 
     // Handle --clean: delete generated files
     if (args.cleanMode) {
       CleanCommand.execute(
-        config.inputs,
+        config.input,
         config.outputPath,
         config.headerOutDir,
       );
@@ -94,7 +117,7 @@ class Cli {
     fileConfig: IFileConfig,
   ): ICliConfig {
     const rawConfig: ICliConfig = {
-      inputs: args.inputFiles,
+      input: args.inputFiles[0] ?? "",
       outputPath: args.outputPath || fileConfig.output || "",
       // Merge include dirs: config includes come first, CLI includes override/append
       includeDirs: [...(fileConfig.include ?? []), ...args.includeDirs],

package/src/cli/Runner.ts

@@ -3,19 +3,13 @@
  * Executes the transpiler with the given configuration
  */
 
-import { dirname, resolve } from "node:path";
+import { basename, dirname, resolve } from "node:path";
 import { existsSync, statSync, renameSync } from "node:fs";
-import InputExpansion from "../transpiler/data/InputExpansion";
 import Transpiler from "../transpiler/Transpiler";
 import ICliConfig from "./types/ICliConfig";
 import ResultPrinter from "./ResultPrinter";
 import ITranspilerResult from "../transpiler/types/ITranspilerResult";
-
-/** Result of categorizing inputs into directories and files */
-interface ICategorizedInputs {
-  srcDirs: string[];
-  explicitFiles: string[];
-}
+import InputExpansion from "../transpiler/data/InputExpansion";
 
 /** Result of determining output path */
 interface IOutputPathResult {
@@ -32,19 +26,21 @@ class Runner {
    * @param config - CLI configuration
    */
   static async execute(config: ICliConfig): Promise<void> {
-    const { srcDirs, explicitFiles } = this._categorizeInputs(config.inputs);
-    const files = this._expandInputFiles(config.inputs);
+    const resolvedInput = resolve(config.input);
     const { outDir, explicitOutputFile } = this._determineOutputPath(
       config,
-      files,
+      resolvedInput,
     );
 
+    // Infer basePath from entry file's parent directory if not set
+    const basePath = config.basePath || dirname(resolvedInput);
+
     const pipeline = new Transpiler({
-      inputs: [...srcDirs, ...explicitFiles],
+      input: resolvedInput,
       includeDirs: config.includeDirs,
       outDir,
       headerOutDir: config.headerOutDir,
-      basePath: config.basePath,
+      basePath,
       preprocess: config.preprocess,
       defines: config.defines,
       cppRequired: config.cppRequired,
@@ -54,52 +50,20 @@ class Runner {
       debugMode: config.debugMode,
     });
 
-    const result = await pipeline.transpile({ kind: "files" });
-    this._renameOutputIfNeeded(result, explicitOutputFile);
-
-    ResultPrinter.print(result);
-    process.exit(result.success ? 0 : 1);
-  }
-
-  /**
-   * Categorize inputs into directories and explicit files.
-   */
-  private static _categorizeInputs(inputs: string[]): ICategorizedInputs {
-    const srcDirs: string[] = [];
-    const explicitFiles: string[] = [];
-
-    for (const input of inputs) {
-      const resolvedPath = resolve(input);
-      const isDir =
-        existsSync(resolvedPath) && statSync(resolvedPath).isDirectory();
-      if (isDir) {
-        srcDirs.push(resolvedPath);
-      } else {
-        explicitFiles.push(resolvedPath);
-      }
+    if (InputExpansion.isCppEntryPoint(resolvedInput)) {
+      console.log(`Scanning ${basename(resolvedInput)} for C-Next includes...`);
     }
 
-    return { srcDirs, explicitFiles };
-  }
+    const result = await pipeline.transpile({ kind: "files" });
 
-  /**
-   * Expand input paths to .cnx files.
-   */
-  private static _expandInputFiles(inputs: string[]): string[] {
-    let files: string[];
-    try {
-      files = InputExpansion.expandInputs(inputs);
-    } catch (error) {
-      console.error(`Error: ${error}`);
-      process.exit(1);
+    if (InputExpansion.isCppEntryPoint(resolvedInput)) {
+      this._printCppEntryPointResult(result, resolvedInput);
     }
 
-    if (files.length === 0) {
-      console.error("Error: No .cnx files found");
-      process.exit(1);
-    }
+    this._renameOutputIfNeeded(result, explicitOutputFile);
 
-    return files;
+    ResultPrinter.print(result);
+    process.exit(result.success ? 0 : 1);
   }
 
   /**
@@ -107,10 +71,10 @@ class Runner {
    */
   private static _determineOutputPath(
     config: ICliConfig,
-    files: string[],
+    resolvedInput: string,
   ): IOutputPathResult {
     if (!config.outputPath) {
-      return { outDir: dirname(files[0]), explicitOutputFile: null };
+      return { outDir: dirname(resolvedInput), explicitOutputFile: null };
     }
 
     const isExplicitFile =
@@ -127,13 +91,6 @@ class Runner {
 
     // Explicit output file
     if (isExplicitFile) {
-      if (files.length > 1) {
-        console.error(
-          "Error: Cannot use explicit output filename with multiple input files",
-        );
-        console.error("Use a directory path instead: -o <directory>/");
-        process.exit(1);
-      }
       return {
         outDir: dirname(config.outputPath),
         explicitOutputFile: resolve(config.outputPath),
@@ -165,6 +122,29 @@ class Runner {
       result.outputFiles[0] = explicitOutputFile;
     }
   }
+
+  /**
+   * Print result message for C/C++ entry point scanning.
+   */
+  private static _printCppEntryPointResult(
+    result: ITranspilerResult,
+    resolvedInput: string,
+  ): void {
+    if (result.filesProcessed === 0) {
+      console.log("No C-Next files found in include tree. To get started:");
+      console.log("  1. Create a .cnx file (e.g., led.cnx)");
+      console.log("  2. Run: cnext led.cnx");
+      console.log("  3. Include the generated header in your C/C++ code");
+      console.log(`  4. Re-run: cnext ${basename(resolvedInput)}`);
+    } else {
+      const fileNames = result.files
+        .map((f) => basename(f.sourcePath))
+        .join(", ");
+      console.log(
+        `Found ${result.filesProcessed} C-Next source file(s): ${fileNames}`,
+      );
+    }
+  }
 }
 
 export default Runner;

package/src/cli/__tests__/CleanCommand.test.ts

@@ -35,7 +35,7 @@ describe("CleanCommand", () => {
 
   describe("execute", () => {
     it("reports no output directory when outDir is empty", () => {
-      CleanCommand.execute(["src/"], "", undefined);
+      CleanCommand.execute("src/", "", undefined);
 
       expect(consoleLogSpy).toHaveBeenCalledWith(
         "No output directory specified. Nothing to clean.",
@@ -45,7 +45,7 @@ describe("CleanCommand", () => {
     it("reports no files found when no .cnx files exist", () => {
       vi.mocked(InputExpansion.expandInputs).mockReturnValue([]);
 
-      CleanCommand.execute(["src/"], "build/", undefined);
+      CleanCommand.execute("src/", "build/", undefined);
 
       expect(consoleLogSpy).toHaveBeenCalledWith(
         "No .cnx files found. Nothing to clean.",
@@ -57,7 +57,7 @@ describe("CleanCommand", () => {
         throw new Error("Path not found");
       });
 
-      CleanCommand.execute(["nonexistent/"], "build/", undefined);
+      CleanCommand.execute("nonexistent/", "build/", undefined);
 
       expect(consoleErrorSpy).toHaveBeenCalledWith(
         "Error: Error: Path not found",
@@ -72,7 +72,7 @@ describe("CleanCommand", () => {
       // Mock unlinkSync to succeed for all calls
       vi.mocked(fs.unlinkSync).mockImplementation(() => {});
 
-      CleanCommand.execute(["/project/src/"], "/project/build/", undefined);
+      CleanCommand.execute("/project/src/", "/project/build/", undefined);
 
       // Should try to delete .c, .cpp, .h, .hpp files
       expect(fs.unlinkSync).toHaveBeenCalledTimes(4);
@@ -89,7 +89,7 @@ describe("CleanCommand", () => {
       vi.mocked(fs.unlinkSync).mockImplementation(() => {});
 
       CleanCommand.execute(
-        ["/project/src/"],
+        "/project/src/",
         "/project/build/",
         "/project/include/",
       );
@@ -127,7 +127,7 @@ describe("CleanCommand", () => {
         throw enoentError;
       });
 
-      CleanCommand.execute(["/project/src/"], "/project/build/", undefined);
+      CleanCommand.execute("/project/src/", "/project/build/", undefined);
 
       expect(consoleLogSpy).toHaveBeenCalledWith(
         "No generated files found to delete.",
@@ -146,7 +146,7 @@ describe("CleanCommand", () => {
         throw permError;
       });
 
-      CleanCommand.execute(["/project/src/"], "/project/build/", undefined);
+      CleanCommand.execute("/project/src/", "/project/build/", undefined);
 
       expect(consoleErrorSpy).toHaveBeenCalled();
       expect(consoleLogSpy).toHaveBeenCalledWith(
@@ -168,7 +168,7 @@ describe("CleanCommand", () => {
       vi.mocked(fs.unlinkSync).mockImplementation(() => {});
 
       CleanCommand.execute(
-        ["/project/src/main.cnx"],
+        "/project/src/main.cnx",
         "/project/build/",
         undefined,
       );
@@ -187,7 +187,7 @@ describe("CleanCommand", () => {
 
       vi.mocked(fs.unlinkSync).mockImplementation(() => {});
 
-      CleanCommand.execute(["/project/src/"], "/project/build/", undefined);
+      CleanCommand.execute("/project/src/", "/project/build/", undefined);
 
       const unlinkCalls = vi.mocked(fs.unlinkSync).mock.calls;
       const paths = unlinkCalls.map((call) => call[0] as string);
@@ -204,7 +204,7 @@ describe("CleanCommand", () => {
 
       vi.mocked(fs.unlinkSync).mockImplementation(() => {});
 
-      CleanCommand.execute(["/project/src/"], "/project/build/", undefined);
+      CleanCommand.execute("/project/src/", "/project/build/", undefined);
 
       const unlinkCalls = vi.mocked(fs.unlinkSync).mock.calls;
       const paths = unlinkCalls.map((call) => call[0] as string);

package/src/cli/__tests__/Cli.test.ts

@@ -10,6 +10,7 @@
  */
 
 import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { existsSync, statSync } from "node:fs";
 import Cli from "../Cli";
 import ArgParser from "../ArgParser";
 import ConfigLoader from "../ConfigLoader";
@@ -31,6 +32,14 @@ vi.mock("../PathNormalizer", () => ({
     normalizeConfig: (config: unknown) => config,
   },
 }));
+vi.mock("node:fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:fs")>();
+  return {
+    ...actual,
+    existsSync: vi.fn(() => true),
+    statSync: vi.fn(() => ({ isDirectory: () => false })),
+  };
+});
 
 describe("Cli", () => {
   let mockParsedArgs: IParsedArgs;
@@ -62,6 +71,10 @@ describe("Cli", () => {
     // Default mocks
     vi.mocked(ArgParser.parse).mockReturnValue(mockParsedArgs);
     vi.mocked(ConfigLoader.load).mockReturnValue({});
+    vi.mocked(existsSync).mockReturnValue(true);
+    vi.mocked(statSync).mockReturnValue({
+      isDirectory: () => false,
+    } as ReturnType<typeof statSync>);
 
     consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
   });
@@ -71,13 +84,13 @@ describe("Cli", () => {
   });
 
   describe("run", () => {
-    it("returns shouldRun: true with config when inputs are provided", () => {
+    it("returns shouldRun: true with config when input is provided", () => {
       const result = Cli.run();
 
       expect(result.shouldRun).toBe(true);
       expect(result.exitCode).toBe(0);
       expect(result.config).toBeDefined();
-      expect(result.config?.inputs).toEqual(["input.cnx"]);
+      expect(result.config?.input).toBe("input.cnx");
     });
 
     it("handles --pio-install flag", () => {
@@ -135,7 +148,46 @@ describe("Cli", () => {
       expect(result.exitCode).toBe(0);
     });
 
-    it("returns error when no input files specified", () => {
+    it("returns error when multiple input files specified", () => {
+      mockParsedArgs.inputFiles = ["a.cnx", "b.cnx"];
+      vi.mocked(ArgParser.parse).mockReturnValue(mockParsedArgs);
+
+      const result = Cli.run();
+
+      expect(result.shouldRun).toBe(false);
+      expect(result.exitCode).toBe(1);
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        "Error: Only one entry point file is supported",
+      );
+    });
+
+    it("returns error when input file does not exist", () => {
+      vi.mocked(existsSync).mockReturnValue(false);
+
+      const result = Cli.run();
+
+      expect(result.shouldRun).toBe(false);
+      expect(result.exitCode).toBe(1);
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        expect.stringContaining("Input not found"),
+      );
+    });
+
+    it("returns error when input is a directory", () => {
+      vi.mocked(statSync).mockReturnValue({
+        isDirectory: () => true,
+      } as ReturnType<typeof statSync>);
+
+      const result = Cli.run();
+
+      expect(result.shouldRun).toBe(false);
+      expect(result.exitCode).toBe(1);
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        "Error: Directory input not supported. Specify an entry point file.",
+      );
+    });
+
+    it("returns error when no input file specified", () => {
       mockParsedArgs.inputFiles = [];
       vi.mocked(ArgParser.parse).mockReturnValue(mockParsedArgs);
 
@@ -144,7 +196,7 @@ describe("Cli", () => {
       expect(result.shouldRun).toBe(false);
       expect(result.exitCode).toBe(1);
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        "Error: No input files specified",
+        "Error: No input file specified",
       );
     });
 
@@ -157,7 +209,7 @@ describe("Cli", () => {
       expect(ConfigLoader.load).toHaveBeenCalledWith("/path/to/src");
     });
 
-    it("loads config from cwd when no input files", () => {
+    it("loads config from cwd when no input file", () => {
       mockParsedArgs.inputFiles = [];
       mockParsedArgs.showConfig = true; // To avoid error path
       vi.mocked(ArgParser.parse).mockReturnValue(mockParsedArgs);
@@ -294,7 +346,7 @@ describe("Cli", () => {
 
     it("passes through all config fields", () => {
       mockParsedArgs = {
-        inputFiles: ["a.cnx", "b.cnx"],
+        inputFiles: ["a.cnx"],
         outputPath: "build/",
         includeDirs: ["inc/"],
         defines: { DEBUG: true },
@@ -318,7 +370,7 @@ describe("Cli", () => {
       const result = Cli.run();
 
       expect(result.config).toEqual({
-        inputs: ["a.cnx", "b.cnx"],
+        input: "a.cnx",
         outputPath: "build/",
         includeDirs: ["inc/"],
         defines: { DEBUG: true },