- * 本类负责将 IR 层的常量加载指令 {@link LoadConstInstruction} 转换为对应的虚拟机指令。
- * 额外支持：如果常量类型为 {@code String}，会同步登记到
- * {@link CallGenerator} 的字符串常量池，方便 syscall 降级场景使用。
+ * This class is responsible for converting IR-level {@link LoadConstInstruction} into corresponding VM instructions.
+ * If the constant is a {@code String}, it will also be registered in the
+ * {@link CallGenerator} string constant pool to support syscall downgrade scenarios.
+ *
+ *
+ *
+ * Fix: When the constant is an array (List), type information is preserved in R_PUSH payload:
+ *
+ *
Float is output with f suffix (e.g., 0.1f);
+ *
Long is output with L suffix (e.g., 123L);
+ *
Double/Integer are output in their default format (e.g., 1.0, 42);
+ *
Supports recursive serialization of nested arrays.
+ *
+ * This prevents float values from being misinterpreted as double on the VM side,
+ * and avoids Double→Float cast exceptions in later F_STORE operations.
*
*/
public class LoadConstGenerator implements InstructionGenerator {
/**
- * 指定本生成器支持的 IR 指令类型（LoadConstInstruction）
+ * Formats a constant value as a string for use as a VM payload.
+ * Lists are recursively serialized, and Float/Long types include suffixes to preserve type information.
+ *
+ * @param v The constant value to format.
+ * @return The formatted string for use in VM code.
+ */
+ private static String formatConst(Object v) {
+ return formatConst(v, false);
+ }
+
+ /**
+ * Internal helper for recursively formatting constant values (including nested arrays)
+ * with appropriate type suffixes for array payloads.
+ *
+ * @param v The constant value to format.
+ * @param insideArray True if currently formatting inside an array context; affects whether type suffixes are applied.
+ * @return The formatted string for use in VM code.
+ */
+ private static String formatConst(Object v, boolean insideArray) {
+ if (v instanceof List list) {
+ // Recursively process each element in the list
+ return "[" + list.stream()
+ .map(x -> formatConst(x, true))
+ .collect(Collectors.joining(", ")) + "]";
+ }
+ if (v instanceof String s) {
+ return s;
+ }
+ if (v instanceof Float f) {
+ // Always keep .0 for integer values
+ float fv = f;
+ String s = (fv == (long) fv) ? String.format("%.1f", fv) : f.toString();
+ return insideArray ? (s + "f") : s;
+ }
+ if (v instanceof Long l) {
+ return insideArray ? (l + "L") : l.toString();
+ }
+ if (v instanceof Double d) {
+ double dv = d;
+ // Always keep .0 for integer values
+ return (dv == (long) dv) ? String.format("%.1f", dv) : Double.toString(dv);
+ }
+ if (v instanceof Short s) {
+ return insideArray ? (s + "s") : Short.toString(s);
+ }
+ if (v instanceof Byte b) {
+ return insideArray ? (b + "b") : Byte.toString(b);
+ }
+ if (v instanceof Boolean b) {
+ return b ? "1" : "0";
+ }
+ return String.valueOf(v);
+ }
+
+
+ /**
+ * Specifies the type of IR instruction supported by this generator.
+ *
+ * @return The class object representing {@link LoadConstInstruction}.
*/
@Override
public Class supportedClass() {
@@ -29,12 +101,16 @@ public class LoadConstGenerator implements InstructionGenerator
+ * This includes formatting the constant value, emitting the corresponding PUSH and STORE instructions,
+ * marking the local slot type for later operations, and registering string constants if necessary.
+ *
*
- * @param ins 当前常量加载指令
- * @param out 指令输出构建器
- * @param slotMap 虚拟寄存器与物理槽位映射
- * @param currentFn 当前函数名
+ * @param ins The {@link LoadConstInstruction} to generate code for.
+ * @param out The {@link VMProgramBuilder} used to collect the generated instructions.
+ * @param slotMap A mapping from {@link IRVirtualRegister} to physical slot indices.
+ * @param currentFn The name of the current function.
*/
@Override
public void generate(LoadConstInstruction ins,
@@ -42,34 +118,35 @@ public class LoadConstGenerator implements InstructionGenerator slotMap,
String currentFn) {
- /* 1. 获取常量值 */
+ // 1. Get the constant value
IRConstant constant = (IRConstant) ins.operands().getFirst();
Object value = constant.value();
- /* 2. 生成 PUSH 指令，将常量值入栈 */
- out.emit(OpHelper.pushOpcodeFor(value) + " " + value);
+ // 2. Generate PUSH instruction (array constants use type-aware formatting)
+ String payload = formatConst(value);
+ out.emit(OpHelper.pushOpcodeFor(value) + " " + payload);
- /* 3. STORE 到目标槽位 */
+ // 3. STORE the result to the destination slot
int slot = slotMap.get(ins.dest());
out.emit(OpHelper.storeOpcodeFor(value) + " " + slot);
- /* 4. 标记槽位数据类型（用于后续类型推断和 LOAD/STORE 指令选择） */
+ // 4. Mark the slot's data type for later inference and instruction selection
char prefix = switch (value) {
- case Integer _ -> 'I'; // 整型
- case Long _ -> 'L'; // 长整型
- case Short _ -> 'S'; // 短整型
- case Byte _ -> 'B'; // 字节型
- case Double _ -> 'D'; // 双精度
- case Float _ -> 'F'; // 单精度
- case Boolean _ -> 'I'; // 布尔类型用 I 处理
- case String _ -> 'R'; // 字符串常量
- case null, default -> // 其它类型异常
- throw new IllegalStateException("未知的常量类型: "
- + (value != null ? value.getClass() : null));
+ case Integer _ -> 'I'; // Integer
+ case Long _ -> 'L'; // Long
+ case Short _ -> 'S'; // Short
+ case Byte _ -> 'B'; // Byte
+ case Double _ -> 'D'; // Double
+ case Float _ -> 'F'; // Float
+ case Boolean _ -> 'I'; // Boolean handled as Integer (typically lowered to 1/0)
+ case String _ -> 'R'; // String constant
+ case java.util.List _ -> 'R'; // Reference type (arrays, etc.)
+ case null, default -> throw new IllegalStateException("Unknown constant type: "
+ + (value != null ? value.getClass() : null));
};
out.setSlotType(slot, prefix);
- /* 5. 如果是字符串常量，则登记到 CallGenerator 的常量池，便于 syscall 字符串降级使用 */
+ // 5. If the constant is a string, register it for the CallGenerator string pool
if (value instanceof String s) {
CallGenerator.registerStringConst(ins.dest().id(), s);
}
diff --git a/src/main/java/org/jcnc/snow/compiler/backend/utils/OpHelper.java b/src/main/java/org/jcnc/snow/compiler/backend/utils/OpHelper.java
index 977c85e..2b5f8c8 100644
--- a/src/main/java/org/jcnc/snow/compiler/backend/utils/OpHelper.java
+++ b/src/main/java/org/jcnc/snow/compiler/backend/utils/OpHelper.java
@@ -234,6 +234,7 @@ public final class OpHelper {
if (v instanceof Double) return "D";
if (v instanceof Float) return "F";
if (v instanceof String) return "R"; //引用类型
+ if (v instanceof java.util.List) return "R"; // 引用类型（数组等）
throw new IllegalStateException("Unknown const type: " + v.getClass());
}
diff --git a/src/main/java/org/jcnc/snow/compiler/ir/builder/ExpressionBuilder.java b/src/main/java/org/jcnc/snow/compiler/ir/builder/ExpressionBuilder.java
index eab2d75..47bb4a4 100644
--- a/src/main/java/org/jcnc/snow/compiler/ir/builder/ExpressionBuilder.java
+++ b/src/main/java/org/jcnc/snow/compiler/ir/builder/ExpressionBuilder.java
@@ -1,6 +1,7 @@
package org.jcnc.snow.compiler.ir.builder;
import org.jcnc.snow.compiler.ir.core.IROpCode;
+import org.jcnc.snow.compiler.ir.core.IRValue;
import org.jcnc.snow.compiler.ir.instruction.CallInstruction;
import org.jcnc.snow.compiler.ir.instruction.LoadConstInstruction;
import org.jcnc.snow.compiler.ir.instruction.UnaryOperationInstruction;
@@ -11,40 +12,26 @@ import org.jcnc.snow.compiler.ir.value.IRVirtualRegister;
import org.jcnc.snow.compiler.parser.ast.*;
import org.jcnc.snow.compiler.parser.ast.base.ExpressionNode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
/**
- * ExpressionBuilder - 表达式 → IR 构建器
- *
+ * {@code ExpressionBuilder} 表达式 → IR 构建器。
*
* 负责将 AST 表达式节点递归转换为 IR 虚拟寄存器操作，并生成对应的 IR 指令序列。
- * 支持字面量、标识符、二元表达式、一元表达式、函数调用等多种类型表达式。
- *