c-next 0.1.69 → 0.1.71

package/src/transpiler/output/codegen/analysis/__tests__/StringLengthCounter.test.ts

@@ -38,7 +38,7 @@ describe("StringLengthCounter", () => {
 
   describe("countExpression", () => {
     it("counts single .length access on string variable", () => {
-      CodeGenState.typeRegistry.set("myStr", {
+      CodeGenState.setVariableTypeInfo("myStr", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -54,7 +54,7 @@ describe("StringLengthCounter", () => {
     });
 
     it("counts multiple .length accesses on same variable", () => {
-      CodeGenState.typeRegistry.set("str", {
+      CodeGenState.setVariableTypeInfo("str", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -71,7 +71,7 @@ describe("StringLengthCounter", () => {
     });
 
     it("counts .length accesses on different string variables", () => {
-      CodeGenState.typeRegistry.set("a", {
+      CodeGenState.setVariableTypeInfo("a", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -79,7 +79,7 @@ describe("StringLengthCounter", () => {
         isString: true,
         stringCapacity: 16,
       });
-      CodeGenState.typeRegistry.set("b", {
+      CodeGenState.setVariableTypeInfo("b", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -96,7 +96,7 @@ describe("StringLengthCounter", () => {
     });
 
     it("ignores .length on non-string variables", () => {
-      CodeGenState.typeRegistry.set("arr", {
+      CodeGenState.setVariableTypeInfo("arr", {
         baseType: "u8",
         bitWidth: 8,
         isArray: true,
@@ -111,7 +111,7 @@ describe("StringLengthCounter", () => {
     });
 
     it("ignores other member accesses", () => {
-      CodeGenState.typeRegistry.set("obj", {
+      CodeGenState.setVariableTypeInfo("obj", {
         baseType: "MyStruct",
         bitWidth: 32,
         isArray: false,
@@ -135,7 +135,7 @@ describe("StringLengthCounter", () => {
 
   describe("countBlock", () => {
     it("counts .length accesses across multiple statements", () => {
-      CodeGenState.typeRegistry.set("msg", {
+      CodeGenState.setVariableTypeInfo("msg", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -154,7 +154,7 @@ describe("StringLengthCounter", () => {
     });
 
     it("counts .length in assignment statements", () => {
-      CodeGenState.typeRegistry.set("text", {
+      CodeGenState.setVariableTypeInfo("text", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -175,7 +175,7 @@ describe("StringLengthCounter", () => {
 
   describe("countBlockInto", () => {
     it("adds counts to existing map", () => {
-      CodeGenState.typeRegistry.set("s1", {
+      CodeGenState.setVariableTypeInfo("s1", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -183,7 +183,7 @@ describe("StringLengthCounter", () => {
         isString: true,
         stringCapacity: 32,
       });
-      CodeGenState.typeRegistry.set("s2", {
+      CodeGenState.setVariableTypeInfo("s2", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -209,7 +209,7 @@ describe("StringLengthCounter", () => {
 
   describe("nested expressions", () => {
     it("counts .length in ternary expressions", () => {
-      CodeGenState.typeRegistry.set("str", {
+      CodeGenState.setVariableTypeInfo("str", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,
@@ -225,7 +225,7 @@ describe("StringLengthCounter", () => {
     });
 
     it("counts .length in comparison expressions", () => {
-      CodeGenState.typeRegistry.set("name", {
+      CodeGenState.setVariableTypeInfo("name", {
         baseType: "char",
         bitWidth: 8,
         isArray: false,

package/src/transpiler/output/codegen/assignment/AssignmentClassifier.ts

@@ -13,6 +13,7 @@ import CodeGenState from "../../../state/CodeGenState";
 import SubscriptClassifier from "../subscript/SubscriptClassifier";
 import TTypeInfo from "../types/TTypeInfo";
 import TypeCheckUtils from "../../../../utils/TypeCheckUtils";
+import QualifiedNameGenerator from "../utils/QualifiedNameGenerator";
 
 /**
  * Classifies assignment statements by analyzing their structure.
@@ -144,7 +145,7 @@ class AssignmentClassifier {
     varName: string,
     fieldName: string,
   ): AssignmentKind | null {
-    const typeInfo = CodeGenState.typeRegistry.get(varName);
+    const typeInfo = CodeGenState.getVariableTypeInfo(varName);
     if (!typeInfo?.isBitmap || !typeInfo.bitmapTypeName) {
       return null;
     }
@@ -189,7 +190,7 @@ class AssignmentClassifier {
     }
 
     // Check if struct member bitmap field: struct.bitmapMember.field
-    const structTypeInfo = CodeGenState.typeRegistry.get(firstName);
+    const structTypeInfo = CodeGenState.getVariableTypeInfo(firstName);
     if (
       !structTypeInfo ||
       !CodeGenState.isKnownStruct(structTypeInfo.baseType)
@@ -227,7 +228,7 @@ class AssignmentClassifier {
       return null;
     }
 
-    const fullRegName = `${scopeName}_${ids[1]}`;
+    const fullRegName = QualifiedNameGenerator.forMember(scopeName, ids[1]);
     if (!CodeGenState.symbols!.knownRegisters.has(fullRegName)) {
       return null;
     }
@@ -270,7 +271,7 @@ class AssignmentClassifier {
 
     const ids = ctx.identifiers;
     const firstId = ids[0];
-    const typeInfo = CodeGenState.typeRegistry.get(firstId);
+    const typeInfo = CodeGenState.getVariableTypeInfo(firstId);
 
     // Check for bit range through struct chain: devices[0].control[0, 4]
     // Detected by last subscript having 2 expressions (start, width)
@@ -494,7 +495,7 @@ class AssignmentClassifier {
     }
 
     const name = ctx.identifiers[0];
-    const typeInfo = CodeGenState.typeRegistry.get(name) ?? null;
+    const typeInfo = CodeGenState.getVariableTypeInfo(name) ?? null;
 
     // Use shared classifier for array vs bit access decision
     // Use lastSubscriptExprCount to distinguish [0][0] (two ops, each 1 expr)
@@ -558,16 +559,16 @@ class AssignmentClassifier {
     let typeInfo;
     if (ctx.isSimpleIdentifier) {
       const id = ctx.identifiers[0];
-      typeInfo = CodeGenState.typeRegistry.get(id);
+      typeInfo = CodeGenState.getVariableTypeInfo(id);
     } else if (ctx.isSimpleThisAccess && CodeGenState.currentScope) {
       // this.member pattern: lookup using scoped name
       const memberName = ctx.identifiers[0];
       const scopedName = `${CodeGenState.currentScope}_${memberName}`;
-      typeInfo = CodeGenState.typeRegistry.get(scopedName);
+      typeInfo = CodeGenState.getVariableTypeInfo(scopedName);
     } else if (ctx.isSimpleGlobalAccess) {
       // global.member pattern: lookup using direct name
       const memberName = ctx.identifiers[0];
-      typeInfo = CodeGenState.typeRegistry.get(memberName);
+      typeInfo = CodeGenState.getVariableTypeInfo(memberName);
     } else {
       return null;
     }
@@ -604,7 +605,7 @@ class AssignmentClassifier {
   ): AssignmentKind | null {
     if (!ctx.isSimpleIdentifier) return null;
     const id = ctx.identifiers[0];
-    const typeInfo = CodeGenState.typeRegistry.get(id);
+    const typeInfo = CodeGenState.getVariableTypeInfo(id);
     return AssignmentClassifier.isSimpleStringType(typeInfo)
       ? AssignmentKind.STRING_SIMPLE
       : null;
@@ -619,7 +620,7 @@ class AssignmentClassifier {
     if (!ctx.isSimpleThisAccess || !CodeGenState.currentScope) return null;
     const memberName = ctx.identifiers[0];
     const scopedName = `${CodeGenState.currentScope}_${memberName}`;
-    const typeInfo = CodeGenState.typeRegistry.get(scopedName);
+    const typeInfo = CodeGenState.getVariableTypeInfo(scopedName);
     return AssignmentClassifier.isSimpleStringType(typeInfo)
       ? AssignmentKind.STRING_THIS_MEMBER
       : null;
@@ -633,7 +634,7 @@ class AssignmentClassifier {
   ): AssignmentKind | null {
     if (!ctx.isSimpleGlobalAccess) return null;
     const id = ctx.identifiers[0];
-    const typeInfo = CodeGenState.typeRegistry.get(id);
+    const typeInfo = CodeGenState.getVariableTypeInfo(id);
     return AssignmentClassifier.isSimpleStringType(typeInfo)
       ? AssignmentKind.STRING_GLOBAL
       : null;
@@ -644,7 +645,7 @@ class AssignmentClassifier {
    * Returns the base struct type if valid, null if not a known struct.
    */
   private static _resolveStructType(structName: string): string | null {
-    const structTypeInfo = CodeGenState.typeRegistry.get(structName);
+    const structTypeInfo = CodeGenState.getVariableTypeInfo(structName);
     if (
       !structTypeInfo ||
       !CodeGenState.isKnownStruct(structTypeInfo.baseType)

package/src/transpiler/output/codegen/assignment/__tests__/AssignmentClassifier.test.ts

@@ -148,7 +148,7 @@ describe("AssignmentClassifier - Bitmap Fields", () => {
       ["StatusFlags", new Map([["Running", { offset: 0, width: 1 }]])],
     ]);
     setupSymbols({ bitmapFields });
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "flags",
       createTypeInfo({ isBitmap: true, bitmapTypeName: "StatusFlags" }),
     );
@@ -169,7 +169,7 @@ describe("AssignmentClassifier - Bitmap Fields", () => {
       ["StatusFlags", new Map([["Mode", { offset: 4, width: 4 }]])],
     ]);
     setupSymbols({ bitmapFields });
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "flags",
       createTypeInfo({ isBitmap: true, bitmapTypeName: "StatusFlags" }),
     );
@@ -213,7 +213,7 @@ describe("AssignmentClassifier - Bitmap Fields", () => {
       ["Device", new Map([["flags", "DeviceFlags"]])],
     ]);
     setupSymbols({ bitmapFields, knownStructs, structFields });
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "device",
       createTypeInfo({ baseType: "Device" }),
     );
@@ -240,7 +240,10 @@ describe("AssignmentClassifier - Integer Bit Access", () => {
   });
 
   it("classifies single bit access on integer", () => {
-    CodeGenState.typeRegistry.set("flags", createTypeInfo({ baseType: "u8" }));
+    CodeGenState.setVariableTypeInfo(
+      "flags",
+      createTypeInfo({ baseType: "u8" }),
+    );
 
     const ctx = createMockContext({
       identifiers: ["flags"],
@@ -253,7 +256,10 @@ describe("AssignmentClassifier - Integer Bit Access", () => {
   });
 
   it("classifies bit range access on integer", () => {
-    CodeGenState.typeRegistry.set("flags", createTypeInfo({ baseType: "u32" }));
+    CodeGenState.setVariableTypeInfo(
+      "flags",
+      createTypeInfo({ baseType: "u32" }),
+    );
 
     const ctx = createMockContext({
       identifiers: ["flags"],
@@ -282,7 +288,7 @@ describe("AssignmentClassifier - Array Access", () => {
   });
 
   it("classifies simple array element", () => {
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "arr",
       createTypeInfo({
         isArray: true,
@@ -303,7 +309,7 @@ describe("AssignmentClassifier - Array Access", () => {
   });
 
   it("classifies array slice", () => {
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "buffer",
       createTypeInfo({
         isArray: true,
@@ -336,7 +342,7 @@ describe("AssignmentClassifier - String Assignments", () => {
   });
 
   it("classifies simple string variable", () => {
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "name",
       createTypeInfo({
         baseType: "string<32>",
@@ -348,7 +354,7 @@ describe("AssignmentClassifier - String Assignments", () => {
     const ctx = createMockContext({
       identifiers: ["name"],
       isSimpleIdentifier: true,
-      firstIdTypeInfo: CodeGenState.typeRegistry.get("name")!,
+      firstIdTypeInfo: CodeGenState.getVariableTypeInfo("name")!,
     });
 
     expect(AssignmentClassifier.classify(ctx)).toBe(
@@ -362,7 +368,7 @@ describe("AssignmentClassifier - String Assignments", () => {
       ["Person", new Map([["name", "string<64>"]])],
     ]);
     setupSymbols({ knownStructs, structFields });
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "person",
       createTypeInfo({ baseType: "Person" }),
     );
@@ -389,7 +395,7 @@ describe("AssignmentClassifier - Special Compound", () => {
   });
 
   it("classifies atomic RMW", () => {
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "counter",
       createTypeInfo({
         baseType: "u32",
@@ -408,7 +414,7 @@ describe("AssignmentClassifier - Special Compound", () => {
   });
 
   it("classifies overflow clamp", () => {
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "saturated",
       createTypeInfo({
         baseType: "u8",
@@ -429,7 +435,7 @@ describe("AssignmentClassifier - Special Compound", () => {
   });
 
   it("does not classify float as overflow clamp", () => {
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "value",
       createTypeInfo({
         baseType: "f32",
@@ -648,7 +654,7 @@ describe("AssignmentClassifier - Bitmap Array Element Field", () => {
       ["StatusFlags", new Map([["Active", { offset: 0, width: 1 }]])],
     ]);
     setupSymbols({ bitmapFields });
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "flagsArr",
       createTypeInfo({
         isBitmap: true,
@@ -682,7 +688,7 @@ describe("AssignmentClassifier - Multi-dim Array Bit Indexing", () => {
   });
 
   it("classifies matrix[i][j][bit] as ARRAY_ELEMENT_BIT", () => {
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "matrix",
       createTypeInfo({
         baseType: "u32",
@@ -709,7 +715,7 @@ describe("AssignmentClassifier - Multi-dim Array Bit Indexing", () => {
   });
 
   it("classifies matrix[i][j] as MULTI_DIM_ARRAY_ELEMENT", () => {
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "matrix",
       createTypeInfo({
         baseType: "u32",
@@ -875,7 +881,7 @@ describe("AssignmentClassifier - Member Chain", () => {
     const knownStructs = new Set(["Config"]);
     const structFields = new Map([["Config", new Map([["items", "Item"]])]]);
     setupSymbols({ knownStructs, structFields });
-    CodeGenState.typeRegistry.set(
+    CodeGenState.setVariableTypeInfo(
       "config",
       createTypeInfo({ baseType: "Config" }),
     );

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

@@ -37,7 +37,7 @@ function handleArrayElement(ctx: IAssignmentContext): string {
 function handleMultiDimArrayElement(ctx: IAssignmentContext): string {
   // Use resolvedBaseIdentifier for type lookup (includes scope prefix)
   // e.g., "ArrayBug_data" instead of "data"
-  const typeInfo = CodeGenState.typeRegistry.get(ctx.resolvedBaseIdentifier);
+  const typeInfo = CodeGenState.getVariableTypeInfo(ctx.resolvedBaseIdentifier);
 
   // ADR-036: Compile-time bounds checking for constant indices
   if (typeInfo?.arrayDimensions) {
@@ -71,7 +71,7 @@ function handleArraySlice(ctx: IAssignmentContext): string {
 
   // Use resolvedBaseIdentifier for type lookup (includes scope prefix)
   const name = ctx.resolvedBaseIdentifier;
-  const typeInfo = CodeGenState.typeRegistry.get(name);
+  const typeInfo = CodeGenState.getVariableTypeInfo(name);
 
   // Get line number for error messages
   const line = ctx.subscripts[0].start?.line ?? 0;

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

@@ -6,6 +6,7 @@
  */
 
 import IRegisterNameResult from "./IRegisterNameResult";
+import QualifiedNameGenerator from "../../utils/QualifiedNameGenerator";
 
 /**
  * Validate that 'this' is being used within a scope context.
@@ -79,7 +80,12 @@ function buildScopedRegisterName(
   scopeName: string,
   parts: readonly string[],
 ): string {
-  return `${scopeName}_${parts.join("_")}`;
+  // Build the name progressively: Scope_Part1_Part2_...
+  let result = scopeName;
+  for (const part of parts) {
+    result = QualifiedNameGenerator.forMember(result, part);
+  }
+  return result;
 }
 
 /**

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

@@ -42,7 +42,7 @@ function handleIntegerBit(ctx: IAssignmentContext): string {
   // 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) {
@@ -79,7 +79,7 @@ function handleIntegerBitRange(ctx: IAssignmentContext): string {
   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) {
@@ -138,7 +138,7 @@ function handleArrayElementBit(ctx: IAssignmentContext): string {
 
   // Use resolvedBaseIdentifier for type lookup and code generation
   const arrayName = ctx.resolvedBaseIdentifier;
-  const typeInfo = CodeGenState.typeRegistry.get(arrayName);
+  const typeInfo = CodeGenState.getVariableTypeInfo(arrayName);
 
   if (!typeInfo?.arrayDimensions) {
     // Use raw identifier in error message for clarity

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

@@ -16,6 +16,7 @@ import TAssignmentHandler from "./TAssignmentHandler";
 import CodeGenState from "../../../../state/CodeGenState";
 import TypeValidator from "../../TypeValidator";
 import type ICodeGenApi from "../../types/ICodeGenApi";
+import QualifiedNameGenerator from "../../utils/QualifiedNameGenerator";
 
 /** Get typed generator reference */
 function gen(): ICodeGenApi {
@@ -109,7 +110,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 +131,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 +149,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,
@@ -211,8 +212,11 @@ function handleScopedRegisterMemberBitmapField(
     gen().validateCrossScopeVisibility(scopeName, regName);
   }
 
-  const fullRegName = `${scopeName}_${regName}`;
-  const fullRegMember = `${fullRegName}_${memberName}`;
+  const fullRegName = QualifiedNameGenerator.forMember(scopeName, regName);
+  const fullRegMember = QualifiedNameGenerator.forMember(
+    fullRegName,
+    memberName,
+  );
   const bitmapType =
     CodeGenState.symbols!.registerMemberTypes.get(fullRegMember)!;
 

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

@@ -16,6 +16,7 @@ import RegisterUtils from "./RegisterUtils";
 import AssignmentHandlerUtils from "./AssignmentHandlerUtils";
 import CodeGenState from "../../../../state/CodeGenState";
 import type ICodeGenApi from "../../types/ICodeGenApi";
+import QualifiedNameGenerator from "../../utils/QualifiedNameGenerator";
 
 /** Get typed generator reference */
 function gen(): ICodeGenApi {
@@ -166,7 +167,7 @@ function handleScopedRegisterBitRange(ctx: IAssignmentContext): string {
     scopeName,
     parts,
   );
-  const scopedRegName = `${scopeName}_${parts[0]}`;
+  const scopedRegName = QualifiedNameGenerator.forMember(scopeName, parts[0]);
 
   const accessMod = CodeGenState.symbols!.registerMemberAccess.get(regName);
   const isWriteOnly = RegisterUtils.isWriteOnlyRegister(accessMod);

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;