Fix vector element assignment issues

include/chaiscript/dispatchkit/bootstrap.hpp

@@ -470,6 +470,7 @@ namespace chaiscript
         m->add(fun(&Boxed_Value::is_type), "is_type");
         m->add(fun(&Boxed_Value::get_attr), "get_var_attr");
         m->add(fun(&Boxed_Value::copy_attrs), "copy_var_attrs");
+        m->add(fun(&Boxed_Value::clone_attrs), "clone_var_attrs");
 
         m->add(fun(&Boxed_Value::get_type_info), "get_type_info");
         m->add(user_type<Type_Info>(), "Type_Info");

include/chaiscript/dispatchkit/boxed_value.hpp

@@ -297,6 +297,13 @@ namespace chaiscript
         return *this;
       }
 
+      Boxed_Value &clone_attrs(const Boxed_Value &t_obj)
+      {
+        copy_attrs(t_obj);
+        reset_return_value();
+        return *this;
+      }
+
 
       /// \returns true if the two Boxed_Values share the same internal type
       static bool type_match(const Boxed_Value &l, const Boxed_Value &r) CHAISCRIPT_NOEXCEPT

include/chaiscript/dispatchkit/dispatchkit.hpp

@@ -1031,13 +1031,7 @@ namespace chaiscript
           uint_fast32_t loc = t_loc.load(std::memory_order_relaxed);
           const auto funs = get_function(t_name, loc);
           if (funs.first != loc) t_loc.store(uint_fast32_t(funs.first), std::memory_order_relaxed);
-          Boxed_Value bv = dispatch::dispatch(*funs.second, params, m_conversions);
-          // the result of a clone is never to be marked as a return_value
-          // \todo see if we can eliminate this comparison
-          if (t_name == "clone") {
-            bv.reset_return_value();
-          }
-          return bv;
+          return dispatch::dispatch(*funs.second, params, m_conversions);
         }
 
 

include/chaiscript/language/chaiscript_prelude.chai

@@ -41,25 +41,25 @@ def new(x) {
 }
 
 def clone(double x) {
-  double(x).copy_var_attrs(x)
+  double(x).clone_var_attrs(x)
 }
 
 def clone(string x) {
-  string(x).copy_var_attrs(x)
+  string(x).clone_var_attrs(x)
 }
 
 def clone(vector x) {
-  vector(x).copy_var_attrs(x)
+  vector(x).clone_var_attrs(x)
 }
 
 
 def clone(int x) {
-  int(x).copy_var_attrs(x)
+  int(x).clone_var_attrs(x)
 }
 
 def clone(x) : function_exists(type_name(x)) && call_exists(eval(type_name(x)), x)
 {
-  eval(type_name(x))(x).copy_var_attrs(x);
+  eval(type_name(x))(x).clone_var_attrs(x);
 }
 
 

unittests/vector_assignment.chai

@@ -1,5 +1,7 @@
 var v = []
-v.push_back(3.4, 1, "bob");
+v.push_back(3.4);
+v.push_back(1);
+v.push_back("bob");
 
 assert_true(v[0] == 3.4)
 assert_true(v[1] == 1)