Merge branch 'develop' of github.com:ChaiScript/ChaiScript into develop

appveyor.yml

@@ -0,0 +1,16 @@
+version: 5.7.2.{build}
+os: Visual Studio 2015
+environment:
+  matrix:
+  - {}
+build_script:
+- cmd: >-
+    mkdir build
+
+    cd build
+
+    cmake c:\Projects\chaiscript -G "Visual Studio 14"
+
+    cmake --build . --config Debug
+test_script:
+- cmd: ctest -C Debug

include/chaiscript/dispatchkit/type_conversions.hpp

@@ -310,48 +310,6 @@ namespace chaiscript
       private:
         Callable m_func;
     };
-#ifndef CHAISCRIPT_MSVC_12
-		//http://stackoverflow.com/questions/18895583/convert-a-vectort-to-initializer-listt
-    constexpr size_t DEFAULT_MAX_LENGTH = 128;
-  
-    template <typename V> struct backingValue { static V value; };
-    template <typename V> V backingValue<V>::value;
-  
-    template <typename V, typename... Vcount> struct backingList { static std::initializer_list<V> list; };
-    template <typename V, typename... Vcount>
-    std::initializer_list<V> backingList<V, Vcount...>::list = { static_cast<Vcount>(backingValue<V>::value)... };
-  
-    template <size_t maxLength, typename It, typename V = typename It::value_type, typename... Vcount>
-    static typename std::enable_if< sizeof...(Vcount) >= maxLength,
-    std::initializer_list<V> >::type generate_n(It begin, It end, It current)
-    {
-      throw std::length_error("More than maxLength elements in range.");
-    }
-  
-    template <size_t maxLength = DEFAULT_MAX_LENGTH, typename It, typename V = typename It::value_type, typename... Vcount>
-    static typename std::enable_if< sizeof...(Vcount) < maxLength,
-    std::initializer_list<V> >::type generate_n(It begin, It end, It current)
-    {
-      if (current != end)
-      {
-        return generate_n<maxLength, It, V, V, Vcount...>(begin, end, ++current);
-      }
-  
-      current = begin;
-      for (auto it = backingList<V, Vcount...>::list.begin();
-      it != backingList<V, Vcount...>::list.end();
-      ++current, ++it)
-      *const_cast<V*>(&*it) = *current;
-  
-      return backingList<V, Vcount...>::list;
-    }
-  
-    template <typename It>
-    std::initializer_list<typename It::value_type> range_to_initializer_list(It begin, It end)
-    {
-      return detail::generate_n(begin, end, begin);
-    }
-#endif
   }
 
   class Type_Conversions
@@ -634,26 +592,6 @@ namespace chaiscript
       return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<std::vector<Boxed_Value>>(), user_type<To>(), func);
     }
 
-#ifndef CHAISCRIPT_MSVC_12
-  template<typename To>
-  Type_Conversion initializer_list_conversion()
-  {
-    auto func = [](const Boxed_Value &t_bv) -> Boxed_Value {
-      const std::vector<Boxed_Value> &from_vec = detail::Cast_Helper<const std::vector<Boxed_Value> &>::cast(t_bv, nullptr);
-
-      std::vector<typename To::value_type> vec;
-      vec.reserve(from_vec.size());
-      for (const auto &bv : from_vec)
-      {
-        vec.push_back(detail::Cast_Helper<typename To::value_type>::cast(bv, nullptr));
-      }
-
-      return Boxed_Value(detail::range_to_initializer_list(vec.begin(), vec.end()));
-    };
-    auto ret = chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<std::vector<Boxed_Value>>(), user_type<To>(), func);
-    return ret;
-  }
-#endif
 }
 
 

unittests/compiled_tests.cpp

@@ -913,46 +913,4 @@ TEST_CASE("Return of converted type from script")
   chai.add(chaiscript::user_type<Returned_Converted_Config>(), "Returned_Converted_Config");
 }
 
-#ifndef CHAISCRIPT_MSVC_12
-TEST_CASE("Return initializer_list")
-{
-  chaiscript::ChaiScript chai;
-  
-  chai.add(chaiscript::initializer_list_conversion<std::initializer_list<int>>());
-
-  auto initlist = chai.eval<std::initializer_list<int>>(R"(
-    return [11, 22, 33, 44];
-  )");
-
-  CHECK(initlist.size() == 4);
-  CHECK(typeid(decltype(initlist)) == typeid(std::initializer_list<int>));
-}
-
-bool initializer_list_of_enums_interface(std::initializer_list<Utility_Test_Numbers> initlist)
-{
-  return initlist.size() == 3 && *initlist.begin() == THREE;
-}
-
-TEST_CASE("Call from script with initializer_list argument")
-{
-  chaiscript::ChaiScript chai;
-  
-  chaiscript::ModulePtr m = chaiscript::ModulePtr(new chaiscript::Module());
-  chaiscript::utility::add_class<Utility_Test_Numbers>(*m,
-      "Utility_Test_Numbers",
-      { { ONE, "ONE" },
-        { TWO, "TWO" },
-        { THREE, "THREE" }
-        }
-      );
-  chai.add(m);
-  
-  chai.add(chaiscript::initializer_list_conversion<std::initializer_list<Utility_Test_Numbers>>());
-  chai.add(chaiscript::fun(&initializer_list_of_enums_interface), "initializer_list_of_enums_interface");
-
-  auto interface_result = chai.eval<bool>("return initializer_list_of_enums_interface([THREE, TWO, ONE]);");
-  
-  CHECK(interface_result == true);
-}
-#endif
 

unittests/move_async.chai

@@ -0,0 +1,17 @@
+load_module("stl_extra")
+
+auto x = List()
+// push_back newly constructed return value that's non-copyable
+x.push_front(async(fun(){}))
+
+// push_front newly constructed return value that's non-copyable
+x.push_front(async(fun(){}))
+
+
+
+// push_back newly constructed return value that's non-copyable
+
+var v = []
+v.push_back(async(fun(){}))
+
+