c-next 0.2.11 → 0.2.12

package/src/transpiler/types/ICachedFileEntry.ts

@@ -22,6 +22,10 @@ interface ICachedFileEntry {
   opaqueTypes?: string[];
   /** Issue #958: Typedef struct types with source files ([typeName, sourceFile] pairs) */
   typedefStructTypes?: Array<[string, string]>;
+  /** Issue #958: Struct tag → typedef name aliases ([structTag, typedefName] pairs) */
+  structTagAliases?: Array<[string, string]>;
+  /** Issue #958: Struct tags that have full definitions (bodies) */
+  structTagsWithBodies?: string[];
 }
 
 export default ICachedFileEntry;

package/src/utils/cache/CacheManager.ts

@@ -32,7 +32,7 @@ import ESourceLanguage from "../types/ESourceLanguage";
 const defaultFs = NodeFileSystem.instance;
 
 /** Current cache format version - increment when serialization format changes */
-const CACHE_VERSION = 6; // Issue #958: Add typedefStructTypes to cache
+const CACHE_VERSION = 7; // Issue #958: Add structTagAliases, structTagsWithBodies to cache
 
 const TRANSPILER_VERSION = packageJson.version;
 
@@ -136,6 +136,8 @@ class CacheManager {
     enumBitWidth: Map<string, number>;
     opaqueTypes: string[];
     typedefStructTypes: Array<[string, string]>;
+    structTagAliases: Array<[string, string]>;
+    structTagsWithBodies: string[];
   } | null {
     if (!this.cache) return null;
 
@@ -177,6 +179,8 @@ class CacheManager {
       enumBitWidth,
       opaqueTypes: cachedEntry.opaqueTypes ?? [],
       typedefStructTypes: cachedEntry.typedefStructTypes ?? [],
+      structTagAliases: cachedEntry.structTagAliases ?? [],
+      structTagsWithBodies: cachedEntry.structTagsWithBodies ?? [],
     };
   }
 
@@ -188,10 +192,14 @@ class CacheManager {
     filePath: string,
     symbols: ISerializedSymbol[],
     structFields: Map<string, Map<string, IStructFieldInfo>>,
-    needsStructKeyword?: string[],
-    enumBitWidth?: Map<string, number>,
-    opaqueTypes?: string[],
-    typedefStructTypes?: Array<[string, string]>,
+    options?: {
+      needsStructKeyword?: string[];
+      enumBitWidth?: Map<string, number>;
+      opaqueTypes?: string[];
+      typedefStructTypes?: Array<[string, string]>;
+      structTagAliases?: Array<[string, string]>;
+      structTagsWithBodies?: string[];
+    },
   ): void {
     if (!this.cache) return;
 
@@ -221,8 +229,8 @@ class CacheManager {
 
     // Issue #208: Convert enum bit widths from Map to plain object
     const serializedEnumBitWidth: Record<string, number> = {};
-    if (enumBitWidth) {
-      for (const [enumName, width] of enumBitWidth) {
+    if (options?.enumBitWidth) {
+      for (const [enumName, width] of options.enumBitWidth) {
         serializedEnumBitWidth[enumName] = width;
       }
     }
@@ -233,10 +241,12 @@ class CacheManager {
       cacheKey,
       symbols: serializedSymbols,
       structFields: serializedFields,
-      needsStructKeyword,
+      needsStructKeyword: options?.needsStructKeyword,
       enumBitWidth: serializedEnumBitWidth,
-      opaqueTypes,
-      typedefStructTypes,
+      opaqueTypes: options?.opaqueTypes,
+      typedefStructTypes: options?.typedefStructTypes,
+      structTagAliases: options?.structTagAliases,
+      structTagsWithBodies: options?.structTagsWithBodies,
     };
 
     this.cache.setKey(filePath, entry);
@@ -280,16 +290,19 @@ class CacheManager {
     // Issue #958: Extract typedef struct types (all typedef'd structs)
     const typedefStructTypes = symbolTable.getAllTypedefStructTypes();
 
+    // Issue #958: Extract struct tag aliases and body tracking
+    const structTagAliases = symbolTable.getAllStructTagAliases();
+    const structTagsWithBodies = symbolTable.getAllStructTagsWithBodies();
+
     // Delegate to existing setSymbols method
-    this.setSymbols(
-      filePath,
-      symbols,
-      structFields,
+    this.setSymbols(filePath, symbols, structFields, {
       needsStructKeyword,
       enumBitWidth,
       opaqueTypes,
       typedefStructTypes,
-    );
+      structTagAliases,
+      structTagsWithBodies,
+    });
   }
 
   /**

package/src/utils/cache/__tests__/CacheManager.test.ts

@@ -361,7 +361,9 @@ describe("CacheManager", () => {
       const testFile = join(testDir, "test.h");
       writeFileSync(testFile, "// test");
 
-      cacheManager.setSymbols(testFile, [], new Map(), ["Point", "Rectangle"]);
+      cacheManager.setSymbols(testFile, [], new Map(), {
+        needsStructKeyword: ["Point", "Rectangle"],
+      });
 
       const cached = cacheManager.getSymbols(testFile);
       expect(cached!.needsStructKeyword).toEqual(["Point", "Rectangle"]);
@@ -391,7 +393,7 @@ describe("CacheManager", () => {
       enumBitWidth.set("Status", 8);
       enumBitWidth.set("Mode", 16);
 
-      cacheManager.setSymbols(testFile, [], new Map(), undefined, enumBitWidth);
+      cacheManager.setSymbols(testFile, [], new Map(), { enumBitWidth });
 
       const cached = cacheManager.getSymbols(testFile);
       expect(cached!.enumBitWidth.get("Status")).toBe(8);
@@ -405,7 +407,7 @@ describe("CacheManager", () => {
       const enumBitWidth = new Map<string, number>();
       enumBitWidth.set("Priority", 32);
 
-      cacheManager.setSymbols(testFile, [], new Map(), undefined, enumBitWidth);
+      cacheManager.setSymbols(testFile, [], new Map(), { enumBitWidth });
       await cacheManager.flush();
 
       // Reload
@@ -1492,7 +1494,7 @@ describe("CacheManager", () => {
       const content = mockFs.getWrittenContent("/project/.cnx/config.json");
       expect(content).toBeDefined();
       const newConfig = JSON.parse(content!);
-      expect(newConfig.version).toBe(6); // Current CACHE_VERSION (Issue #958 typedefStructTypes)
+      expect(newConfig.version).toBe(7); // Current CACHE_VERSION (Issue #958 structTagAliases, structTagsWithBodies)
     });
 
     it("should not cache files that do not exist in IFileSystem", async () => {