From 349425fe8a5ae221c49d2cdfe71497bbebbfbe34 Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Sun, 20 May 2012 07:04:22 -0600
Subject: [PATCH] Make vector inplace construction consistent with map

  - Clone elements into both vector and map
  - Be sure to drop dependencies after elements are cloned in
---
 CMakeLists.txt                                |  2 +-
 .../chaiscript/language/chaiscript_eval.hpp   | 23 +++++++++++++------
 unittests/map_inplace_init.chai               | 11 +++++++++
 unittests/vector_inplace_init.chai            | 12 ++++++++++
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d3e07d..65989e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ if(BUILD_TESTING)
 
     add_executable(short_comparison_test unittests/short_comparison_test.cpp)
     target_link_libraries(short_comparison_test ${LIBS})
-    add_test(NAME short_comparison_test COMMAND short_comparison_test)
+    add_test(NAME Short_Comparison_Test COMMAND short_comparison_test)
 
 
     add_executable(multifile_test unittests/multifile_test_main.cpp unittests/multifile_test_chai.cpp
diff --git a/include/chaiscript/language/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp
index 828a041..e542f85 100644
--- a/include/chaiscript/language/chaiscript_eval.hpp
+++ b/include/chaiscript/language/chaiscript_eval.hpp
@@ -831,14 +831,21 @@ namespace chaiscript
           AST_Node(t_ast_node_text, t_id, t_fname, t_start_line, t_start_col, t_end_line, t_end_col) { }
         virtual ~Inline_Array_AST_Node() {}
         virtual Boxed_Value eval_internal(chaiscript::detail::Dispatch_Engine &t_ss){
-          std::vector<Boxed_Value> vec;
-          if (this->children.size() > 0) {
-            for (size_t i = 0; i < this->children[0]->children.size(); ++i) {
-              vec.push_back(this->children[0]->children[i]->eval(t_ss));
+          try {
+            std::vector<Boxed_Value> vec;
+            if (this->children.size() > 0) {
+              for (size_t i = 0; i < this->children[0]->children.size(); ++i) {
+                Boxed_Value bv = t_ss.call_function("clone", this->children[0]->children[i]->eval(t_ss));
+                bv.clear_dependencies();
+                vec.push_back(bv);
+              }
             }
+            return const_var(vec);
+          }
+          catch (const exception::dispatch_error &) {
+            throw exception::eval_error("Can not find appropriate 'clone' or copy constructor for vector elements");
           }
 
-          return const_var(vec);
         }
 
     };
@@ -852,13 +859,15 @@ namespace chaiscript
           try {
             std::map<std::string, Boxed_Value> retval;
             for (size_t i = 0; i < this->children[0]->children.size(); ++i) {
+              Boxed_Value bv = t_ss.call_function("clone", this->children[0]->children[i]->children[1]->eval(t_ss));
+              bv.clear_dependencies();
               retval[boxed_cast<std::string>(this->children[0]->children[i]->children[0]->eval(t_ss))] 
-                = t_ss.call_function("clone", this->children[0]->children[i]->children[1]->eval(t_ss));
+                = bv;
             }
             return const_var(retval);
           }
           catch (const exception::dispatch_error &) {
-            throw exception::eval_error("Can not find appropriate 'Map()'");
+            throw exception::eval_error("Can not find appropriate 'clone' or copy constructor for map elements");
           }
         }
 
diff --git a/unittests/map_inplace_init.chai b/unittests/map_inplace_init.chai
index b1d8221..138ef03 100644
--- a/unittests/map_inplace_init.chai
+++ b/unittests/map_inplace_init.chai
@@ -1,3 +1,14 @@
 var x = ["bob":1, "fred":2]
 
 assert_equal(2, x.size());
+
+
+// Make sure vector elements are copied into place for consistency with
+// map inplace construction
+var i = 1;
+var y = ["a":i];
+
+assert_equal(1, y["a"]);
+i = 3;
+assert_equal(3, i);
+assert_equal(1, y["a"]);
diff --git a/unittests/vector_inplace_init.chai b/unittests/vector_inplace_init.chai
index f16c15b..e7ae124 100644
--- a/unittests/vector_inplace_init.chai
+++ b/unittests/vector_inplace_init.chai
@@ -1,2 +1,14 @@
 var x = [1, 2, 3]
 assert_equal(3, x.size())
+
+
+
+// Make sure vector elements are copied into place for consistency with
+// map inplace construction
+var i = 1;
+var y = [i];
+
+assert_equal(1, y[0]);
+i = 3;
+assert_equal(3, i);
+assert_equal(1, y[0]);