c-next 0.1.66 → 0.1.67

package/src/transpiler/output/codegen/CodeGenerator.ts

@@ -5,7 +5,7 @@
 
 import { CommonTokenStream, ParserRuleContext } from "antlr4ng";
 import * as Parser from "../../logic/parser/grammar/CNextParser";
-import SymbolTable from "../../logic/symbols/SymbolTable";
+
 import ESymbolKind from "../../../utils/types/ESymbolKind";
 import CommentExtractor from "../../logic/analysis/CommentExtractor";
 import CommentFormatter from "./CommentFormatter";
@@ -67,7 +67,7 @@ import memberAccessChain from "./memberAccessChain";
 import AssignmentHandlerRegistry from "./assignment/index";
 import AssignmentClassifier from "./assignment/AssignmentClassifier";
 import buildAssignmentContext from "./assignment/AssignmentContextBuilder";
-import IHandlerDeps from "./assignment/handlers/IHandlerDeps";
+// IHandlerDeps removed - handlers now use CodeGenState.generator directly
 // Issue #461: LiteralUtils for parsing const values from symbol table
 import LiteralUtils from "../../../utils/LiteralUtils";
 // Issue #644: Extracted string length counter for strlen caching optimization
@@ -133,7 +133,7 @@ import TypeGenerationHelper from "./helpers/TypeGenerationHelper";
 // Phase 5: Cast validation helper for improved testability
 import CastValidator from "./helpers/CastValidator";
 // Global state for code generation (simplifies debugging, eliminates DI complexity)
-import CodeGenState from "./CodeGenState";
+import CodeGenState from "../../state/CodeGenState";
 // Unified parameter generation (Phase 1)
 import ParameterInputAdapter from "./helpers/ParameterInputAdapter";
 import ParameterSignatureBuilder from "./helpers/ParameterSignatureBuilder";
@@ -679,7 +679,7 @@ export default class CodeGenerator implements IOrchestrator {
       currentScope: CodeGenState.currentScope,
       isCppScopeSymbol: (name) => this.isCppScopeSymbol(name),
       checkNeedsStructKeyword: (name) =>
-        CodeGenState.symbolTable?.checkNeedsStructKeyword(name) ?? false,
+        CodeGenState.symbolTable.checkNeedsStructKeyword(name),
       validateCrossScopeVisibility: (scope, member) =>
         ScopeResolver.validateCrossScopeVisibility(scope, member),
     });
