c-next 0.2.14 → 0.2.16

package/dist/index.js

@@ -11,7 +11,7 @@ import { hideBin } from "yargs/helpers";
 // package.json
 var package_default = {
   name: "c-next",
-  version: "0.2.14",
+  version: "0.2.16",
   description: "A safer C for embedded systems development. Transpiles to clean, readable C.",
   packageManager: "npm@11.9.0",
   type: "module",
@@ -111792,19 +111792,17 @@ var SymbolTable = class {
   /**
    * Register struct fields in structFields map for cross-file type resolution.
    * Called automatically when adding struct symbols.
+   * Issue #981: Now preserves string dimensions (macro names) for proper array detection.
    */
   registerStructFields(struct) {
     const cName = SymbolNameUtils_default.getTranspiledCName(struct);
     for (const [fieldName, fieldInfo] of struct.fields) {
       const typeString = TypeResolver_default.getTypeName(fieldInfo.type);
-      const numericDims = fieldInfo.dimensions?.filter(
-        (d) => typeof d === "number"
-      );
       this.addStructField(
         cName,
         fieldName,
         typeString,
-        numericDims && numericDims.length > 0 ? numericDims : void 0
+        fieldInfo.dimensions && fieldInfo.dimensions.length > 0 ? fieldInfo.dimensions : void 0
       );
     }
   }
@@ -111917,6 +111915,7 @@ var SymbolTable = class {
   // ========================================================================
   /**
    * Add a C symbol to the table
+   * Issue #981: Also register struct fields for type resolution
    */
   addCSymbol(symbol) {
     const existing = this.cSymbols.get(symbol.name);
@@ -111931,6 +111930,23 @@ var SymbolTable = class {
     } else {
       this.cSymbolsByFile.set(symbol.sourceFile, [symbol]);
     }
+    if (symbol.kind === "struct" && symbol.fields) {
+      this.registerCStructFields(symbol.name, symbol.fields);
+    }
+  }
+  /**
+   * Register C struct fields in structFields map for cross-file type resolution.
+   * Issue #981: Required for macro-sized array field detection on local struct variables.
+   */
+  registerCStructFields(structName, fields) {
+    for (const [fieldName, fieldInfo] of fields) {
+      this.addStructField(
+        structName,
+        fieldName,
+        fieldInfo.type,
+        fieldInfo.arrayDimensions
+      );
+    }
   }
   /**
    * Add multiple C symbols at once
@@ -112265,11 +112281,12 @@ Rename the C-Next symbol to resolve.`
   // Struct Field Information
   // ========================================================================
   /**
-   * Add struct field information
+   * Add struct field information.
+   * Issue #981: Accept (number | string)[] for arrayDimensions to support macro-sized arrays.
    * @param structName Name of the struct
    * @param fieldName Name of the field
    * @param fieldType Type of the field (e.g., "uint32_t")
-   * @param arrayDimensions Optional array dimensions if field is an array
+   * @param arrayDimensions Optional array dimensions - numbers for resolved, strings for macros
    */
   addStructField(structName, fieldName, fieldType, arrayDimensions) {
     let fields = this.structFields.get(structName);
@@ -112279,7 +112296,7 @@ Rename the C-Next symbol to resolve.`
     }
     fields.set(fieldName, {
       type: fieldType,
-      arrayDimensions
+      arrayDimensions: arrayDimensions ? [...arrayDimensions] : void 0
     });
   }
   /**
@@ -112676,7 +112693,7 @@ var DEFAULT_TARGET = {
   hasLdrexStrex: false,
   hasBasepri: false
 };
-var CodeGenState = class {
+var CodeGenState = class _CodeGenState {
   // ===========================================================================
   // GENERATOR REFERENCE (for handler access)
   // ===========================================================================
@@ -113043,6 +113060,19 @@ var CodeGenState = class {
     if (symbol?.kind === "variable" && symbol.type) {
       return this.convertTSymbolToTypeInfo(symbol);
     }
+    const cSymbol = this.symbolTable.getCSymbol(name);
+    if (cSymbol?.kind === "variable" && cSymbol.type) {
+      const baseType = _CodeGenState.stripTrailingPointers(cSymbol.type);
+      if (this.symbolTable.isTypedefStructType(baseType) || this.symbolTable.getStructFields(baseType)) {
+        return {
+          baseType,
+          bitWidth: 0,
+          isArray: cSymbol.isArray || false,
+          isConst: cSymbol.isConst || false,
+          isPointer: cSymbol.type.endsWith("*")
+        };
+      }
+    }
     return void 0;
   }
   /**
@@ -113061,7 +113091,15 @@ var CodeGenState = class {
       return true;
     }
     const symbol = this.symbolTable.getTSymbol(name);
-    return symbol?.kind === "variable" && symbol.type !== void 0;
+    if (symbol?.kind === "variable" && symbol.type !== void 0) {
+      return true;
+    }
+    const cSymbol = this.symbolTable.getCSymbol(name);
+    if (cSymbol?.kind === "variable" && cSymbol.type) {
+      const baseType = _CodeGenState.stripTrailingPointers(cSymbol.type);
+      return this.symbolTable.isTypedefStructType(baseType) || !!this.symbolTable.getStructFields(baseType);
+    }
+    return false;
   }
   /**
    * Set variable type info in the local registry.
@@ -113087,6 +113125,17 @@ var CodeGenState = class {
    * Convert a TSymbol IVariableSymbol to TTypeInfo for unified type lookups.
    * ADR-055 Phase 7: Works with typed TSymbol instead of ISymbol.
    */
+  /**
+   * Strip trailing pointer stars from a C type string (e.g., "font_t*" → "font_t").
+   * Uses string operations instead of regex to avoid SonarCloud ReDoS flag (S5852).
+   */
+  static stripTrailingPointers(type) {
+    let end = type.length;
+    while (end > 0 && type[end - 1] === "*") {
+      end--;
+    }
+    return type.slice(0, end).trim();
+  }
   static convertTSymbolToTypeInfo(symbol) {
     const typeName = TypeResolver_default.getTypeName(symbol.type);
     const stringPattern = /^string<(\d+)>$/;
@@ -113643,6 +113692,22 @@ var ScopeUtils = class _ScopeUtils {
     return scope.name === "" && scope.parent === scope;
   }
   // ============================================================================
+  // Visibility Utilities
+  // ============================================================================
+  /**
+   * ADR-016: Get the default visibility for a scope member based on its type.
+   *
+   * Member-type-aware defaults reduce boilerplate:
+   * - Functions: public by default (API surface)
+   * - Variables/types: private by default (internal state)
+   *
+   * @param isFunction - Whether the member is a function declaration
+   * @returns The default visibility for this member type
+   */
+  static getDefaultVisibility(isFunction) {
+    return isFunction ? "public" : "private";
+  }
+  // ============================================================================
   // Path Utilities
   // ============================================================================
   /**
@@ -120029,7 +120094,9 @@ function generateEnumMembersFromAST(members, fullName, orchestrator) {
   return lines;
 }
 function processScopeMember(member, scopeName, input, state, orchestrator) {
-  const visibility = member.visibilityModifier()?.getText() || "private";
+  const explicitVisibility = member.visibilityModifier()?.getText();
+  const isFunction = member.functionDeclaration() !== null;
+  const visibility = explicitVisibility ?? ScopeUtils_default.getDefaultVisibility(isFunction);
   const isPrivate = visibility === "private";
   if (member.variableDeclaration()) {
     const varDecl = member.variableDeclaration();
@@ -134528,7 +134595,9 @@ var ScopeCollector = class {
     const memberSymbols = [];
     for (const member of ctx.scopeMember()) {
       const visibilityMod = member.visibilityModifier();
-      const visibility = visibilityMod?.getText() ?? "private";
+      const explicitVisibility = visibilityMod?.getText();
+      const isFunction = member.functionDeclaration() !== null;
+      const visibility = explicitVisibility ?? ScopeUtils_default.getDefaultVisibility(isFunction);
       const isPublic = visibility === "public";
       if (member.variableDeclaration()) {
         const varDecl = member.variableDeclaration();
@@ -135218,12 +135287,15 @@ var TSymbolInfoAdapter_default = TSymbolInfoAdapter;
 var RESERVED_FIELD_NAMES = /* @__PURE__ */ new Set([]);
 function parseArrayDimensions2(text) {
   const dimensions = [];
-  const arrayMatches = text.match(/\[(\d+)\]/g);
+  const arrayMatches = text.match(/\[([^\]]+)\]/g);
   if (arrayMatches) {
     for (const match of arrayMatches) {
-      const size = Number.parseInt(match.slice(1, -1), 10);
-      if (!Number.isNaN(size)) {
-        dimensions.push(size);
+      const content = match.slice(1, -1).trim();
+      const numericValue = Number.parseInt(content, 10);
+      if (!Number.isNaN(numericValue) && String(numericValue) === content) {
+        dimensions.push(numericValue);
+      } else {
+        dimensions.push(content);
       }
     }
   }
@@ -135421,6 +135493,7 @@ var DeclaratorUtils = class _DeclaratorUtils {
   }
   /**
    * Extract array dimensions from a declarator.
+   * Issue #981: Returns (number | string)[] to support macro-sized arrays.
    */
   static extractArrayDimensions(declarator) {
     const directDecl = declarator.directDeclarator?.();
@@ -135949,6 +136022,8 @@ var VariableCollector2 = class {
    */
   static collect(name, baseType, declarator, sourceFile, line, isExtern) {
     const arrayDimensions = declarator ? DeclaratorUtils_default.extractArrayDimensions(declarator) : [];
+    const hasPointer = declarator?.pointer?.() !== null && declarator?.pointer?.() !== void 0;
+    const resolvedType = hasPointer ? `${baseType}*` : baseType;
     return {
       kind: "variable",
       name,
@@ -135956,7 +136031,7 @@ var VariableCollector2 = class {
       sourceLine: line,
       sourceLanguage: ESourceLanguage_default.C,
       isExported: !isExtern,
-      type: baseType,
+      type: resolvedType,
       isArray: arrayDimensions.length > 0,
       arrayDimensions: arrayDimensions.length > 0 ? arrayDimensions : void 0,
       isExtern
@@ -135966,6 +136041,10 @@ var VariableCollector2 = class {
    * Collect a variable from declaration specifiers (when identifier appears as typedefName).
    * This handles the C grammar ambiguity where variable names can be parsed as typedef names.
    *
+   * Note: No pointer detection here — this path handles declarations without an
+   * initDeclaratorList. Pointer declarations (e.g., `font_t *ptr`) always produce
+   * an initDeclaratorList (the `*` creates a declarator), so they go through collect().
+   *
    * @param name Variable name
    * @param baseType Variable type
    * @param sourceFile Source file path
@@ -136569,6 +136648,7 @@ var DeclaratorUtils2 = class _DeclaratorUtils {
   }
   /**
    * Extract array dimensions from a declarator.
+   * Issue #981: Returns (number | string)[] to support macro-sized arrays.
    */
   static extractArrayDimensions(declarator) {
     const ptrDecl = declarator.pointerDeclarator?.();
@@ -136586,6 +136666,7 @@ var DeclaratorUtils2 = class _DeclaratorUtils {
   }
   /**
    * Extract array dimensions from a noPointerDeclarator.
+   * Issue #981: Returns (number | string)[] to support macro-sized arrays.
    */
   static extractArrayDimensionsFromNoPtr(noPtr) {
     return SymbolUtils_default.parseArrayDimensions(noPtr.getText());