teascade/ferrite-lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix __newindex metamethod, test __call

Browse Source
This commit is contained in:
Sofia 2026-03-21 14:59:26 +02:00
parent 71c11e87e5
commit 1811b91922
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/test.lua
View File

@ -100,7 +100,12 @@ print("hello " .. "there")
SETMETATABLE(table, { SETMETATABLE(table, {
__add = function () __add = function ()
return 1 return 1
end,
__call = function (table, ...)
print(...)
return 1, 2, 3
end end
}) })
print(table + 5) print(table + 5)
print(table("hello", "there"))

13
src/vm/mod.rs
View File

@ -566,10 +566,10 @@ impl ClosureRunner {
.unwrap_or(Value::Nil); .unwrap_or(Value::Nil);
} }
Instruction::SetTable(tablereg, indexreg, valuereg) => { Instruction::SetTable(tablereg, indexreg, valuereg) => {
let table_value = self.stack.get(tablereg); let table_stack_value = self.stack.get(tablereg);
match table_value { match table_stack_value {
Some(value) => { Some(table_value) => {
let mut table = value.borrow_mut(); let mut table = table_value.borrow_mut();
if let Value::Table { if let Value::Table {
contents, contents,
metatable, metatable,
@ -605,7 +605,10 @@ impl ClosureRunner {
match self.call_metamethod( match self.call_metamethod(
metatable, metatable,
"__newindex", "__newindex",
vec![table_value.unwrap().borrow().clone()], vec![Value::Table {
contents: contents.clone(),
metatable: metatable.clone(),
}],
) { ) {
Ok(_) => {} Ok(_) => {}
Err(_) => match value { Err(_) => match value {