c-next 0.1.68 → 0.1.70

package/src/transpiler/output/codegen/assignment/handlers/BitAccessHandlers.ts

@@ -33,13 +33,16 @@ function validateNotCompound(ctx: IAssignmentContext): void {
 /**
  * Handle single bit on integer variable: flags[3] <- true
  * Also handles float bit indexing: f32Var[3] <- true
+ * Uses resolvedBaseIdentifier for proper scope prefix support.
  */
 function handleIntegerBit(ctx: IAssignmentContext): string {
   validateNotCompound(ctx);
 
-  const name = ctx.identifiers[0];
+  // Use resolvedBaseIdentifier for type lookup and code generation
+  // e.g., "ArrayBug_flags" instead of "flags"
+  const name = ctx.resolvedBaseIdentifier;
   const bitIndex = gen().generateExpression(ctx.subscripts[0]);
-  const typeInfo = CodeGenState.typeRegistry.get(name);
+  const typeInfo = CodeGenState.getVariableTypeInfo(name);
 
   // Check for float bit indexing
   if (typeInfo) {
@@ -67,14 +70,16 @@ function handleIntegerBit(ctx: IAssignmentContext): string {
 /**
  * Handle bit range on integer variable: flags[0, 3] <- 5
  * Also handles float bit range: f32Var[0, 8] <- 0xFF
+ * Uses resolvedBaseIdentifier for proper scope prefix support.
  */
 function handleIntegerBitRange(ctx: IAssignmentContext): string {
   validateNotCompound(ctx);
 
-  const name = ctx.identifiers[0];
+  // Use resolvedBaseIdentifier for type lookup and code generation
+  const name = ctx.resolvedBaseIdentifier;
   const start = gen().generateExpression(ctx.subscripts[0]);
   const width = gen().generateExpression(ctx.subscripts[1]);
-  const typeInfo = CodeGenState.typeRegistry.get(name);
+  const typeInfo = CodeGenState.getVariableTypeInfo(name);
 
   // Check for float bit indexing
   if (typeInfo) {
@@ -126,15 +131,19 @@ function handleStructMemberBit(ctx: IAssignmentContext): string {
 
 /**
  * Handle bit on multi-dimensional array element: matrix[i][j][FIELD_BIT] <- false
+ * Uses resolvedBaseIdentifier for proper scope prefix support.
  */
 function handleArrayElementBit(ctx: IAssignmentContext): string {
   validateNotCompound(ctx);
 
-  const arrayName = ctx.identifiers[0];
-  const typeInfo = CodeGenState.typeRegistry.get(arrayName);
+  // Use resolvedBaseIdentifier for type lookup and code generation
+  const arrayName = ctx.resolvedBaseIdentifier;
+  const typeInfo = CodeGenState.getVariableTypeInfo(arrayName);
 
   if (!typeInfo?.arrayDimensions) {
-    throw new Error(`Error: ${arrayName} is not an array`);
+    // Use raw identifier in error message for clarity
+    const rawName = ctx.identifiers[0];
+    throw new Error(`Error: ${rawName} is not an array`);
   }
 
   const numDims = typeInfo.arrayDimensions.length;
@@ -160,12 +169,14 @@ function handleArrayElementBit(ctx: IAssignmentContext): string {
  *
  * The target is a chain like array[idx].member or struct.field with a
  * bit range subscript [start, width] at the end.
+ * Uses resolvedBaseIdentifier for proper scope prefix support.
  */
 function handleStructChainBitRange(ctx: IAssignmentContext): string {
   validateNotCompound(ctx);
 
   // Build the base target from postfixOps, excluding the last one (the bit range)
-  const baseId = ctx.identifiers[0];
+  // Use resolvedBaseIdentifier for the base to include scope prefix
+  const baseId = ctx.resolvedBaseIdentifier;
   const opsBeforeLast = ctx.postfixOps.slice(0, -1);
 
   let baseTarget = baseId;

package/src/transpiler/output/codegen/assignment/handlers/BitmapHandlers.ts

@@ -109,7 +109,7 @@ function generateWriteOnlyBitmapWrite(
 function handleBitmapFieldSingleBit(ctx: IAssignmentContext): string {
   const varName = ctx.identifiers[0];
   const fieldName = ctx.identifiers[1];
-  const typeInfo = CodeGenState.typeRegistry.get(varName);
+  const typeInfo = CodeGenState.getVariableTypeInfo(varName);
   const bitmapType = typeInfo!.bitmapTypeName!;
 
   const fieldInfo = getBitmapFieldInfo(bitmapType, fieldName, ctx);
@@ -130,7 +130,7 @@ function handleBitmapFieldMultiBit(ctx: IAssignmentContext): string {
 function handleBitmapArrayElementField(ctx: IAssignmentContext): string {
   const arrayName = ctx.identifiers[0];
   const fieldName = ctx.identifiers[1];
-  const typeInfo = CodeGenState.typeRegistry.get(arrayName);
+  const typeInfo = CodeGenState.getVariableTypeInfo(arrayName);
   const bitmapType = typeInfo!.bitmapTypeName!;
 
   const fieldInfo = getBitmapFieldInfo(bitmapType, fieldName, ctx);
@@ -148,7 +148,7 @@ function handleStructMemberBitmapField(ctx: IAssignmentContext): string {
   const memberName = ctx.identifiers[1];
   const fieldName = ctx.identifiers[2];
 
-  const structTypeInfo = CodeGenState.typeRegistry.get(structName);
+  const structTypeInfo = CodeGenState.getVariableTypeInfo(structName);
   const memberInfo = CodeGenState.getMemberTypeInfo(
     structTypeInfo!.baseType,
     memberName,

package/src/transpiler/output/codegen/assignment/handlers/SpecialHandlers.ts

@@ -36,22 +36,22 @@ function getTargetTypeInfo(ctx: IAssignmentContext): {
 
   // Simple identifier
   if (ctx.isSimpleIdentifier) {
-    return { typeInfo: CodeGenState.typeRegistry.get(id) };
+    return { typeInfo: CodeGenState.getVariableTypeInfo(id) };
   }
 
   // this.member: lookup using scoped name
   if (ctx.isSimpleThisAccess && CodeGenState.currentScope) {
     const scopedName = `${CodeGenState.currentScope}_${id}`;
-    return { typeInfo: CodeGenState.typeRegistry.get(scopedName) };
+    return { typeInfo: CodeGenState.getVariableTypeInfo(scopedName) };
   }
 
   // global.member: lookup using direct name
   if (ctx.isSimpleGlobalAccess) {
-    return { typeInfo: CodeGenState.typeRegistry.get(id) };
+    return { typeInfo: CodeGenState.getVariableTypeInfo(id) };
   }
 
   // Fallback to direct lookup
-  return { typeInfo: CodeGenState.typeRegistry.get(id) };
+  return { typeInfo: CodeGenState.getVariableTypeInfo(id) };
 }
 
 /**

package/src/transpiler/output/codegen/assignment/handlers/StringHandlers.ts

@@ -42,7 +42,7 @@ function handleSimpleStringAssignment(ctx: IAssignmentContext): string {
   validateNotCompound(ctx);
 
   const id = ctx.identifiers[0];
-  const typeInfo = CodeGenState.typeRegistry.get(id);
+  const typeInfo = CodeGenState.getVariableTypeInfo(id);
   const capacity = typeInfo!.stringCapacity!;
 
   CodeGenState.needsString = true;
@@ -57,7 +57,7 @@ function handleSimpleStringAssignment(ctx: IAssignmentContext): string {
  * Shared helper for struct field string handlers.
  */
 function getStructFieldType(structName: string, fieldName: string): string {
-  const structTypeInfo = CodeGenState.typeRegistry.get(structName);
+  const structTypeInfo = CodeGenState.getVariableTypeInfo(structName);
   const structType = structTypeInfo!.baseType;
   const structFields = CodeGenState.symbols!.structFields.get(structType);
   return structFields!.get(fieldName)!;
@@ -69,7 +69,7 @@ function getStructFieldType(structName: string, fieldName: string): string {
  * Shared helper for struct field handlers.
  */
 function getStructType(structName: string): string {
-  const structTypeInfo = CodeGenState.typeRegistry.get(structName);
+  const structTypeInfo = CodeGenState.getVariableTypeInfo(structName);
   return structTypeInfo!.baseType;
 }
 
@@ -85,7 +85,7 @@ function handleStringThisMember(ctx: IAssignmentContext): string {
 
   const memberName = ctx.identifiers[0];
   const scopedName = `${CodeGenState.currentScope}_${memberName}`;
-  const typeInfo = CodeGenState.typeRegistry.get(scopedName);
+  const typeInfo = CodeGenState.getVariableTypeInfo(scopedName);
   const capacity = typeInfo!.stringCapacity!;
 
   CodeGenState.needsString = true;
@@ -123,7 +123,7 @@ function handleStringArrayElement(ctx: IAssignmentContext): string {
   validateNotCompound(ctx);
 
   const name = ctx.identifiers[0];
-  const typeInfo = CodeGenState.typeRegistry.get(name);
+  const typeInfo = CodeGenState.getVariableTypeInfo(name);
   const capacity = typeInfo!.stringCapacity!;
 
   CodeGenState.needsString = true;

package/src/transpiler/output/codegen/assignment/handlers/__tests__/AccessPatternHandlers.test.ts

@@ -16,8 +16,14 @@ import HandlerTestUtils from "./handlerTestUtils";
 function createMockContext(
   overrides: Partial<IAssignmentContext> = {},
 ): IAssignmentContext {
+  // Default resolved values based on first identifier
+  const identifiers = overrides.identifiers ?? ["Counter", "value"];
+  const resolvedTarget = overrides.resolvedTarget ?? `${identifiers.join("_")}`;
+  const resolvedBaseIdentifier =
+    overrides.resolvedBaseIdentifier ?? identifiers[0];
+
   return {
-    identifiers: ["Counter", "value"],
+    identifiers,
     subscripts: [],
     isCompound: false,
     cnextOp: "<-",
@@ -34,6 +40,8 @@ function createMockContext(
     isSimpleIdentifier: false,
     isSimpleThisAccess: false,
     isSimpleGlobalAccess: false,
+    resolvedTarget,
+    resolvedBaseIdentifier,
     ...overrides,
   } as IAssignmentContext;
 }

package/src/transpiler/output/codegen/assignment/handlers/__tests__/ArrayHandlers.test.ts

@@ -28,8 +28,14 @@ import HandlerTestUtils from "./handlerTestUtils";
 function createMockContext(
   overrides: Partial<IAssignmentContext> = {},
 ): IAssignmentContext {
+  // Default resolved values based on first identifier
+  const identifiers = overrides.identifiers ?? ["arr"];
+  const resolvedTarget = overrides.resolvedTarget ?? `${identifiers[0]}[i]`;
+  const resolvedBaseIdentifier =
+    overrides.resolvedBaseIdentifier ?? identifiers[0];
+
   return {
-    identifiers: ["arr"],
+    identifiers,
     subscripts: [{ mockValue: "i", start: { line: 1 } } as never],
     isCompound: false,
     cnextOp: "<-",
@@ -46,6 +52,8 @@ function createMockContext(
     isSimpleIdentifier: false,
     isSimpleThisAccess: false,
     isSimpleGlobalAccess: false,
+    resolvedTarget,
+    resolvedBaseIdentifier,
     ...overrides,
   } as IAssignmentContext;
 }
@@ -96,6 +104,7 @@ describe("ArrayHandlers", () => {
         isCompound: true,
         cnextOp: "+<-",
         cOp: "+=",
+        resolvedTarget: "arr[0]",
       });
 
       const result = getHandler()!(ctx);
@@ -109,6 +118,8 @@ describe("ArrayHandlers", () => {
       });
       const ctx = createMockContext({
         identifiers: ["buffer"],
+        resolvedTarget: "buffer[idx]",
+        resolvedBaseIdentifier: "buffer",
       });
 
       const result = getHandler()!(ctx);
@@ -137,6 +148,8 @@ describe("ArrayHandlers", () => {
           { mockValue: "j", start: { line: 1 } } as never,
         ],
         subscriptDepth: 2,
+        resolvedTarget: "matrix[i][j]",
+        resolvedBaseIdentifier: "matrix",
       });
 
       const result = getHandler()!(ctx);
@@ -160,6 +173,8 @@ describe("ArrayHandlers", () => {
           { mockValue: "z", start: { line: 1 } } as never,
         ],
         subscriptDepth: 3,
+        resolvedTarget: "cube[x][y][z]",
+        resolvedBaseIdentifier: "cube",
       });
 
       const result = getHandler()!(ctx);
@@ -168,9 +183,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("performs bounds checking when type info available", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["matrix", { arrayDimensions: [10, 10], baseType: "i32" }],
-      ]) as any;
+      ]);
       mockCheckArrayBounds.mockClear();
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
@@ -212,6 +227,8 @@ describe("ArrayHandlers", () => {
         ],
         isCompound: true,
         cOp: "-=",
+        resolvedTarget: "grid[0][1]",
+        resolvedBaseIdentifier: "grid",
       });
 
       const result = getHandler()!(ctx);
@@ -225,9 +242,9 @@ describe("ArrayHandlers", () => {
       arrayHandlers.find(([kind]) => kind === AssignmentKind.ARRAY_SLICE)?.[1];
 
     it("generates memcpy for valid slice assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -250,7 +267,7 @@ describe("ArrayHandlers", () => {
     });
 
     it("generates memcpy for string slice", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         [
           "str",
           {
@@ -260,7 +277,7 @@ describe("ArrayHandlers", () => {
             baseType: "string",
           },
         ],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -282,9 +299,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on compound assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -306,9 +323,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on multi-dimensional array", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["matrix", { arrayDimensions: [10, 10], baseType: "u8" }],
-      ]) as any;
+      ]);
       const ctx = createMockContext({
         identifiers: ["matrix"],
         subscripts: [
@@ -323,9 +340,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on non-constant offset", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi.fn().mockReturnValue(undefined),
       });
@@ -342,9 +359,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on non-constant length", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -364,9 +381,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on out of bounds access", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [50], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -387,9 +404,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on negative offset", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -410,9 +427,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on zero length", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -433,9 +450,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on negative length", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -456,9 +473,7 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws when buffer size cannot be determined", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["unknown", { baseType: "u8" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["unknown", { baseType: "u8" }]]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()

package/src/transpiler/output/codegen/assignment/handlers/__tests__/BitAccessHandlers.test.ts

@@ -16,8 +16,14 @@ import HandlerTestUtils from "./handlerTestUtils";
 function createMockContext(
   overrides: Partial<IAssignmentContext> = {},
 ): IAssignmentContext {
+  // Default resolved values based on first identifier
+  const identifiers = overrides.identifiers ?? ["flags"];
+  const resolvedTarget = overrides.resolvedTarget ?? `${identifiers[0]}[3]`;
+  const resolvedBaseIdentifier =
+    overrides.resolvedBaseIdentifier ?? identifiers[0];
+
   return {
-    identifiers: ["flags"],
+    identifiers,
     subscripts: [{ mockValue: "3" } as never],
     isCompound: false,
     cnextOp: "<-",
@@ -34,6 +40,8 @@ function createMockContext(
     isSimpleIdentifier: false,
     isSimpleThisAccess: false,
     isSimpleGlobalAccess: false,
+    resolvedTarget,
+    resolvedBaseIdentifier,
     ...overrides,
   } as IAssignmentContext;
 }
@@ -68,9 +76,7 @@ describe("BitAccessHandlers", () => {
       )?.[1];
 
     it("generates single bit read-modify-write", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u32" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u32" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("3"),
       });
@@ -84,9 +90,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses 1ULL for 64-bit types", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u64" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u64" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("32"),
       });
@@ -100,9 +104,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses 1ULL for signed 64-bit types", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "i64" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "i64" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("bit"),
       });
@@ -115,9 +117,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("converts true to 1", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u8" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u8" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("0"),
       });
@@ -131,9 +131,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("converts false to 0", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u8" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u8" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("0"),
       });
@@ -147,7 +145,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("delegates to float bit write for float types", () => {
-      CodeGenState.typeRegistry = new Map([["f", { baseType: "f32" }]]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["f", { baseType: "f32" }]]);
       const generateFloatBitWrite = vi
         .fn()
         .mockReturnValue("float_bit_write_result");
@@ -184,9 +182,7 @@ describe("BitAccessHandlers", () => {
       )?.[1];
 
     it("generates bit range read-modify-write", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u32" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u32" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -206,9 +202,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses correct mask for bit range", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["data", { baseType: "u16" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["data", { baseType: "u16" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -229,9 +223,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses ULL suffix for 64-bit bit range mask", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u64" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u64" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -253,7 +245,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("delegates to float bit write for float types", () => {
-      CodeGenState.typeRegistry = new Map([["f", { baseType: "f32" }]]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["f", { baseType: "f32" }]]);
       const generateFloatBitWrite = vi
         .fn()
         .mockReturnValue("float_range_write_result");
@@ -336,9 +328,9 @@ describe("BitAccessHandlers", () => {
       )?.[1];
 
     it("generates array element bit assignment for 1D array", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["arr", { baseType: "u32", arrayDimensions: [10] }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -360,9 +352,9 @@ describe("BitAccessHandlers", () => {
     });
 
     it("generates array element bit assignment for 2D array", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["matrix", { baseType: "u16", arrayDimensions: [10, 10] }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -386,9 +378,9 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses 1ULL for 64-bit array element", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["arr", { baseType: "u64", arrayDimensions: [5] }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -406,9 +398,9 @@ describe("BitAccessHandlers", () => {
     });
 
     it("throws when variable is not an array", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["notArray", { baseType: "u32" }],
-      ]) as any;
+      ]);
       const ctx = createMockContext({
         identifiers: ["notArray"],
       });
@@ -417,9 +409,9 @@ describe("BitAccessHandlers", () => {
     });
 
     it("throws on compound assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["arr", { baseType: "u32", arrayDimensions: [10] }],
-      ]) as any;
+      ]);
       const ctx = createMockContext({
         isCompound: true,
         cnextOp: "+<-",