c-next 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c-next",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "A safer C for embedded systems development. Transpiles to clean, readable C.",
   "main": "src/index.ts",
   "bin": {

package/src/codegen/CodeGenerator.ts

@@ -5592,10 +5592,12 @@ export default class CodeGenerator implements IOrchestrator {
 
       // ADR-040: ISR arrays use normal array indexing, not bit manipulation
       // Also handle any array type that isn't an integer scalar
+      // Issue #213: String parameters (isString=true) should also use memcpy for slice assignment
       const isActualArray =
-        typeInfo?.isArray &&
-        typeInfo.arrayDimensions &&
-        typeInfo.arrayDimensions.length > 0;
+        (typeInfo?.isArray &&
+          typeInfo.arrayDimensions &&
+          typeInfo.arrayDimensions.length > 0) ||
+        typeInfo?.isString;
       const isISRType = typeInfo?.baseType === "ISR";
 
       if (isActualArray || isISRType) {
@@ -5617,6 +5619,16 @@ export default class CodeGenerator implements IOrchestrator {
 
           // Generate bounds-checked memcpy
           // if (offset + length <= sizeof(buffer)) { memcpy(&buffer[offset], &value, length); }
+          // Issue #213: For string parameters, use capacity for bounds checking
+          // since sizeof(char*) gives pointer size, not buffer size
+          if (
+            typeInfo?.isString &&
+            typeInfo.stringCapacity &&
+            !typeInfo.isArray
+          ) {
+            const capacity = typeInfo.stringCapacity + 1;
+            return `if (${offset} + ${length} <= ${capacity}) { memcpy(&${name}[${offset}], &${value}, ${length}); }`;
+          }
           return `if (${offset} + ${length} <= sizeof(${name})) { memcpy(&${name}[${offset}], &${value}, ${length}); }`;
         }
 
@@ -6693,6 +6705,33 @@ export default class CodeGenerator implements IOrchestrator {
           continue; // Skip further processing, this just sets the base identifier
         }
 
+        // Issue #212: Check if 'length' is a scope variable before treating it as a property accessor
+        // When accessing this.length, we need to check if 'length' is a scope variable name
+        // If so, transform it to the scope variable (e.g., Scope_length) instead of treating
+        // it as the .length property accessor
+        if (result === "__THIS_SCOPE__" && memberName === "length") {
+          if (!this.context.currentScope) {
+            throw new Error("Error: 'this' can only be used inside a scope");
+          }
+          const members = this.context.scopeMembers.get(
+            this.context.currentScope,
+          );
+          if (members && members.has("length")) {
+            // This is a scope variable named 'length', not a property accessor
+            result = `${this.context.currentScope}_${memberName}`;
+            currentIdentifier = result;
+            // Set struct type for chained access if applicable
+            const resolvedTypeInfo = this.context.typeRegistry.get(result);
+            if (
+              resolvedTypeInfo &&
+              this.isKnownStruct(resolvedTypeInfo.baseType)
+            ) {
+              currentStructType = resolvedTypeInfo.baseType;
+            }
+            continue; // Skip the .length property handler
+          }
+        }
+
         // Handle .length property for arrays, strings, and integers
         if (memberName === "length") {
           // Special case: main function's args.length -> argc

package/src/index.ts

@@ -25,7 +25,8 @@ const packageJson = require("../package.json");
  * C-Next configuration file options
  */
 interface ICNextConfig {
-  outputExtension?: ".c" | ".cpp";
+  /** Issue #211: Force C++ output. Auto-detection may also enable this. */
+  cppRequired?: boolean;
   generateHeaders?: boolean;
   debugMode?: boolean;
   target?: string; // ADR-049: Target platform (e.g., "teensy41", "cortex-m0")
@@ -130,7 +131,7 @@ function showHelp(): void {
   console.log("  cnext.config.json, .cnext.json, .cnextrc");
   console.log("");
   console.log("Config example:");
-  console.log('  { "outputExtension": ".cpp" }');
+  console.log('  { "cppRequired": true }');
   console.log("");
   console.log("A safer C for embedded systems development.");
 }
@@ -188,7 +189,7 @@ async function runUnifiedMode(
   generateHeaders: boolean,
   preprocess: boolean,
   verbose: boolean,
-  outputExtension: ".c" | ".cpp",
+  cppRequired: boolean,
   noCache: boolean,
 ): Promise<void> {
   // Step 1: Expand directories to .cnx files
@@ -257,7 +258,7 @@ async function runUnifiedMode(
     generateHeaders,
     preprocess,
     defines,
-    outputExtension,
+    cppRequired,
     noCache,
   });
 
@@ -466,7 +467,7 @@ async function main(): Promise<void> {
   const includeDirs: string[] = [];
   const defines: Record<string, string | boolean> = {};
   let cliGenerateHeaders: boolean | undefined;
-  let cliOutputExtension: ".c" | ".cpp" | undefined;
+  let cliCppRequired: boolean | undefined;
   let preprocess = true;
   let verbose = false;
   let noCache = false;
@@ -483,7 +484,7 @@ async function main(): Promise<void> {
     } else if (arg === "--exclude-headers") {
       cliGenerateHeaders = false;
     } else if (arg === "--cpp") {
-      cliOutputExtension = ".cpp";
+      cliCppRequired = true;
     } else if (arg === "--no-preprocess") {
       preprocess = false;
     } else if (arg === "--no-cache") {
@@ -508,7 +509,7 @@ async function main(): Promise<void> {
 
   // Apply config defaults, CLI flags take precedence
   const generateHeaders = cliGenerateHeaders ?? config.generateHeaders ?? true;
-  const outputExtension = cliOutputExtension ?? config.outputExtension ?? ".c";
+  const cppRequired = cliCppRequired ?? config.cppRequired ?? false;
 
   // Unified mode - always use Project class with header discovery
   if (inputFiles.length === 0) {
@@ -525,7 +526,7 @@ async function main(): Promise<void> {
     generateHeaders,
     preprocess,
     verbose,
-    outputExtension,
+    cppRequired,
     noCache,
   );
 }

package/src/pipeline/Pipeline.ts

@@ -56,6 +56,8 @@ class Pipeline {
   private headerGenerator: HeaderGenerator;
   private warnings: string[];
   private cacheManager: CacheManager | null;
+  /** Issue #211: Tracks if C++ output is needed (one-way flag, false → true only) */
+  private cppDetected: boolean;
 
   constructor(config: IPipelineConfig) {
     // Apply defaults
@@ -66,7 +68,7 @@ class Pipeline {
       defines: config.defines ?? {},
       preprocess: config.preprocess ?? true,
       generateHeaders: config.generateHeaders ?? true,
-      outputExtension: config.outputExtension ?? ".c",
+      cppRequired: config.cppRequired ?? false,
       parseOnly: config.parseOnly ?? false,
       debugMode: config.debugMode ?? false,
       target: config.target ?? "",
@@ -74,6 +76,9 @@ class Pipeline {
       noCache: config.noCache ?? false,
     };
 
+    // Issue #211: Initialize cppDetected from config (--cpp flag sets this)
+    this.cppDetected = this.config.cppRequired;
+
     this.symbolTable = new SymbolTable();
     this.preprocessor = new Preprocessor();
     this.codeGenerator = new CodeGenerator();
@@ -317,7 +322,20 @@ class Pipeline {
         this.symbolTable.restoreStructFields(cached.structFields);
         this.symbolTable.restoreNeedsStructKeyword(cached.needsStructKeyword);
         this.symbolTable.restoreEnumBitWidths(cached.enumBitWidth);
-        return; // Cache hit - skip parsing
+
+        // Issue #211: Still check for C++ syntax even on cache hit
+        // The detection is cheap (regex only) and ensures cppDetected is set correctly
+        if (file.type === EFileType.CHeader) {
+          const content = readFileSync(file.path, "utf-8");
+          if (detectCppSyntax(content)) {
+            this.cppDetected = true;
+          }
+        } else if (file.type === EFileType.CppHeader) {
+          // .hpp files are always C++
+          this.cppDetected = true;
+        }
+
+        return; // Cache hit - skip full parsing
       }
     }
 
@@ -347,6 +365,8 @@ class Pipeline {
     if (file.type === EFileType.CHeader) {
       this.parseCHeader(content, file.path);
     } else if (file.type === EFileType.CppHeader) {
+      // Issue #211: .hpp files are always C++
+      this.cppDetected = true;
       this.parseCppHeader(content, file.path);
     }
 
@@ -374,6 +394,8 @@ class Pipeline {
    */
   private parseCHeader(content: string, filePath: string): void {
     if (detectCppSyntax(content)) {
+      // Issue #211: C++ detected, set flag for .cpp output
+      this.cppDetected = true;
       // Use C++14 parser for headers with C++ syntax (typed enums, classes, etc.)
       this.parseCppHeader(content, filePath);
     } else {
@@ -580,7 +602,8 @@ class Pipeline {
    * Get output path for a file
    */
   private getOutputPath(file: IDiscoveredFile): string {
-    const ext = this.config.outputExtension;
+    // Issue #211: Derive extension from cppDetected flag
+    const ext = this.cppDetected ? ".cpp" : ".c";
     const outputName = basename(file.path).replace(/\.cnx$|\.cnext$/, ext);
 
     // Check if file is in any input directory (for preserving structure)

package/src/pipeline/types/IPipelineConfig.ts

@@ -23,8 +23,8 @@ interface IPipelineConfig {
   /** Whether to generate .h files for exported symbols (default: true) */
   generateHeaders?: boolean;
 
-  /** Output file extension (default: ".c") */
-  outputExtension?: ".c" | ".cpp";
+  /** Issue #211: Force C++ output (--cpp flag). Auto-detection may also enable this. */
+  cppRequired?: boolean;
 
   /** Parse only mode - no code generation */
   parseOnly?: boolean;

package/src/project/Project.ts

@@ -49,7 +49,7 @@ class Project {
       defines: this.config.defines,
       preprocess: this.config.preprocess,
       generateHeaders: this.config.generateHeaders,
-      outputExtension: this.config.outputExtension,
+      cppRequired: this.config.cppRequired,
       noCache: this.config.noCache,
     });
   }

package/src/project/types/IProjectConfig.ts

@@ -29,8 +29,8 @@ interface IProjectConfig {
   /** Additional preprocessor defines */
   defines?: Record<string, string | boolean>;
 
-  /** Output file extension (default: ".c") */
-  outputExtension?: ".c" | ".cpp";
+  /** Issue #211: Force C++ output. Auto-detection may also enable this. */
+  cppRequired?: boolean;
 
   /** Issue #183: Disable symbol caching (default: false = cache enabled) */
   noCache?: boolean;