1 files changed, 41 insertions, 33 deletions
diff --git a/Sluift/Lua/Check.cpp b/Sluift/Lua/Check.cpp
index cfb726a..b956623 100644
--- a/Sluift/Lua/Check.cpp
+++ b/Sluift/Lua/Check.cpp
@@ -1,60 +1,68 @@
 /*
- * Copyright (c) 2013 Remko Tronçon
- * Licensed under the GNU General Public License.
+ * Copyright (c) 2013-2016 Isode Limited.
+ * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Sluift/Lua/Check.h>
 
-#include <boost/numeric/conversion/cast.hpp>
-#include <iostream>
 #include <sstream>
+
+#include <boost/numeric/conversion/cast.hpp>
+
 #include <lua.hpp>
 
+#include <Swiften/Base/ByteArray.h>
+
 #include <Sluift/Lua/Exception.h>
 
 using namespace Swift;
 
 
 static std::string getArgTypeError(lua_State* L, int arg, int tag) {
-	std::ostringstream s;
-	s << "Arg " << arg << ": expected " << lua_typename(L, tag) << ", got " << luaL_typename(L, arg);
-	return s.str();
+    std::ostringstream s;
+    s << "Arg " << arg << ": expected " << lua_typename(L, tag) << ", got " << luaL_typename(L, arg);
+    return s.str();
 }
 
 void Lua::checkType(lua_State* L, int arg, int type) {
-	if (lua_type(L, arg) !=  type) {
-		throw Lua::Exception(getArgTypeError(L, arg, type));
-	}
+    if (lua_type(L, arg) !=  type) {
+        throw Lua::Exception(getArgTypeError(L, arg, type));
+    }
 }
 
 int Lua::checkIntNumber(lua_State* L, int arg) {
-	if (!lua_isnumber(L, arg)) {
-		throw Lua::Exception(getArgTypeError(L, arg, LUA_TNUMBER));
-	}
-	return boost::numeric_cast<int>(lua_tonumber(L, arg));
+    if (!lua_isnumber(L, arg)) {
+        throw Lua::Exception(getArgTypeError(L, arg, LUA_TNUMBER));
+    }
+    return boost::numeric_cast<int>(lua_tonumber(L, arg));
 }
 
 std::string Lua::checkString(lua_State* L, int arg) {
-	const char *s = lua_tolstring(L, arg, NULL);
-	if (!s) {
-		throw Lua::Exception(getArgTypeError(L, arg, LUA_TSTRING));
-	}
-	return std::string(s);
+    const char *s = lua_tolstring(L, arg, nullptr);
+    if (!s) {
+        throw Lua::Exception(getArgTypeError(L, arg, LUA_TSTRING));
+    }
+    return std::string(s);
+}
+
+ByteArray Lua::checkByteArray(lua_State* L, int arg) {
+    size_t len;
+    const char *s = lua_tolstring(L, arg, &len);
+    if (!s) {
+        throw Lua::Exception(getArgTypeError(L, arg, LUA_TSTRING));
+    }
+    return createByteArray(s, len);
 }
 
-void* Lua::checkUserDataRaw(lua_State* L, int arg, const char* tableName) {
-	void* userData = lua_touserdata(L, arg);
-	if (!userData) {
-		throw Lua::Exception(getArgTypeError(L, arg, LUA_TUSERDATA));
-	}
-	if (!lua_getmetatable(L, arg)) {
-		throw Lua::Exception(getArgTypeError(L, arg, LUA_TUSERDATA));
-	}
-	lua_getfield(L, LUA_REGISTRYINDEX, tableName);
-	if (!lua_rawequal(L, -1, -2)) {
-		throw Lua::Exception(getArgTypeError(L, arg, LUA_TUSERDATA));
-	}
-	lua_pop(L, 2);
-	return userData;
+void* Lua::checkUserDataRaw(lua_State* L, int arg) {
+    void* userData = lua_touserdata(L, arg);
+    if (!userData) {
+        throw Lua::Exception(getArgTypeError(L, arg, LUA_TUSERDATA));
+    }
+    if (!lua_getmetatable(L, arg)) {
+        throw Lua::Exception(getArgTypeError(L, arg, LUA_TUSERDATA));
+    }
+    lua_pop(L, 1);
+    return userData;
 }