Applied the new style guidelines.

Well, sort of. Lot's more to be done, but this is a start.
This commit is contained in:
rude
2012-06-28 23:52:33 +02:00
parent bc4e59ba24
commit 81c38e22d0
302 changed files with 42648 additions and 42081 deletions
+290 -285
View File
@@ -1,285 +1,290 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#include "wrap_Thread.h"
namespace love
{
namespace thread
{
Thread *luax_checkthread(lua_State *L, int idx)
{
return luax_checktype<Thread>(L, idx, "Thread", THREAD_THREAD_T);
}
int w_Thread_start(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
t->start();
return 0;
}
int w_Thread_wait(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
t->wait();
return 0;
}
int w_Thread_getName(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
// allow names containing \0
luax_pushstring(L, t->getName());
return 1;
}
int w_Thread_get(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checkstring(L, 2);
t->lock();
Variant *v = t->get(name);
t->clear(name);
t->unlock();
if (!v)
{
lua_pushnil(L);
return 1;
}
v->toLua(L);
t->lock();
v->release();
t->unlock();
return 1;
}
int w_Thread_getKeys(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
t->lock();
std::vector<std::string> keys = t->getKeys();
t->unlock();
lua_createtable(L, keys.size(), 0);
int i = 1;
for (std::vector<std::string>::iterator it = keys.begin(); it != keys.end(); it++)
{
lua_pushnumber(L, i++);
luax_pushstring(L, *it);
lua_settable(L, -3);
}
return 1;
}
int w_Thread_demand(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checkstring(L, 2);
t->lock();
Variant *v = t->demand(name);
t->clear(name);
t->unlock();
if (!v)
{
lua_pushnil(L);
return 1;
}
v->toLua(L);
t->lock();
v->release();
t->unlock();
return 1;
}
int w_Thread_peek(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checkstring(L, 2);
t->lock();
Variant *v = t->get(name);
t->unlock();
if (!v)
{
lua_pushnil(L);
return 1;
}
v->toLua(L);
t->lock();
v->release();
t->unlock();
return 1;
}
int w_Thread_set(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checkstring(L, 2);
Variant *v = Variant::fromLua(L, 3);
if (!v)
return luaL_error(L, "Expected boolean, number, string or userdata");
t->set(name, v);
t->lock();
v->release();
t->unlock();
return 0;
}
static const luaL_Reg type_functions[] = {
{ "start", w_Thread_start },
{ "wait", w_Thread_wait },
{ "getName", w_Thread_getName },
{ "get", w_Thread_get },
{ "getKeys", w_Thread_getKeys },
{ "demand", w_Thread_demand },
{ "peek", w_Thread_peek },
{ "set", w_Thread_set },
{ 0, 0 }
};
extern "C" int luaopen_thread(lua_State *L)
{
return luax_register_type(L, "Thread", type_functions);
}
static ThreadModule *instance;
int w_newThread(lua_State *L)
{
std::string name = luax_checkstring(L, 1);
love::Data *data;
if (lua_isstring(L, 2))
luax_convobj(L, 2, "filesystem", "newFile");
if (luax_istype(L, 2, FILESYSTEM_FILE_T))
{
try
{
data = luax_checktype<love::filesystem::File>(L, 2, "File", FILESYSTEM_FILE_T)->read();
}
catch (love::Exception & e)
{
return luaL_error(L, e.what());
}
}
else
{
data = luax_checktype<love::Data>(L, 2, "Data", DATA_T);
data->retain();
}
Thread *t = instance->newThread(name, data);
// do not worry, file->read() returns retained data
data->release();
if (!t)
return luaL_error(L, "A thread with that name already exists.");
luax_newtype(L, "Thread", THREAD_THREAD_T, (void*)t);
return 1;
}
int w_getThreads(lua_State *L)
{
unsigned count = instance->getThreadCount();
Thread **list = new Thread*[count];
instance->getThreads(list);
lua_newtable(L);
for (unsigned int i = 0; i<count; i++)
{
// allow names containing \0
luax_pushstring(L, list[i]->getName());
luax_newtype(L, "Thread", THREAD_THREAD_T, (void*) list[i]);
list[i]->lock();
list[i]->retain();
list[i]->unlock();
lua_settable(L, -3);
}
delete[] list;
return 1;
}
int w_getThread(lua_State *L)
{
if (lua_isnoneornil(L, 1))
{
lua_getglobal(L, "love");
lua_getfield(L, -1, "_curthread");
return 1;
}
std::string name = luax_checkstring(L, 1);
Thread *t = instance->getThread(name);
if (t)
{
luax_newtype(L, "Thread", THREAD_THREAD_T, (void*)t);
t->lock();
t->retain();
t->unlock();
}
else
lua_pushnil(L);
return 1;
}
// List of functions to wrap.
static const luaL_Reg module_functions[] = {
{ "newThread", w_newThread },
{ "getThread", w_getThread },
{ "getThreads", w_getThreads },
{ 0, 0 }
};
static const lua_CFunction types[] = {
luaopen_thread,
0
};
extern "C" int luaopen_love_thread(lua_State *L)
{
if (instance == 0)
{
try
{
instance = new ThreadModule();
lua_getglobal(L, "love");
Thread *curthread = instance->getThread("main");
curthread->lock();
curthread->retain();
curthread->unlock();
luax_newtype(L, "Thread", THREAD_THREAD_T, (void*)curthread);
lua_setfield(L, -2, "_curthread");
}
catch (Exception & e)
{
return luaL_error(L, e.what());
}
}
else
instance->retain();
WrappedModule w;
w.module = instance;
w.name = "thread";
w.flags = MODULE_T;
w.functions = module_functions;
w.types = types;
return luax_register_module(L, w);
}
}
}
/**
* Copyright (c) 2006-2010 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#include "wrap_Thread.h"
namespace love
{
namespace thread
{
Thread *luax_checkthread(lua_State *L, int idx)
{
return luax_checktype<Thread>(L, idx, "Thread", THREAD_THREAD_T);
}
int w_Thread_start(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
t->start();
return 0;
}
int w_Thread_wait(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
t->wait();
return 0;
}
int w_Thread_getName(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
// allow names containing \0
luax_pushstring(L, t->getName());
return 1;
}
int w_Thread_get(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checkstring(L, 2);
t->lock();
Variant *v = t->get(name);
t->clear(name);
t->unlock();
if (!v)
{
lua_pushnil(L);
return 1;
}
v->toLua(L);
t->lock();
v->release();
t->unlock();
return 1;
}
int w_Thread_getKeys(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
t->lock();
std::vector<std::string> keys = t->getKeys();
t->unlock();
lua_createtable(L, keys.size(), 0);
int i = 1;
for (std::vector<std::string>::iterator it = keys.begin(); it != keys.end(); it++)
{
lua_pushnumber(L, i++);
luax_pushstring(L, *it);
lua_settable(L, -3);
}
return 1;
}
int w_Thread_demand(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checkstring(L, 2);
t->lock();
Variant *v = t->demand(name);
t->clear(name);
t->unlock();
if (!v)
{
lua_pushnil(L);
return 1;
}
v->toLua(L);
t->lock();
v->release();
t->unlock();
return 1;
}
int w_Thread_peek(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checkstring(L, 2);
t->lock();
Variant *v = t->get(name);
t->unlock();
if (!v)
{
lua_pushnil(L);
return 1;
}
v->toLua(L);
t->lock();
v->release();
t->unlock();
return 1;
}
int w_Thread_set(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checkstring(L, 2);
Variant *v = Variant::fromLua(L, 3);
if (!v)
return luaL_error(L, "Expected boolean, number, string or userdata");
t->set(name, v);
t->lock();
v->release();
t->unlock();
return 0;
}
static const luaL_Reg type_functions[] =
{
{ "start", w_Thread_start },
{ "wait", w_Thread_wait },
{ "getName", w_Thread_getName },
{ "get", w_Thread_get },
{ "getKeys", w_Thread_getKeys },
{ "demand", w_Thread_demand },
{ "peek", w_Thread_peek },
{ "set", w_Thread_set },
{ 0, 0 }
};
extern "C" int luaopen_thread(lua_State *L)
{
return luax_register_type(L, "Thread", type_functions);
}
static ThreadModule *instance;
int w_newThread(lua_State *L)
{
std::string name = luax_checkstring(L, 1);
love::Data *data;
if (lua_isstring(L, 2))
luax_convobj(L, 2, "filesystem", "newFile");
if (luax_istype(L, 2, FILESYSTEM_FILE_T))
{
try
{
data = luax_checktype<love::filesystem::File>(L, 2, "File", FILESYSTEM_FILE_T)->read();
}
catch(love::Exception &e)
{
return luaL_error(L, e.what());
}
}
else
{
data = luax_checktype<love::Data>(L, 2, "Data", DATA_T);
data->retain();
}
Thread *t = instance->newThread(name, data);
// do not worry, file->read() returns retained data
data->release();
if (!t)
return luaL_error(L, "A thread with that name already exists.");
luax_newtype(L, "Thread", THREAD_THREAD_T, (void *)t);
return 1;
}
int w_getThreads(lua_State *L)
{
unsigned count = instance->getThreadCount();
Thread **list = new Thread*[count];
instance->getThreads(list);
lua_newtable(L);
for (unsigned int i = 0; i<count; i++)
{
// allow names containing \0
luax_pushstring(L, list[i]->getName());
luax_newtype(L, "Thread", THREAD_THREAD_T, (void *) list[i]);
list[i]->lock();
list[i]->retain();
list[i]->unlock();
lua_settable(L, -3);
}
delete[] list;
return 1;
}
int w_getThread(lua_State *L)
{
if (lua_isnoneornil(L, 1))
{
lua_getglobal(L, "love");
lua_getfield(L, -1, "_curthread");
return 1;
}
std::string name = luax_checkstring(L, 1);
Thread *t = instance->getThread(name);
if (t)
{
luax_newtype(L, "Thread", THREAD_THREAD_T, (void *)t);
t->lock();
t->retain();
t->unlock();
}
else
lua_pushnil(L);
return 1;
}
// List of functions to wrap.
static const luaL_Reg module_functions[] =
{
{ "newThread", w_newThread },
{ "getThread", w_getThread },
{ "getThreads", w_getThreads },
{ 0, 0 }
};
static const lua_CFunction types[] =
{
luaopen_thread,
0
};
extern "C" int luaopen_love_thread(lua_State *L)
{
if (instance == 0)
{
try
{
instance = new ThreadModule();
lua_getglobal(L, "love");
Thread *curthread = instance->getThread("main");
curthread->lock();
curthread->retain();
curthread->unlock();
luax_newtype(L, "Thread", THREAD_THREAD_T, (void *)curthread);
lua_setfield(L, -2, "_curthread");
}
catch(Exception &e)
{
return luaL_error(L, e.what());
}
}
else
instance->retain();
WrappedModule w;
w.module = instance;
w.name = "thread";
w.flags = MODULE_T;
w.functions = module_functions;
w.types = types;
return luax_register_module(L, w);
}
} // thread
} // love