LuaTables can now be indexed by LuaVals.

Author: rbartlensky

luavm/src/lib/lua_values/lua_obj.rs

@@ -6,9 +6,10 @@ pub trait LuaObj {
     fn clone_box(&self) -> Box<LuaObj>;
     /// Checks whther the underlying type is a float or an int.
     fn is_number(&self) -> bool;
-    /// Checks whether the underlying type is converted to a float when processed in
-    /// arithmetic expressions.
-    fn is_float(&self) -> bool;
+    /// Returns true if the underlying type is either a float or a string.
+    /// In Lua, if either of these two types are used in an arithmetic
+    /// expression, then both arguments are converted to floats.
+    fn is_aop_float(&self) -> bool;
     /// Checks whether the underlying type is a string or not.
     fn is_string(&self) -> bool;
     /// Converts the underlying type to an int.
@@ -17,6 +18,10 @@ pub trait LuaObj {
     fn to_float(&self) -> Result<f64, LuaError>;
     /// Converts the underlying type to a string.
     fn to_string(&self) -> Result<String, LuaError>;
+    /// Gets a reference to the underlying string.
+    fn get_string_ref(&self) -> Option<&str> {
+        None
+    }
 }
 
 /// Boxes the given `LuaObj`, and returns the address of the box.
@@ -43,7 +48,7 @@ impl LuaObj for LuaInt {
         true
     }
 
-    fn is_float(&self) -> bool {
+    fn is_aop_float(&self) -> bool {
         false
     }
 
@@ -73,7 +78,7 @@ impl LuaObj for LuaFloat {
         true
     }
 
-    fn is_float(&self) -> bool {
+    fn is_aop_float(&self) -> bool {
         true
     }
 
@@ -107,7 +112,7 @@ impl LuaObj for LuaString {
         false
     }
 
-    fn is_float(&self) -> bool {
+    fn is_aop_float(&self) -> bool {
         true
     }
 
@@ -126,4 +131,8 @@ impl LuaObj for LuaString {
     fn to_string(&self) -> Result<String, LuaError> {
         Ok(self.v.clone())
     }
+
+    fn get_string_ref(&self) -> Option<&str> {
+        Some(&self.v)
+    }
 }

luavm/src/lib/lua_values/lua_table.rs

@@ -5,26 +5,22 @@ use LuaVal;
 /// Represents a table in Lua.
 #[derive(Trace, Finalize)]
 pub struct LuaTable {
-    v: GcCell<HashMap<String, LuaVal>>,
+    v: GcCell<HashMap<LuaVal, LuaVal>>,
 }
 
 impl LuaTable {
     /// Creates a table with the given keys, and values.
-    pub fn new(hm: HashMap<String, LuaVal>) -> LuaTable {
+    pub fn new(hm: HashMap<LuaVal, LuaVal>) -> LuaTable {
         LuaTable { v: GcCell::new(hm) }
     }
 
     /// Sets the given attribute to `val`.
-    pub fn set(&self, attr: &str, val: LuaVal) {
-        self.v
-            .borrow_mut()
-            .entry(attr.to_string())
-            .or_insert(LuaVal::new())
-            .set(val);
+    pub fn set_attr(&self, attr: LuaVal, val: LuaVal) {
+        self.v.borrow_mut().insert(attr, val);
     }
 
     /// Gets a reference to given attribute.
-    pub fn get_attr(&self, attr: &str) -> LuaVal {
+    pub fn get_attr(&self, attr: &LuaVal) -> LuaVal {
         match self.v.borrow().get(attr) {
             Some(val) => val.clone(),
             None => LuaVal::new(),