Address comments.

rbartlensky · Jan 15, 2019 · ee8361c · ee8361c
1 parent 6a8d0f7
commit ee8361c
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/luavm/src/lib/instructions/tables.rs b/luavm/src/lib/instructions/tables.rs
@@ -10,7 +10,13 @@ pub fn get_attr(vm: &mut Vm, instr: u32) -> Result<(), LuaError> {
         let from = &vm.registers[arg2];
         let attr = &vm.registers[third_arg(instr) as usize];
         match attr.get_constant_index() {
-            Some(i) if arg2 == ENV_REG => vm.env_attrs[i].clone(),
+            Some(i) => {
+                if arg2 == ENV_REG {
+                    vm.env_attrs[i].clone()
+                } else {
+                    from.get_attr(attr)?
+                }
+            }
             _ => from.get_attr(attr)?,
         }
     };
@@ -24,7 +30,13 @@ pub fn set_attr(vm: &mut Vm, instr: u32) -> Result<(), LuaError> {
     let val = vm.registers[third_arg(instr) as usize].clone();
     let arg1 = first_arg(instr) as usize;
     match attr.get_constant_index() {
-        Some(i) if arg1 == ENV_REG => vm.env_attrs[i] = val,
+        Some(i) => {
+            if arg1 == ENV_REG {
+                vm.env_attrs[i] = val
+            } else {
+                vm.registers[arg1].set_attr(attr, val)?
+            }
+        }
         _ => vm.registers[arg1].set_attr(attr, val)?,
     }
     Ok(())