canonical type resolver, handler dispatch, file-scoped mangling

scripts/test.js

@@ -15,11 +15,11 @@ try {
   process.exit(1);
 }
 
-const chadc = path.join(projectRoot, '.build', 'chadc');
-if (!fs.existsSync(chadc)) {
-  console.log('Building native compiler (.build/chadc)...');
+const chad = path.join(projectRoot, '.build', 'chad');
+if (!fs.existsSync(chad)) {
+  console.log('Building native compiler (.build/chad)...');
   try {
-    execSync('node dist/chadc-node.js src/chadc-native.ts -o .build/chadc', { cwd: projectRoot, stdio: 'inherit' });
+    execSync('node dist/chad-node.js build src/chad-native.ts -o .build/chad', { cwd: projectRoot, stdio: 'inherit' });
   } catch (error) {
     console.error('Native compiler build failed');
     process.exit(1);
@@ -54,7 +54,7 @@ child.on('exit', (code) => {
   const child2 = spawn('node', ['--import', 'tsx', '--test', 'tests/compiler.test.ts'], {
     stdio: 'inherit',
     shell: false,
-    env: { ...process.env, CHADC_COMPILER: 'node dist/chadc-node.js' }
+    env: { ...process.env, CHAD_COMPILER: 'node dist/chad-node.js build' }
   });
   child2.on('exit', (code2) => {
     process.exit(code2);

src/ast/types.ts

@@ -343,6 +343,7 @@ export interface FunctionNode {
   async?: boolean;
   parameters?: FunctionParameter[];
   loc?: SourceLocation;
+  sourceFile?: string;
 }
 
 export interface ClassMethod {
@@ -367,9 +368,10 @@ export interface ClassNode {
   name: string;
   extends?: string;
   implements?: string[];
-  fields: ClassField[];  // Explicit field declarations
+  fields: ClassField[];
   methods: ClassMethod[];
   loc?: SourceLocation;
+  sourceFile?: string;
 }
 
 export interface ImportSpecifier {

src/codegen/expressions/access/member.ts

@@ -157,21 +157,109 @@ export interface MemberAccessGeneratorContext {
   getTargetArch(): string;
 }
 
+export type MemberAccessHandlerFn = (expr: MemberAccessNode, ctx: MemberAccessGeneratorContext, params: string[]) => string | null;
+
 /**
  * MemberAccessGenerator
  *
- * Handles property access expressions:
- * - process.argv (special case)
- * - Class instance properties (this.field, instance.field)
- * - JSON object properties
- * - Regular object properties
- * - Array/String .length property
- * - Map/Set .size property
- * - TypeScript interface-based property access
+ * Handles property access expressions via a priority-ordered dispatch chain.
+ * Each handler returns string | null (null = didn't handle, try next).
+ *
+ * Handler order (priority):
+ *  1. Enum member access
+ *  2. Typed JSON struct access
+ *  3. process.argv / process.platform / process.env / process.simple
+ *  4. Class property access
+ *  5. JSON property access (variable flagged as JSON)
+ *  6. Chained access (member_access: interface, class field, nested JSON)
+ *  7. Index access (arr[i].property)
+ *  8. Type assertion access ((expr as Type).property)
+ *  9. Method call result access (map.get(key).property)
+ * 10. Object property access
+ * 11. .length property
+ * 12. .size property (Map/Set)
+ * 13. Response properties
+ * 14. Stat properties
+ * 15. Parameter property access (fallback)
  */
 export class MemberAccessGenerator {
   constructor(private ctx: MemberAccessGeneratorContext) {}
 
+  private dispatchHandlers(expr: MemberAccessNode, params: string[]): string | null {
+    let result: string | null;
+
+    result = this.handleEnumMemberAccess(expr);
+    if (result !== null) return result;
+
+    result = this.handleTypedJsonStructAccess(expr);
+    if (result !== null) return result;
+
+    if (isProcessArgv(expr)) return this.handleProcessArgv();
+
+    if (isProcessPlatform(expr)) {
+      const platformStr = this.ctx.getTargetOS() || process.platform;
+      return this.ctx.stringGen.doCreateStringConstant(platformStr);
+    }
+
+    if (isProcessEnvAccess(expr)) return this.handleProcessEnvAccess(expr);
+
+    result = handleProcessSimpleProperty(this.ctx, expr);
+    if (result !== null) return result;
+
+    result = this.handleClassPropertyAccess(expr, params);
+    if (result !== null) return result;
+
+    const exprObjBase = expr.object as ExprBase;
+    const exprObjType = exprObjBase ? exprObjBase.type : null;
+    if (exprObjType === null || exprObjType === undefined) return '0.0';
+
+    if (exprObjType === 'variable' && this.ctx.symbolTable.isJSON((expr.object as VariableNode).name)) {
+      return this.handleJsonPropertyAccess(expr, params);
+    }
+
+    if (exprObjType === 'member_access') {
+      result = this.handleChainedInterfaceAccess(expr, params);
+      if (result !== null) return result;
+      result = this.handleClassFieldChainedAccess(expr, params);
+      if (result !== null) return result;
+      result = this.handleNestedJsonAccess(expr, params);
+      if (result !== null) return result;
+    }
+
+    if (exprObjType === 'index_access') {
+      result = this.handleIndexAccessPropertyAccess(expr, params);
+      if (result !== null) return result;
+    }
+
+    if (exprObjType === 'type_assertion') {
+      result = this.handleTypeAssertionPropertyAccess(expr, params);
+      if (result !== null) return result;
+    }
+
+    if (exprObjType === 'method_call') {
+      result = this.handleMethodCallResultPropertyAccess(expr, params);
+      if (result !== null) return result;
+    }
+
+    result = this.handleObjectPropertyAccess(expr, params);
+    if (result !== null) return result;
+
+    if (expr.property === 'length') return this.handleLengthProperty(expr, params);
+
+    if (expr.property === 'size') {
+      result = this.handleSizeProperty(expr, params);
+      if (result !== null) return result;
+    }
+
+    result = this.handleResponseProperty(expr);
+    if (result !== null) return result;
+
+    result = this.handleStatProperty(expr);
+    if (result !== null) return result;
+
+    return null;
+  }
+
   private hasObjectInfo(name: string): boolean {
     if (!this.ctx.symbolTable.isObject(name) && !this.ctx.symbolTable.isJSON(name)) return false;
     return this.ctx.symbolTable.getObjectMetadataKeys(name) !== undefined;
@@ -314,94 +402,9 @@ export class MemberAccessGenerator {
       return this.ctx.generateExpression(expr.object, params);
     }
 
-    const enumResult = this.handleEnumMemberAccess(expr);
-    if (enumResult !== null) return enumResult;
-
-    const typedJsonResult = this.handleTypedJsonStructAccess(expr);
-    if (typedJsonResult !== null) return typedJsonResult;
-
-    if (this.isProcessArgv(expr)) {
-      return this.handleProcessArgv();
-    }
-
-    if (this.isProcessPlatform(expr)) {
-      const platformStr = this.ctx.getTargetOS() || process.platform;
-      return this.ctx.stringGen.doCreateStringConstant(platformStr);
-    }
-
-    if (this.isProcessEnvAccess(expr)) {
-      return this.handleProcessEnvAccess(expr);
-    }
-
-    const processSimple = this.handleProcessSimpleProperty(expr);
-    if (processSimple !== null) return processSimple;
-
-    const classResult = this.handleClassPropertyAccess(expr, params);
-    if (classResult !== null) return classResult;
-
-    const exprObjBase = expr.object as ExprBase;
-    const exprObjType = exprObjBase ? exprObjBase.type : null;
-    if (exprObjType === null || exprObjType === undefined) {
-      return '0.0';
-    }
-
-    if (exprObjType === 'variable' && this.ctx.symbolTable.isJSON((expr.object as VariableNode).name)) {
-      return this.handleJsonPropertyAccess(expr, params);
-    }
-
-    // Handle nested JSON object access
-    if (exprObjType === 'member_access') {
-      const chainedResult = this.handleChainedInterfaceAccess(expr, params);
-      if (chainedResult !== null) return chainedResult;
-
-      const classFieldChainResult = this.handleClassFieldChainedAccess(expr, params);
-      if (classFieldChainResult !== null) return classFieldChainResult;
-
-      const nestedResult = this.handleNestedJsonAccess(expr, params);
-      if (nestedResult !== null) return nestedResult;
-    }
-
-    // Handle indexed access to object array elements (e.g., arr[i].property)
-    if (exprObjType === 'index_access') {
-      const indexResult = this.handleIndexAccessPropertyAccess(expr, params);
-      if (indexResult !== null) return indexResult;
-    }
-
-    // Handle type assertion property access (e.g., (expr as Type).property)
-    if (exprObjType === 'type_assertion') {
-      const assertResult = this.handleTypeAssertionPropertyAccess(expr, params);
-      if (assertResult !== null) return assertResult;
-    }
-
-    // Handle method call result property access (e.g., map.get(key)?.property)
-    if (exprObjType === 'method_call') {
-      const methodResult = this.handleMethodCallResultPropertyAccess(expr, params);
-      if (methodResult !== null) return methodResult;
-    }
-
-    // Handle regular object property access
-    const objResult = this.handleObjectPropertyAccess(expr, params);
-    if (objResult !== null) return objResult;
-
-    // Handle .length property
-    if (expr.property === 'length') {
-      return this.handleLengthProperty(expr, params);
-    }
-
-    // Handle .size property (Map/Set)
-    if (expr.property === 'size') {
-      const sizeResult = this.handleSizeProperty(expr, params);
-      if (sizeResult !== null) return sizeResult;
-    }
-
-    // Handle Response properties
-    const responseResult = this.handleResponseProperty(expr);
-    if (responseResult !== null) return responseResult;
-
-    const statResult = this.handleStatProperty(expr);
-    if (statResult !== null) return statResult;
+    const result = this.dispatchHandlers(expr, params);
+    if (result !== null) return result;
 
-    // Handle TypeScript parameter property access
     return this.handleParameterPropertyAccess(expr, params);
   }
 

src/codegen/expressions/calls.ts

@@ -524,7 +524,7 @@ export class CallExpressionGenerator {
       for (let i = 0; i < func.paramTypes.length; i++) {
         const p = func.paramTypes[i] as string;
         const paramName = func.params[i] || '';
-        paramTypes.push(mapParamTypeToLLVM(p, paramName, this.ctx.isEnumType(stripNullable(p)), false));
+        paramTypes.push(mapParamTypeToLLVM(p, paramName, this.ctx.isEnumType(stripNullable(p)), this.ctx.interfaceStructGenHasInterface(stripNullable(p))));
       }
     } else {
       const funcNode = this.getFunctionFromAST(expr.name);
@@ -582,13 +582,15 @@ export class CallExpressionGenerator {
       }
     }
 
+    const calleeSourceFile = funcResult ? func.sourceFile : undefined;
+
     if (returnType === 'void') {
-      this.ctx.emit(`call void @${this.ctx.mangleUserName(resolvedFuncName)}(${argsList.join(', ')})`);
+      this.ctx.emit(`call void @${this.ctx.mangleUserName(resolvedFuncName, calleeSourceFile)}(${argsList.join(', ')})`);
       return '0';
     }
 
     const temp = this.ctx.nextTemp();
-    this.ctx.emit(`${temp} = call ${returnType} @${this.ctx.mangleUserName(resolvedFuncName)}(${argsList.join(', ')})`);
+    this.ctx.emit(`${temp} = call ${returnType} @${this.ctx.mangleUserName(resolvedFuncName, calleeSourceFile)}(${argsList.join(', ')})`);
     this.ctx.setVariableType(temp, returnType);
 
     return temp;

src/codegen/infrastructure/function-generator.ts

@@ -50,7 +50,7 @@ export interface FunctionGeneratorContext {
   pushOutput(line: string): void;
   lastInstructionIsTerminator(): boolean;
   createEmptyStringConstant(): string;
-  mangleUserName(name: string): string;
+  mangleUserName(name: string, sourceFile?: string): string;
   getSubprogramDbgRef(): string;
   getUsesTestRunner(): boolean;
   ensureDouble(value: string): string;
@@ -200,7 +200,7 @@ export class FunctionGenerator {
       }
     }
 
-    let ir = `define ${returnType} @${this.ctx.mangleUserName(funcName)}(`;
+    let ir = `define ${returnType} @${this.ctx.mangleUserName(funcName, func.sourceFile)}(`;
     const paramStrings: string[] = [];
     if (hasClosure) {
       paramStrings.push('i8* %__env');

src/codegen/infrastructure/generator-context.ts

@@ -719,7 +719,7 @@ export interface IGeneratorContext {
    */
   resolveImportAlias(localName: string): string;
 
-  mangleUserName(name: string): string;
+  mangleUserName(name: string, sourceFile?: string): string;
 
   /**
    * Access to class generator for field type lookups
@@ -1570,7 +1570,7 @@ export class MockGeneratorContext implements IGeneratorContext {
     return value;
   }
 
-  mangleUserName(name: string): string {
+  mangleUserName(name: string, _sourceFile?: string): string {
     if (name.startsWith('__')) return name;
     return `_cs_${name}`;
   }

src/codegen/infrastructure/type-context.ts

@@ -84,7 +84,7 @@ export class TypeContext {
   }
 
   getClassType(name: string): ResolvedType {
-    return this.intern(name, 'i32*');
+    return this.intern(name, 'i8*');
   }
 
   getNullableType(base: ResolvedType): ResolvedType {