Additional function creation tables and tests to keep them there.

ThePhD · Mar 15, 2016 · f43adf9 · f43adf9
1 parent c3bf2e0
commit f43adf9
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/sol/state_view.hpp b/sol/state_view.hpp
@@ -273,6 +273,16 @@ class state_view {
         return *this;
     }
 
+    template <typename Name>
+    table create_table(Name&& name, int narr = 0, int nrec = 0) {
+        return global.create(std::forward<Name>(name), narr, nrec);
+    }
+
+    template <typename Name, typename Key, typename Value, typename... Args>
+    table create_table(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+        return global.create(std::forward<Name>(name), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+    }
+
     table create_table(int narr = 0, int nrec = 0) {
         return create_table(lua_state(), narr, nrec);
     }

diff --git a/sol/table_core.hpp b/sol/table_core.hpp
@@ -271,6 +271,20 @@ class table_core : public reference {
     }
 
 public:
+    template <typename Name>
+    table create(Name&& name, int narr = 0, int nrec = 0) {
+        table x = create(lua_state(), narr, nrec);
+        this->set(std::forward<Name>(name), x);
+        return x;
+    }
+
+    template <typename Name, typename Key, typename Value, typename... Args>
+    table create(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+        table x = create(lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+        this->set(std::forward<Name>(name), x);
+        return x;
+    }
+
     table create(int narr = 0, int nrec = 0) {
         return create(lua_state(), narr, nrec);
     }

diff --git a/tests.cpp b/tests.cpp
@@ -516,6 +516,27 @@ TEST_CASE("tables/create", "Check if creating a table is kosher") {
     REQUIRE((testtable[3] == 4));
 }
 
+TEST_CASE("tables/create-local", "Check if creating a table is kosher") {
+    sol::state lua;
+    lua["testtable"] = lua.create_table(0, 0, "Woof", "Bark", 1, 2, 3, 4);
+    sol::object testobj = lua["testtable"];
+    REQUIRE(testobj.is<sol::table>());
+    sol::table testtable = testobj.as<sol::table>();
+    REQUIRE((testtable["Woof"] == std::string("Bark")));
+    REQUIRE((testtable[1] == 2));
+    REQUIRE((testtable[3] == 4));
+}
+
+TEST_CASE("tables/create-local-named", "Check if creating a table is kosher") {
+    sol::state lua;
+    sol::table testtable = lua.create_table("testtable", 0, 0, "Woof", "Bark", 1, 2, 3, 4);
+    sol::object testobj = lua["testtable"];
+    REQUIRE(testobj.is<sol::table>());
+    REQUIRE((testtable["Woof"] == std::string("Bark")));
+    REQUIRE((testtable[1] == 2));
+    REQUIRE((testtable[3] == 4));
+}
+
 TEST_CASE("tables/functions-variables", "Check if tables and function calls work as intended") {
     sol::state lua;
     lua.open_libraries(sol::lib::base, sol::lib::os);