@@ -2117,13 +2117,11 @@ export default class CodeGenerator implements IOrchestrator {
   /**
    * Generate C code from a C-Next program
    * @param tree The parsed C-Next program
-   * @param symbolTable Optional symbol table for cross-language interop
    * @param tokenStream Optional token stream for comment preservation (ADR-043)
    * @param options Optional code generator options (e.g., debugMode)
    */
   generate(
     tree: Parser.ProgramContext,
-    symbolTable?: SymbolTable,
     tokenStream?: CommonTokenStream,
     options?: ICodeGeneratorOptions,
   ): string {
@@ -2145,9 +2143,6 @@ export default class CodeGenerator implements IOrchestrator {
     // Initialize options and configuration (after reset)
     this.initializeGenerateOptions(options, tokenStream);
 
-    // Store symbol table for function lookup (after reset)
-    CodeGenState.symbolTable = symbolTable ?? null;
-
     // ADR-055: Use pre-collected symbolInfo from Pipeline (TSymbolInfoAdapter)
     if (!options?.symbolInfo) {
       throw new Error(
@@ -2198,6 +2193,9 @@ export default class CodeGenerator implements IOrchestrator {
     // Reset global state first
     CodeGenState.reset(targetCapabilities);
 
+    // Set generator reference for handlers to use
+    CodeGenState.generator = this;
+
     // Reset local context (will gradually migrate to CodeGenState)
     this.context = CodeGenerator.createDefaultContext(targetCapabilities);
 
@@ -6026,54 +6024,14 @@ export default class CodeGenerator implements IOrchestrator {
   // Issue #644: _generateBitMask removed, now delegating to BitUtils.generateMask
   // ========================================================================
 
-  // ADR-109: Build handler dependencies for assignment dispatch
-  private buildHandlerDeps(): IHandlerDeps {
-    return {
-      symbols: CodeGenState.symbols!,
-      typeRegistry: CodeGenState.typeRegistry,
-      currentScope: CodeGenState.currentScope,
-      currentParameters: CodeGenState.currentParameters,
-      targetCapabilities: CodeGenState.targetCapabilities,
-      generateExpression: (ctx) => this.generateExpression(ctx),
-      tryEvaluateConstant: (ctx) => this.tryEvaluateConstant(ctx),
-      generateAssignmentTarget: (ctx) => this.generateAssignmentTarget(ctx),
-      isKnownStruct: (name) => this.isKnownStruct(name),
-      isKnownScope: (name) => this.isKnownScope(name),
-      getMemberTypeInfo: (structType, memberName) =>
-        this.getMemberTypeInfo(structType, memberName),
-      validateBitmapFieldLiteral: (expr, width, fieldName) =>
-        TypeValidator.validateBitmapFieldLiteral(expr, width, fieldName),
-      validateCrossScopeVisibility: (scopeName, memberName) =>
-        this.validateCrossScopeVisibility(scopeName, memberName),
-      checkArrayBounds: (arrayName, dimensions, indexExprs, line) =>
-        TypeValidator.checkArrayBounds(
-          arrayName,
-          [...dimensions],
-          [...indexExprs],
-          line,
-          (expr) => this.tryEvaluateConstant(expr),
-        ),
-      analyzeMemberChainForBitAccess: (targetCtx) =>
-        this.analyzeMemberChainForBitAccess(targetCtx),
-      generateFloatBitWrite: (name, typeInfo, bitIndex, width, value) =>
-        this.generateFloatBitWrite(name, typeInfo, bitIndex, width, value),
-      foldBooleanToInt: (expr) => this.foldBooleanToInt(expr),
-      markNeedsString: () => {
-        this.requireInclude("string");
-      },
-      markClampOpUsed: (op, typeName) => this.markClampOpUsed(op, typeName),
-      generateAtomicRMW: (target, cOp, value, typeInfo) =>
-        this.generateAtomicRMW(target, cOp, value, typeInfo),
-    };
-  }
+  // ADR-109: buildHandlerDeps removed - handlers now use CodeGenState.generator directly
 
   /**
    * Analyze a member chain target to detect bit access at the end.
    * Issue #644: Delegates to MemberChainAnalyzer.
    */
-  private analyzeMemberChainForBitAccess(
-    targetCtx: Parser.AssignmentTargetContext,
-  ): {
+  /** Public for handler access via CodeGenState.generator */
+  analyzeMemberChainForBitAccess(targetCtx: Parser.AssignmentTargetContext): {
     isBitAccess: boolean;
     baseTarget?: string;
     bitIndex?: string;
@@ -6089,7 +6047,8 @@ export default class CodeGenerator implements IOrchestrator {
    * Generate float bit write using shadow variable + memcpy.
    * Issue #644: Delegates to FloatBitHelper.
    */
-  private generateFloatBitWrite(
+  /** Public for handler access via CodeGenState.generator */
+  generateFloatBitWrite(
     name: string,
     typeInfo: TTypeInfo,
     bitIndex: string,
@@ -6162,17 +6121,18 @@ export default class CodeGenerator implements IOrchestrator {
       typeRegistry: CodeGenState.typeRegistry,
       generateExpression: () => value,
     });
-    const handlerDeps = this.buildHandlerDeps();
+    // ADR-109: Handlers access CodeGenState directly, no deps needed
     const assignmentKind = AssignmentClassifier.classify(assignCtx);
     const handler = AssignmentHandlerRegistry.getHandler(assignmentKind);
-    return handler(assignCtx, handlerDeps);
+    return handler(assignCtx);
   }
 
   /**
    * ADR-049: Generate atomic Read-Modify-Write operation
    * Uses LDREX/STREX on platforms that support it, otherwise PRIMASK
    */
-  private generateAtomicRMW(
+  /** Public for handler access via CodeGenState.generator */
+  generateAtomicRMW(
     target: string,
     cOp: string,
     value: string,
@@ -6422,7 +6382,7 @@ export default class CodeGenerator implements IOrchestrator {
       return null;
     }
 
-    // No expected enum type - search all enums but error on ambiguity
+    // No expected enum type - bare enum members are not allowed without context
     const matchingEnums: string[] = [];
     for (const [enumName, members] of CodeGenState.symbols!.enumMembers) {
       if (members.has(id)) {
@@ -6431,11 +6391,14 @@ export default class CodeGenerator implements IOrchestrator {
     }
 
     if (matchingEnums.length === 1) {
-      return `${matchingEnums[0]}${this.getScopeSeparator(false)}${id}`;
+      throw new Error(
+        `error[E0424]: '${id}' is not defined; did you mean '${matchingEnums[0]}.${id}'?`,
+      );
     }
     if (matchingEnums.length > 1) {
+      const suggestions = matchingEnums.map((e) => `'${e}.${id}'`).join(" or ");
       throw new Error(
-        `Error: Ambiguous enum member '${id}' exists in multiple enums: ${matchingEnums.join(", ")}. Use qualified access (e.g., ${matchingEnums[0]}.${id})`,
+        `error[E0424]: '${id}' is not defined; did you mean ${suggestions}?`,
       );
     }
 

package/src/transpiler/output/codegen/TypeResolver.ts

@@ -3,7 +3,7 @@
  * Static class that reads from CodeGenState directly.
  */
 import * as Parser from "../../logic/parser/grammar/CNextParser";
-import CodeGenState from "./CodeGenState";
+import CodeGenState from "../../state/CodeGenState";
 import INTEGER_TYPES from "./types/INTEGER_TYPES";
 import FLOAT_TYPES from "./types/FLOAT_TYPES";
 import SIGNED_TYPES from "./types/SIGNED_TYPES";
@@ -73,7 +73,7 @@ class TypeResolver {
     if (CodeGenState.symbols?.knownBitmaps.has(typeName)) {
       return true;
     }
-    if (CodeGenState.symbolTable?.getStructFields(typeName)) {
+    if (CodeGenState.symbolTable.getStructFields(typeName)) {
       return true;
     }
     return false;

package/src/transpiler/output/codegen/TypeValidator.ts

@@ -6,7 +6,7 @@
 import { existsSync } from "node:fs";
 import { dirname, resolve, join } from "node:path";
 import * as Parser from "../../logic/parser/grammar/CNextParser";
-import CodeGenState from "./CodeGenState";
+import CodeGenState from "../../state/CodeGenState";
 import TypeResolver from "./TypeResolver";
 import ExpressionUtils from "../../../utils/ExpressionUtils";
 // SonarCloud S3776: Extracted literal parsing to reduce complexity

package/src/transpiler/output/codegen/__tests__/CodeGenerator.coverage.test.ts

@@ -16,7 +16,7 @@ import * as Parser from "../../../logic/parser/grammar/CNextParser";
 import SymbolTable from "../../../logic/symbols/SymbolTable";
 import CNextResolver from "../../../logic/symbols/cnext/index";
 import TSymbolInfoAdapter from "../../../logic/symbols/cnext/adapters/TSymbolInfoAdapter";
-import CodeGenState from "../CodeGenState";
+import CodeGenState from "../../../state/CodeGenState";
 
 /**
  * Helper to parse C-Next source and return tree + generator ready for testing.
@@ -39,7 +39,8 @@ function setupGenerator(
   const symbols = TSymbolInfoAdapter.convert(tSymbols);
 
   const generator = new CodeGenerator();
-  const code = generator.generate(tree, symbolTable, tokenStream, {
+  CodeGenState.symbolTable = symbolTable;
+  const code = generator.generate(tree, tokenStream, {
     symbolInfo: symbols,
     sourcePath: "test.cnx",
     cppMode: options.cppMode ?? false,
@@ -512,7 +513,7 @@ describe("CodeGenerator Coverage Tests", () => {
         scope Config {
           public enum State { IDLE, RUNNING, STOPPED }
           public void init() {
-            State s <- IDLE;
+            State s <- State.IDLE;
           }
         }
       `;
@@ -1035,7 +1036,7 @@ describe("CodeGenerator Coverage Tests", () => {
           public void increment() { counter +<- 1; }
           public enum State { INIT, RUN }
           public void setState() {
-            State s <- INIT;
+            State s <- State.INIT;
           }
         }
       `;