Skip to content

fix: match Lua unary minus, for-in multi-return, and native range checks #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
esrrhs merged 2 commits into from
Sep 19, 2026
Merged

fix: match Lua unary minus, for-in multi-return, and native range checks #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a308c7b
fix: match Lua unary minus, for-in multi-return, and native range checks
esrrhs Sep 18, 2026
31a4ab0
fix: expect 1.0/0.0 C literals in typed-float infer tests
esrrhs Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 71 additions & 38 deletions src/compile/c_gen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,16 @@ bool CGen::ClassifyLiteralKey(const SyntaxTreeInterfacePtr &exp, LiteralKeyInfo
out.repr = exp_node->ExpValue();
return true;
}
if (exp_node->GetExpKind() == ExpKind::kNumber) {
{
TableKeyKind kind = TableKeyKind::kInt;
std::string canonical;
int64_t int_value = 0;
double float_value = 0;
if (!ClassifyLuaNumberKey(exp_node->ExpValue(), kind, canonical, int_value, float_value)) {
return false;
if (ClassifyConstNumberExp(exp, kind, canonical, int_value, float_value)) {
out.kind = kind;
out.repr = canonical;
return true;
}
out.kind = kind;
out.repr = canonical;
return true;
}
if (exp_node->GetExpKind() == ExpKind::kTrue) {
out.kind = TableKeyKind::kBool;
Expand Down Expand Up @@ -343,9 +342,9 @@ void CGen::EmitSpecAccessorBody(const SpecTypeMetadata &meta, bool is_get) {
for (const auto &f: meta.fields) {
if (f.key_kind == TableKeyKind::kFloat) {
if (is_get) {
Out() << " if (__fval == " << f.float_value << ") { *__finish = true; return s->" << f.c_field_name << "; }\n";
Out() << " if (__fval == " << FormatCDoubleLiteral(f.float_value) << ") { *__finish = true; return s->" << f.c_field_name << "; }\n";
} else {
Out() << " if (__fval == " << f.float_value << ") { s->" << f.c_field_name << " = v; tbl->spec_vals[" << f_idx << "] = v; tbl->spec_keys[" << f_idx
Out() << " if (__fval == " << FormatCDoubleLiteral(f.float_value) << ") { s->" << f.c_field_name << " = v; tbl->spec_vals[" << f_idx << "] = v; tbl->spec_keys[" << f_idx
<< "] = k; *__finish = true; return; }\n";
}
}
Expand All @@ -357,9 +356,9 @@ void CGen::EmitSpecAccessorBody(const SpecTypeMetadata &meta, bool is_get) {
for (const auto &f: meta.fields) {
if (f.key_kind == TableKeyKind::kFloat) {
if (is_get) {
Out() << " if ((double)__ival == " << f.float_value << ") { *__finish = true; return s->" << f.c_field_name << "; }\n";
Out() << " if ((double)__ival == " << FormatCDoubleLiteral(f.float_value) << ") { *__finish = true; return s->" << f.c_field_name << "; }\n";
} else {
Out() << " if ((double)__ival == " << f.float_value << ") { s->" << f.c_field_name << " = v; tbl->spec_vals[" << f_idx << "] = v; tbl->spec_keys[" << f_idx
Out() << " if ((double)__ival == " << FormatCDoubleLiteral(f.float_value) << ") { s->" << f.c_field_name << " = v; tbl->spec_vals[" << f_idx << "] = v; tbl->spec_keys[" << f_idx
<< "] = k; *__finish = true; return; }\n";
}
}
Expand Down Expand Up @@ -1653,17 +1652,23 @@ void CGen::CompileTypedNumericForLoop(const std::shared_ptr<SyntaxTreeForLoop> &
is_constant_step = true;
step_double_val = 1.0;
step_int_val = 1;
} else if (const auto step_exp = std::dynamic_pointer_cast<SyntaxTreeExp>(for_stmt->ExpStep()); step_exp && step_exp->GetExpKind() == ExpKind::kNumber) {
is_constant_step = true;
if (loop_type == T_INT) {
step_int_val = ToInteger(step_exp->ExpValue());
if (step_int_val == 0) {
ThrowError("'for' step is zero", for_stmt->ExpStep());
}
} else {
step_double_val = (LookupNodeType(step_exp.get()) == T_INT) ? static_cast<double>(ToInteger(step_exp->ExpValue())) : ToFloat(step_exp->ExpValue());
if (step_double_val == 0.0) {
ThrowError("'for' step is zero", for_stmt->ExpStep());
} else {
TableKeyKind step_kind = TableKeyKind::kInt;
std::string step_canonical;
int64_t step_ival = 0;
double step_fval = 0;
if (ClassifyConstNumberExp(for_stmt->ExpStep(), step_kind, step_canonical, step_ival, step_fval)) {
is_constant_step = true;
if (loop_type == T_INT) {
step_int_val = (step_kind == TableKeyKind::kInt) ? step_ival : static_cast<int64_t>(step_fval);
if (step_int_val == 0) {
ThrowError("'for' step is zero", for_stmt->ExpStep());
}
} else {
step_double_val = (step_kind == TableKeyKind::kInt) ? static_cast<double>(step_ival) : step_fval;
if (step_double_val == 0.0) {
ThrowError("'for' step is zero", for_stmt->ExpStep());
}
}
}
}
Expand Down Expand Up @@ -2059,7 +2064,7 @@ void CGen::CompileStmtForIn(const SyntaxTreeInterfacePtr &stmt) {

const auto &exps = explist_ptr->Exps();
if (exps.size() == 1) {
std::string exp0_compiled = CompileExp(exps[0]);
std::string exp0_compiled = CompileExp(exps[0], true);
std::string tmp_exp0 = std::format("flua_fi_exp0_{}", tmp_var_counter_++);
func_temp_decls_ << " CVar " << tmp_exp0 << ";\n";
Out() << GenTab() << tmp_exp0 << " = " << exp0_compiled << ";\n";
Expand All @@ -2073,13 +2078,26 @@ void CGen::CompileStmtForIn(const SyntaxTreeInterfacePtr &stmt) {
Out() << GenTab() << " " << iter_s << " = kNil;\n";
Out() << GenTab() << " " << iter_var << " = kNil;\n";
Out() << GenTab() << "}\n";
} else if (exps.size() == 2) {
std::string e0 = CompileExp(exps[0], false);
std::string e1 = CompileExp(exps[1], true);
std::string tmp_e1 = std::format("flua_fi_e1_{}", tmp_var_counter_++);
func_temp_decls_ << " CVar " << tmp_e1 << ";\n";
Out() << GenTab() << iter_f << " = FlUnboxMulti(" << e0 << ", 0);\n";
Out() << GenTab() << tmp_e1 << " = " << e1 << ";\n";
Out() << GenTab() << iter_s << " = FlUnboxMulti(" << tmp_e1 << ", 0);\n";
Out() << GenTab() << iter_var << " = FlUnboxMulti(" << tmp_e1 << ", 1);\n";
} else {
std::string e0 = CompileExp(exps[0]);
std::string e1 = (exps.size() >= 2) ? CompileExp(exps[1]) : "kNil";
std::string e2 = (exps.size() >= 3) ? CompileExp(exps[2]) : "kNil";
std::string e0 = CompileExp(exps[0], false);
std::string e1 = CompileExp(exps[1], false);
const bool last_of_three = exps.size() == 3;
std::string e2 = CompileExp(exps[2], last_of_three);
Out() << GenTab() << iter_f << " = FlUnboxMulti(" << e0 << ", 0);\n";
Out() << GenTab() << iter_s << " = FlUnboxMulti(" << e1 << ", 0);\n";
Out() << GenTab() << iter_var << " = FlUnboxMulti(" << e2 << ", 0);\n";
for (size_t i = 3; i < exps.size(); ++i) {
Out() << GenTab() << "(void)(" << CompileExp(exps[i], i + 1 == exps.size()) << ");\n";
}
}

Out() << GenTab() << "while (true) {\n";
Expand Down Expand Up @@ -2877,6 +2895,20 @@ std::string CGen::CompileNumericExp(const SyntaxTreeInterfacePtr &exp) {

const auto e = std::dynamic_pointer_cast<SyntaxTreeExp>(exp);

{
TableKeyKind kind = TableKeyKind::kInt;
std::string canonical;
int64_t int_value = 0;
double float_value = 0;
if (ClassifyConstNumberExp(exp, kind, canonical, int_value, float_value)) {
if (ConstNumberExpIsIntValue(kind, exp)) {
return std::to_string(int_value);
}
const double d = (kind == TableKeyKind::kInt) ? static_cast<double>(int_value) : float_value;
return FormatCDoubleLiteral(d);
}
}

if (const auto exp_kind = e->GetExpKind(); exp_kind == ExpKind::kNumber) {
if (LookupNodeType(e.get()) == T_INT) {
return std::to_string(ToInteger(e->ExpValue()));
Expand Down Expand Up @@ -3114,7 +3146,6 @@ std::string CGen::CompileFunctioncall(const SyntaxTreeInterfacePtr &functioncall
std::string expansion_tmp;
int expansion_start_idx = 0;

CompileCallArgs(args_ptr, args_kind, compiled_args, has_expansion, expansion_tmp, expansion_start_idx);
std::string func_name;
const SyntaxTreeVar *var_ptr = nullptr;
ResolveCalleeName(pe_pre_ptr, func_name, var_ptr);
Expand All @@ -3123,6 +3154,17 @@ std::string CGen::CompileFunctioncall(const SyntaxTreeInterfacePtr &functioncall
var = std::dynamic_pointer_cast<SyntaxTreeVar>(pe_pre_ptr->GetValue());
}

std::string method_obj_tmp;
if (!fc->Name().empty()) {
// Lua：先求 prefix（接收者），再求参数。obj():f(arg()) 必须先跑 obj()。
std::string obj_expr = var ? CompileVar(var) : CompilePrefixexp(pe_pre_ptr);
method_obj_tmp = std::format("flua_obj_{}", tmp_var_counter_++);
func_temp_decls_ << " CVar " << method_obj_tmp << ";\n";
Out() << GenTab() << method_obj_tmp << " = " << obj_expr << ";\n";
}

CompileCallArgs(args_ptr, args_kind, compiled_args, has_expansion, expansion_tmp, expansion_start_idx);

if (!func_name.empty() && func_name == "FAKELUA_SET_TABLE") {
if (compiled_args.size() != 3) {
ThrowError("FAKELUA_SET_TABLE expects exactly 3 arguments", functioncall);
Expand Down Expand Up @@ -3157,7 +3199,7 @@ std::string CGen::CompileFunctioncall(const SyntaxTreeInterfacePtr &functioncall
if (local_func_names_.contains(func_name) && !is_local_callee) {
call_expr = BuildLocalFunctionCall(func_name, compiled_args, has_expansion, expansion_tmp, expansion_start_idx);
} else if (!fc->Name().empty()) {
call_expr = BuildMethodCall(fc, pe_pre, pe_pre_ptr, var, compiled_args, has_expansion, expansion_tmp);
call_expr = BuildMethodCall(fc, pe_pre_ptr, method_obj_tmp, compiled_args, has_expansion, expansion_tmp);
} else {
call_expr = BuildDynamicCall(func_name, pe_pre, pe_pre_ptr, var, compiled_args, has_expansion, expansion_tmp, is_local_callee);
}
Expand Down Expand Up @@ -4525,22 +4567,13 @@ std::string CGen::BuildLocalFunctionCall(const std::string &func_name, const std
return call_expr;
}

std::string CGen::BuildMethodCall(const std::shared_ptr<SyntaxTreeFunctioncall> &fc, SyntaxTreeInterfacePtr pe_pre, const std::shared_ptr<SyntaxTreePrefixexp> &pe_pre_ptr,
const std::shared_ptr<SyntaxTreeVar> &var, const std::vector<std::string> &compiled_args, bool has_expansion, const std::string &expansion_tmp) {
std::string CGen::BuildMethodCall(const std::shared_ptr<SyntaxTreeFunctioncall> &fc, const std::shared_ptr<SyntaxTreePrefixexp> &pe_pre_ptr, const std::string &obj_tmp,
const std::vector<std::string> &compiled_args, bool has_expansion, const std::string &expansion_tmp) {
auto args = compiled_args;
if (has_expansion) {
args.push_back(expansion_tmp);
}
const std::string &method_name = fc->Name();
std::string obj_expr;
if (var) {
obj_expr = CompileVar(var);
} else {
obj_expr = CompilePrefixexp(pe_pre_ptr);
}
std::string obj_tmp = std::format("flua_obj_{}", tmp_var_counter_++);
func_temp_decls_ << " CVar " << obj_tmp << ";\n";
Out() << GenTab() << obj_tmp << " = " << obj_expr << ";\n";

// 构造参数列表（对象本身作为第一个参数）
std::vector<std::string> final_args;
Expand Down
4 changes: 2 additions & 2 deletions src/compile/c_gen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ class CGen {
int &expansion_start_idx);
void ResolveCalleeName(const std::shared_ptr<SyntaxTreePrefixexp> &pe_pre_ptr, std::string &func_name, const SyntaxTreeVar *&var_ptr);
std::string BuildLocalFunctionCall(const std::string &func_name, const std::vector<std::string> &compiled_args, bool has_expansion, const std::string &expansion_tmp, int expansion_start_idx);
std::string BuildMethodCall(const std::shared_ptr<SyntaxTreeFunctioncall> &fc, SyntaxTreeInterfacePtr pe_pre, const std::shared_ptr<SyntaxTreePrefixexp> &pe_pre_ptr,
const std::shared_ptr<SyntaxTreeVar> &var, const std::vector<std::string> &compiled_args, bool has_expansion, const std::string &expansion_tmp);
std::string BuildMethodCall(const std::shared_ptr<SyntaxTreeFunctioncall> &fc, const std::shared_ptr<SyntaxTreePrefixexp> &pe_pre_ptr, const std::string &obj_tmp,
const std::vector<std::string> &compiled_args, bool has_expansion, const std::string &expansion_tmp);
std::string BuildDynamicCall(const std::string &func_name, SyntaxTreeInterfacePtr pe_pre, const std::shared_ptr<SyntaxTreePrefixexp> &pe_pre_ptr, const std::shared_ptr<SyntaxTreeVar> &var,
const std::vector<std::string> &compiled_args, bool has_expansion, const std::string &expansion_tmp, bool is_local_callee);
// EmitSpecAccessorBody：按 key kind 发射 get/set 的 if-else/switch 条件逻辑
Expand Down
80 changes: 80 additions & 0 deletions src/compile/compile_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "jit/vm_function.h"
#include "syntax_tree.h"
#include "util/debug.h"
#include "util/string_util.h"
#include <algorithm>
#include <cmath>
#include <cstdint>
Expand Down Expand Up @@ -345,6 +346,85 @@ inline bool ClassifyLuaNumberKey(const std::string &num_str, TableKeyKind &kind,
}
}

// 常量数字表达式：字面量，或一元减号叠在字面量上（lexer 不再把 -1 收成单个 NUMBER）。
inline bool ClassifyConstNumberExp(const SyntaxTreeInterfacePtr &node, TableKeyKind &kind, std::string &canonical, int64_t &int_value, double &float_value) {
const auto exp = std::dynamic_pointer_cast<SyntaxTreeExp>(node);
if (!exp) {
return false;
}
if (exp->GetExpKind() == ExpKind::kNumber) {
return ClassifyLuaNumberKey(exp->ExpValue(), kind, canonical, int_value, float_value);
}
if (exp->GetExpKind() != ExpKind::kUnop) {
return false;
}
const auto op = std::dynamic_pointer_cast<SyntaxTreeUnop>(exp->Op());
if (!op || op->GetOpKind() != UnOpKind::kMinus) {
return false;
}
if (!ClassifyConstNumberExp(exp->Right(), kind, canonical, int_value, float_value)) {
return false;
}
if (kind == TableKeyKind::kInt) {
if (int_value == std::numeric_limits<int64_t>::min()) {
kind = TableKeyKind::kFloat;
float_value = -static_cast<double>(int_value);
canonical = std::format("{:.17g}", float_value);
int_value = 0;
} else {
int_value = -int_value;
canonical = std::to_string(int_value);
}
} else {
float_value = -float_value;
// lexer 把 -9223372036854775808 拆成 UNMINUS + 2^63；2^63 只能先当 float，
// 取负后正好是 mininteger，应对齐 Lua 收成整数。
constexpr double kTwo63 = 9223372036854775808.0;
if (float_value == -kTwo63) {
kind = TableKeyKind::kInt;
int_value = std::numeric_limits<int64_t>::min();
canonical = std::to_string(int_value);
float_value = 0.0;
} else if (!canonical.empty() && canonical.front() == '-') {
canonical = canonical.substr(1);
} else {
canonical.insert(canonical.begin(), '-');
}
}
return true;
}

// 表键可以把 1.0 收成整数；表达式值必须跟 Lua 字面量语法走：1.0 / 1e0 仍是 float。
inline bool ConstNumberExpHasFloatSyntax(const SyntaxTreeInterfacePtr &node) {
const auto exp = std::dynamic_pointer_cast<SyntaxTreeExp>(node);
if (!exp) {
return false;
}
if (exp->GetExpKind() == ExpKind::kNumber) {
return !IsInteger(exp->ExpValue());
}
if (exp->GetExpKind() != ExpKind::kUnop) {
return false;
}
const auto op = std::dynamic_pointer_cast<SyntaxTreeUnop>(exp->Op());
if (!op || op->GetOpKind() != UnOpKind::kMinus) {
return false;
}
return ConstNumberExpHasFloatSyntax(exp->Right());
}

inline bool ConstNumberExpIsIntValue(TableKeyKind kind, const SyntaxTreeInterfacePtr &node) {
return kind == TableKeyKind::kInt && !ConstNumberExpHasFloatSyntax(node);
}

inline std::string FormatCDoubleLiteral(double d) {
std::string s = std::format("{:.17g}", d);
if (s.find('.') == std::string::npos && s.find('e') == std::string::npos && s.find('E') == std::string::npos) {
s += ".0";
}
return s;
}

inline std::string EscapeCStringLiteral(const std::string &s) {
std::string out;
out.reserve(s.size() + 8);
Expand Down
Loading
Loading