Skip to content

Reviewing code for bugs and issues #28

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 5 commits into from
Oct 10, 2026
Merged

Reviewing code for bugs and issues #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1149d86
Fix math max/min precision and validation
Copilot Oct 10, 2026
8dbb70d
Fix remaining math edge cases
Copilot Oct 10, 2026
8609f76
Fix regression expectations for integer validation
Copilot Oct 10, 2026
6578642
Fix JIT random edge cases and regressions
Copilot Oct 10, 2026
0015799
Fix malformed math.pow JIT guard
Copilot Oct 10, 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
15 changes: 9 additions & 6 deletions src/compile/c_gen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3603,7 +3603,7 @@ std::string CGen::TryCompileBuiltinMathCall(const std::shared_ptr<SyntaxTreeFunc
Out() << GenTab() << " " << val1_tmp << " = (" << a1_tmp << ".type_ == VAR_INT ? (double)" << a1_tmp << ".data_.i : " << a1_tmp << ".data_.f);\n";
Out() << GenTab() << " if (" << a2_tmp << ".type_ == VAR_INT) { " << exp_tmp << " = " << a2_tmp << ".data_.i; } ";
Out() << "else { FlToIntChecked(" << a2_tmp << ".data_.f, " << exp_tmp << "); }\n";
Out() << GenTab() << " " << tmp << " = (CVar){.type_ = VAR_FLOAT, .data_.f = ldexp(" << val1_tmp << ", (int)" << exp_tmp << ")};\n";
Out() << GenTab() << " " << tmp << " = (CVar){.type_ = VAR_FLOAT, .data_.f = FlMathLdexp(" << val1_tmp << ", " << exp_tmp << ")};\n";
Out() << GenTab() << "} else {\n";
Out() << GenTab() << " " << tmp << " = FakeluaCallByName(_S, FAKELUA_JIT_TYPE, \"math.ldexp\", 2, " << a1_tmp << ", " << a2_tmp << ");\n";
Out() << GenTab() << "}\n";
Expand Down Expand Up @@ -3683,21 +3683,23 @@ std::string CGen::TryCompileBuiltinMathCall(const std::shared_ptr<SyntaxTreeFunc
func_temp_decls_ << " CVar " << a_tmp << ";\n";
func_temp_decls_ << " int64_t " << val_tmp << ";\n";
Out() << GenTab() << a_tmp << " = " << arg << ";\n";
Out() << GenTab() << "if (" << a_tmp << ".type_ == VAR_INT || " << a_tmp << ".type_ == VAR_FLOAT) {\n";
Out() << GenTab() << "if (" << a_tmp << ".type_ == VAR_INT) { " << val_tmp << " = " << a_tmp << ".data_.i; } ";
Out() << "else if (" << a_tmp << ".type_ == VAR_FLOAT) { FlToIntChecked(" << a_tmp << ".data_.f, " << val_tmp << "); } ";
Out() << "else { FakeluaThrowError(_S, \"bad argument #1 to 'math.random' (number expected)\"); " << val_tmp << " = 0; }\n";
Out() << "\n";
// 与 Lua 5.4 对齐：
// random(0) -> 全范围随机整数（拼 4 个 rand 填满 64 位，跨平台一致）
// random(<0) -> 抛异常 "interval is empty"
// random(>=1)-> [1, n]
const auto rv_tmp = std::format("flua_rv_{}", tmp_var_counter_++);
func_temp_decls_ << " uint64_t " << rv_tmp << ";\n";
Out() << GenTab() << "if (" << val_tmp << " == 0) { ";
Out() << rv_tmp << " = ((uint64_t)rand() << 48) | ((uint64_t)rand() << 32) | ((uint64_t)rand() << 16) | (uint64_t)rand(); ";
Out() << rv_tmp << " = (uint64_t)FlRandomInt64(); ";
Out() << tmp << " = (CVar){.type_ = VAR_INT, .data_.i = (int64_t)" << rv_tmp << "}; }\n";
Out() << GenTab() << "else if (" << val_tmp << " < 0) { ";
Out() << "FakeluaThrowError(_S, \"bad argument #1 to 'math.random' (interval is empty)\"); }\n";
Out() << GenTab() << "else { " << tmp << " = (CVar){.type_ = VAR_INT, .data_.i = 1 + (rand() % " << val_tmp << ")}; }\n";
Out() << GenTab() << "} else { " << tmp << " = FakeluaCallByName(_S, FAKELUA_JIT_TYPE, \"math.random\", 1, " << a_tmp << "); }\n";
} else {
std::string arg1 = CompileExp(raw_args[0]);
std::string arg2 = CompileExp(raw_args[1]);
Expand All @@ -3711,12 +3713,12 @@ std::string CGen::TryCompileBuiltinMathCall(const std::shared_ptr<SyntaxTreeFunc
func_temp_decls_ << " int64_t " << val2_tmp << ";\n";
Out() << GenTab() << a1_tmp << " = " << arg1 << ";\n";
Out() << GenTab() << a2_tmp << " = " << arg2 << ";\n";
Out() << GenTab() << "if ((" << a1_tmp << ".type_ == VAR_INT || " << a1_tmp << ".type_ == VAR_FLOAT) && (" << a2_tmp << ".type_ == VAR_INT || " << a2_tmp << ".type_ == VAR_FLOAT)) {\n";
Out() << GenTab() << "if (" << a1_tmp << ".type_ == VAR_INT) { " << val1_tmp << " = " << a1_tmp << ".data_.i; } ";
Out() << "else if (" << a1_tmp << ".type_ == VAR_FLOAT) { FlToIntChecked(" << a1_tmp << ".data_.f, " << val1_tmp << "); } ";
Out() << "else { FakeluaThrowError(_S, \"bad argument #1 to 'math.random' (number expected)\"); " << val1_tmp << " = 0; }\n";
Out() << GenTab() << "if (" << a2_tmp << ".type_ == VAR_INT) { " << val2_tmp << " = " << a2_tmp << ".data_.i; } ";
Out() << "else if (" << a2_tmp << ".type_ == VAR_FLOAT) { FlToIntChecked(" << a2_tmp << ".data_.f, " << val2_tmp << "); } ";
Out() << "else { FakeluaThrowError(_S, \"bad argument #2 to 'math.random' (number expected)\"); " << val2_tmp << " = 0; }\n";
Out() << "\n";
// 与 Lua 5.4 对齐：
// l > u -> 抛异常 "interval is empty"
// l == u -> 返回 l
Expand All @@ -3731,9 +3733,10 @@ std::string CGen::TryCompileBuiltinMathCall(const std::shared_ptr<SyntaxTreeFunc
Out() << tmp << " = (CVar){.type_ = VAR_INT, .data_.i = " << val1_tmp << "}; }\n";
Out() << GenTab() << "else { ";
Out() << range_tmp << " = (uint64_t)" << val2_tmp << " - (uint64_t)" << val1_tmp << " + 1; ";
Out() << "if (" << range_tmp << " == 0) { " << tmp << " = (CVar){.type_ = VAR_INT, .data_.i = " << val1_tmp << "}; } ";
Out() << "if (" << range_tmp << " == 0) { " << tmp << " = (CVar){.type_ = VAR_INT, .data_.i = FlRandomInt64()}; } ";
Out() << "else { " << rv_tmp << " = ((uint64_t)rand() << 32) | (uint64_t)rand(); ";
Out() << tmp << " = (CVar){.type_ = VAR_INT, .data_.i = " << val1_tmp << " + (int64_t)(" << rv_tmp << " % " << range_tmp << ")}; } }\n";
Out() << GenTab() << "} else { " << tmp << " = FakeluaCallByName(_S, FAKELUA_JIT_TYPE, \"math.random\", 2, " << a1_tmp << ", " << a2_tmp << "); }\n";
}
return tmp;
}
Expand Down
13 changes: 13 additions & 0 deletions src/compile/c_runtime_header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,6 +1681,19 @@ static inline CVar FlMathModf(CVar v) {
return r;
}

static inline double FlMathLdexp(double value, int64_t exponent) {
if (exponent > 2147483647LL) exponent = 2147483647LL;
if (exponent < (-2147483647LL - 1)) exponent = (-2147483647LL - 1);
return ldexp(value, (int)exponent);
}

static inline int64_t FlRandomInt64(void) {
uint64_t value = 0;
for (int i = 0; i < 5; ++i) {
value = (value << 15) | (uint64_t)(rand() & 0x7fff);
}
return (int64_t)value;
}

// 整数 for 步进：用无符号加法探测有符号溢出。溢出返回 0 且不改 *ctrl
//（避免 maxinteger++ 变成 mininteger 后死循环）。continue 仍走 for 的 incr 子句。
Expand Down
Loading
Loading