c-next 0.2.17 → 0.2.18

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

@@ -7,12 +7,6 @@
 import BitUtils from "../../../../../utils/BitUtils";
 import TypeCheckUtils from "../../../../../utils/TypeCheckUtils";
 import CodeGenState from "../../../../state/CodeGenState";
-import type ICodeGenApi from "../../types/ICodeGenApi";
-
-/** Get typed generator reference */
-function gen(): ICodeGenApi {
-  return CodeGenState.generator as ICodeGenApi;
-}
 
 /** Result from extracting bit range expressions */
 interface IBitRangeParams {
@@ -38,8 +32,12 @@ class RegisterUtils {
   static extractBitRangeParams(
     subscripts: readonly unknown[],
   ): IBitRangeParams {
-    const start = gen().generateExpression(subscripts[0]);
-    const width = gen().generateExpression(subscripts[1]);
+    const start = CodeGenState.requireGenerator().generateExpression(
+      subscripts[0],
+    );
+    const width = CodeGenState.requireGenerator().generateExpression(
+      subscripts[1],
+    );
     const mask = BitUtils.generateMask(width);
     return { start, width, mask };
   }
@@ -54,8 +52,12 @@ class RegisterUtils {
     subscripts: readonly unknown[],
     value: string,
   ): IOptimizationResult {
-    const startConst = gen().tryEvaluateConstant(subscripts[0]);
-    const widthConst = gen().tryEvaluateConstant(subscripts[1]);
+    const startConst = CodeGenState.requireGenerator().tryEvaluateConstant(
+      subscripts[0],
+    );
+    const widthConst = CodeGenState.requireGenerator().tryEvaluateConstant(
+      subscripts[1],
+    );
 
     if (
       startConst === undefined ||

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

@@ -10,18 +10,12 @@
  */
 import IAssignmentContext from "../IAssignmentContext";
 import CodeGenState from "../../../../state/CodeGenState";
-import type ICodeGenApi from "../../types/ICodeGenApi";
 import NarrowingCastHelper from "../../helpers/NarrowingCastHelper.js";
 import TypeResolver from "../../TypeResolver.js";
 import TYPE_MAP from "../../types/TYPE_MAP.js";
 import CppModeHelper from "../../helpers/CppModeHelper.js";
 import COMPOUND_TO_BINARY from "../../types/COMPOUND_TO_BINARY.js";
 
-/** Get typed generator reference */
-function gen(): ICodeGenApi {
-  return CodeGenState.generator as ICodeGenApi;
-}
-
 /**
  * Try to handle compound assignment on narrow types (MISRA 10.3).
  * Returns the generated code if handled, null otherwise.
@@ -100,7 +94,9 @@ function tryHandleIntToFloatConversion(
  * i16_val &<- 0xFF =>  i16_val = (int16_t)(i16_val & 0xFF);  // MISRA 10.3
  */
 function handleSimpleAssignment(ctx: IAssignmentContext): string {
-  const target = gen().generateAssignmentTarget(ctx.targetCtx);
+  const target = CodeGenState.requireGenerator().generateAssignmentTarget(
+    ctx.targetCtx,
+  );
 
   // Try compound assignment narrowing cast (MISRA 10.3)
   const compoundResult = tryHandleCompoundNarrowingCast(ctx, target);

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

@@ -11,12 +11,6 @@ import TypeCheckUtils from "../../../../../utils/TypeCheckUtils";
 import TAssignmentHandler from "./TAssignmentHandler";
 import CodeGenState from "../../../../state/CodeGenState";
 import TTypeInfo from "../../types/TTypeInfo";
-import type ICodeGenApi from "../../types/ICodeGenApi";
-
-/** Get typed generator reference */
-function gen(): ICodeGenApi {
-  return CodeGenState.generator as ICodeGenApi;
-}
 
 /** Maps C operators to clamp helper operation names */
 const CLAMP_OP_MAP: Record<string, string> = {
@@ -62,9 +56,11 @@ function getTargetTypeInfo(ctx: IAssignmentContext): {
  */
 function handleAtomicRMW(ctx: IAssignmentContext): string {
   const { typeInfo } = getTargetTypeInfo(ctx);
-  const target = gen().generateAssignmentTarget(ctx.targetCtx);
+  const target = CodeGenState.requireGenerator().generateAssignmentTarget(
+    ctx.targetCtx,
+  );
 
-  return gen().generateAtomicRMW(
+  return CodeGenState.requireGenerator().generateAtomicRMW(
     target,
     ctx.cOp,
     ctx.generatedValue,
@@ -80,7 +76,9 @@ function handleAtomicRMW(ctx: IAssignmentContext): string {
  */
 function handleOverflowClamp(ctx: IAssignmentContext): string {
   const { typeInfo } = getTargetTypeInfo(ctx);
-  const target = gen().generateAssignmentTarget(ctx.targetCtx);
+  const target = CodeGenState.requireGenerator().generateAssignmentTarget(
+    ctx.targetCtx,
+  );
 
   // Floats use native C arithmetic (overflow to infinity)
   if (TypeCheckUtils.usesNativeArithmetic(typeInfo!.baseType)) {

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

@@ -15,12 +15,6 @@ import StringUtils from "../../../../../utils/StringUtils";
 import TypeCheckUtils from "../../../../../utils/TypeCheckUtils";
 import TAssignmentHandler from "./TAssignmentHandler";
 import CodeGenState from "../../../../state/CodeGenState";
-import type ICodeGenApi from "../../types/ICodeGenApi";
-
-/** Get typed generator reference */
-function gen(): ICodeGenApi {
-  return CodeGenState.generator as ICodeGenApi;
-}
 
 /**
  * Validate compound operators are not used with strings.
@@ -47,7 +41,9 @@ function handleSimpleStringAssignment(ctx: IAssignmentContext): string {
 
   CodeGenState.needsString = true;
 
-  const target = gen().generateAssignmentTarget(ctx.targetCtx);
+  const target = CodeGenState.requireGenerator().generateAssignmentTarget(
+    ctx.targetCtx,
+  );
   return StringUtils.copyWithNull(target, ctx.generatedValue, capacity);
 }
 
@@ -111,7 +107,9 @@ function handleStringThisMember(ctx: IAssignmentContext): string {
 
   CodeGenState.needsString = true;
 
-  const target = gen().generateAssignmentTarget(ctx.targetCtx);
+  const target = CodeGenState.requireGenerator().generateAssignmentTarget(
+    ctx.targetCtx,
+  );
   return StringUtils.copyWithNull(target, ctx.generatedValue, capacity);
 }
 
@@ -149,7 +147,9 @@ function handleStringArrayElement(ctx: IAssignmentContext): string {
 
   CodeGenState.needsString = true;
 
-  const index = gen().generateExpression(ctx.subscripts[0]);
+  const index = CodeGenState.requireGenerator().generateExpression(
+    ctx.subscripts[0],
+  );
   return StringUtils.copyToArrayElement(
     name,
     index,
@@ -183,7 +183,9 @@ function handleStringStructArrayElement(ctx: IAssignmentContext): string {
 
   CodeGenState.needsString = true;
 
-  const index = gen().generateExpression(ctx.subscripts[0]);
+  const index = CodeGenState.requireGenerator().generateExpression(
+    ctx.subscripts[0],
+  );
   return StringUtils.copyToStructFieldArrayElement(
     structName,
     fieldName,