mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Extract some duplicated table pushing code

Browse source
This commit is contained in:
Thomas Goyne 2014-04-27 06:47:00 -07:00
parent 689c16deb3
commit e3eb28ffd1
2 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libaegisub/include/libaegisub/lua/utils.h
View file

@ -19,6 +19,7 @@
#include <lua.h>
#include <lauxlib.h>
#include <string>
#include <vector>
#include <type_traits>
namespace agi { namespace lua {
@ -53,17 +54,23 @@ inline void push_value(lua_State *L, lua_CFunction value) {
}
template<typename T>
inline void set_field(lua_State *L, const char *name, T value) {
void push_value(lua_State *L, std::vector<T> const& value) {
lua_createtable(L, value.size(), 0);
for (size_t i = 0; i < value.size(); ++i) {
push_value(L, value[i]);
lua_rawseti(L, -2, i + 1);
}
}
template<typename T>
void set_field(lua_State *L, const char *name, T value) {
push_value(L, value);
lua_setfield(L, -2, name);
}
std::string get_string_or_default(lua_State *L, int idx);
std::string get_string(lua_State *L, int idx);
std::string check_string(lua_State *L, int idx);
std::string get_global_string(lua_State *L, const char *name);
template<typename T, typename... Args>

30
src/auto4_lua.cpp
View file

@ -249,19 +249,10 @@ namespace {
int get_keyframes(lua_State *L)
{
const agi::Context *c = get_context(L);
if (!c) {
if (c)
push_value(L, c->videoController->GetKeyFrames());
else
lua_pushnil(L);
return 1;
}
std::vector<int> const& kf = c->videoController->GetKeyFrames();
lua_createtable(L, kf.size(), 0);
for (size_t i = 0; i < kf.size(); ++i) {
push_value(L, kf[i]);
lua_rawseti(L, -2, i);
}
return 1;
}
@ -739,15 +730,6 @@ namespace {
return rows;
}
static void transform_selection(lua_State *L, std::vector<int> const& rows)
{
lua_createtable(L, rows.size(), 0);
for (size_t i = 0; i < rows.size(); ++i) {
push_value(L, rows[i]);
lua_rawseti(L, -2, i + 1);
}
}
bool LuaCommand::Validate(const agi::Context *c)
{
if (!(cmd_type & cmd::COMMAND_VALIDATE)) return true;
@ -757,7 +739,7 @@ namespace {
GetFeatureFunction("validate");
auto subsobj = new LuaAssFile(L, c->ass.get());
transform_selection(L, selected_rows(c));
push_value(L, selected_rows(c));
if (auto active_line = c->selectionController->GetActiveLine())
push_value(L, active_line->Row + c->ass->Info.size() + c->ass->Styles.size() + 1);
@ -799,7 +781,7 @@ namespace {
if (auto active_line = c->selectionController->GetActiveLine())
original_active = active_line->Row + original_offset;
transform_selection(L, original_sel);
push_value(L, original_sel);
push_value(L, original_active);
try {
@ -895,7 +877,7 @@ namespace {
GetFeatureFunction("isactive");
auto subsobj = new LuaAssFile(L, c->ass.get());
transform_selection(L, selected_rows(c));
push_value(L, selected_rows(c));
if (auto active_line = c->selectionController->GetActiveLine())
push_value(L, active_line->Row + c->ass->Info.size() + c->ass->Styles.size() + 1);