From d6714ab7999a08060ec99fa8d751bfdc864ed446 Mon Sep 17 00:00:00 2001 From: fed <58637860+fedddddd@users.noreply.github.com> Date: Tue, 28 Feb 2023 18:24:31 +0100 Subject: [PATCH] Fix format --- src/client/game/ui_scripting/types.cpp | 554 ++++++++++++------------- src/client/game/ui_scripting/types.hpp | 192 ++++----- 2 files changed, 373 insertions(+), 373 deletions(-) diff --git a/src/client/game/ui_scripting/types.cpp b/src/client/game/ui_scripting/types.cpp index cf77934e..d0ee298a 100644 --- a/src/client/game/ui_scripting/types.cpp +++ b/src/client/game/ui_scripting/types.cpp @@ -5,341 +5,341 @@ namespace ui_scripting { - /*************************************************************** - * Lightuserdata - **************************************************************/ + /*************************************************************** + * Lightuserdata + **************************************************************/ - lightuserdata::lightuserdata(void* ptr_) - : ptr(ptr_) - { - } + lightuserdata::lightuserdata(void* ptr_) + : ptr(ptr_) + { + } - /*************************************************************** - * Userdata - **************************************************************/ + /*************************************************************** + * Userdata + **************************************************************/ - userdata::userdata(void* ptr_) - : ptr(ptr_) - { - this->add(); - } + userdata::userdata(void* ptr_) + : ptr(ptr_) + { + this->add(); + } - userdata::userdata(const userdata& other) - { - this->operator=(other); - } + userdata::userdata(const userdata& other) + { + this->operator=(other); + } - userdata::userdata(userdata&& other) noexcept - { - this->ptr = other.ptr; - this->ref = other.ref; - other.ref = 0; - } + userdata::userdata(userdata&& other) noexcept + { + this->ptr = other.ptr; + this->ref = other.ref; + other.ref = 0; + } - userdata::~userdata() - { - this->release(); - } + userdata::~userdata() + { + this->release(); + } - userdata& userdata::operator=(const userdata& other) - { - if (&other != this) - { - this->release(); - this->ptr = other.ptr; - this->ref = other.ref; - this->add(); - } + userdata& userdata::operator=(const userdata& other) + { + if (&other != this) + { + this->release(); + this->ptr = other.ptr; + this->ref = other.ref; + this->add(); + } - return *this; - } + return *this; + } - userdata& userdata::operator=(userdata&& other) noexcept - { - if (&other != this) - { - this->release(); - this->ptr = other.ptr; - this->ref = other.ref; - other.ref = 0; - } + userdata& userdata::operator=(userdata&& other) noexcept + { + if (&other != this) + { + this->release(); + this->ptr = other.ptr; + this->ref = other.ref; + other.ref = 0; + } - return *this; - } + return *this; + } - void userdata::add() - { - game::hks::HksObject value{}; - value.v.ptr = this->ptr; - value.t = game::hks::TUSERDATA; + void userdata::add() + { + game::hks::HksObject value{}; + value.v.ptr = this->ptr; + value.t = game::hks::TUSERDATA; - const auto state = *game::hks::lua_state; - const auto top = state->m_apistack.top; + const auto state = *game::hks::lua_state; + const auto top = state->m_apistack.top; - push_value(value); + push_value(value); - this->ref = game::hks::hksi_luaL_ref(*game::hks::lua_state, -10000); - state->m_apistack.top = top; - } + this->ref = game::hks::hksi_luaL_ref(*game::hks::lua_state, -10000); + state->m_apistack.top = top; + } - void userdata::release() - { - if (this->ref) - { - game::hks::hksi_luaL_unref(*game::hks::lua_state, -10000, this->ref); - } - } + void userdata::release() + { + if (this->ref) + { + game::hks::hksi_luaL_unref(*game::hks::lua_state, -10000, this->ref); + } + } - void userdata::set(const script_value& key, const script_value& value) const - { - set_field(*this, key, value); - } + void userdata::set(const script_value& key, const script_value& value) const + { + set_field(*this, key, value); + } - script_value userdata::get(const script_value& key) const - { - return get_field(*this, key); - } + script_value userdata::get(const script_value& key) const + { + return get_field(*this, key); + } - userdata_value userdata::operator[](const script_value& key) const - { - return {*this, key}; - } + userdata_value userdata::operator[](const script_value& key) const + { + return {*this, key}; + } - userdata_value::userdata_value(const userdata& table, const script_value& key) - : userdata_(table) - , key_(key) - { - this->value_ = this->userdata_.get(key).get_raw(); - } + userdata_value::userdata_value(const userdata& table, const script_value& key) + : userdata_(table) + , key_(key) + { + this->value_ = this->userdata_.get(key).get_raw(); + } - void userdata_value::operator=(const script_value& value) - { - this->userdata_.set(this->key_, value); - this->value_ = value.get_raw(); - } + void userdata_value::operator=(const script_value& value) + { + this->userdata_.set(this->key_, value); + this->value_ = value.get_raw(); + } - bool userdata_value::operator==(const script_value& value) - { - return this->userdata_.get(this->key_) == value; - } + bool userdata_value::operator==(const script_value& value) + { + return this->userdata_.get(this->key_) == value; + } - /*************************************************************** - * Table - **************************************************************/ + /*************************************************************** + * Table + **************************************************************/ - table::table() - { - const auto state = *game::hks::lua_state; - this->ptr = game::hks::Hashtable_Create(state, 0, 0); - this->add(); - } + table::table() + { + const auto state = *game::hks::lua_state; + this->ptr = game::hks::Hashtable_Create(state, 0, 0); + this->add(); + } - table::table(game::hks::HashTable* ptr_) - : ptr(ptr_) - { - this->add(); - } + table::table(game::hks::HashTable* ptr_) + : ptr(ptr_) + { + this->add(); + } - table::table(const table& other) - { - this->operator=(other); - } + table::table(const table& other) + { + this->operator=(other); + } - table::table(table&& other) noexcept - { - this->ptr = other.ptr; - this->ref = other.ref; - other.ref = 0; - } + table::table(table&& other) noexcept + { + this->ptr = other.ptr; + this->ref = other.ref; + other.ref = 0; + } - table::~table() - { - this->release(); - } + table::~table() + { + this->release(); + } - table& table::operator=(const table& other) - { - if (&other != this) - { - this->release(); - this->ptr = other.ptr; - this->ref = other.ref; - this->add(); - } + table& table::operator=(const table& other) + { + if (&other != this) + { + this->release(); + this->ptr = other.ptr; + this->ref = other.ref; + this->add(); + } - return *this; - } + return *this; + } - table& table::operator=(table&& other) noexcept - { - if (&other != this) - { - this->release(); - this->ptr = other.ptr; - this->ref = other.ref; - other.ref = 0; - } + table& table::operator=(table&& other) noexcept + { + if (&other != this) + { + this->release(); + this->ptr = other.ptr; + this->ref = other.ref; + other.ref = 0; + } - return *this; - } + return *this; + } - void table::add() - { - game::hks::HksObject value{}; - value.v.table = this->ptr; - value.t = game::hks::TTABLE; + void table::add() + { + game::hks::HksObject value{}; + value.v.table = this->ptr; + value.t = game::hks::TTABLE; - const auto state = *game::hks::lua_state; - const auto top = state->m_apistack.top; + const auto state = *game::hks::lua_state; + const auto top = state->m_apistack.top; - push_value(value); + push_value(value); - this->ref = game::hks::hksi_luaL_ref(*game::hks::lua_state, -10000); - state->m_apistack.top = top; - } + this->ref = game::hks::hksi_luaL_ref(*game::hks::lua_state, -10000); + state->m_apistack.top = top; + } - void table::release() - { - if (this->ref) - { - game::hks::hksi_luaL_unref(*game::hks::lua_state, -10000, this->ref); - } - } + void table::release() + { + if (this->ref) + { + game::hks::hksi_luaL_unref(*game::hks::lua_state, -10000, this->ref); + } + } - void table::set(const script_value& key, const script_value& value) const - { - set_field(*this, key, value); - } + void table::set(const script_value& key, const script_value& value) const + { + set_field(*this, key, value); + } - table_value table::operator[](const script_value& key) const - { - return {*this, key}; - } + table_value table::operator[](const script_value& key) const + { + return {*this, key}; + } - script_value table::get(const script_value& key) const - { - return get_field(*this, key); - } + script_value table::get(const script_value& key) const + { + return get_field(*this, key); + } - table_value::table_value(const table& table, const script_value& key) - : table_(table) - , key_(key) - { - this->value_ = this->table_.get(key).get_raw(); - } + table_value::table_value(const table& table, const script_value& key) + : table_(table) + , key_(key) + { + this->value_ = this->table_.get(key).get_raw(); + } - void table_value::operator=(const script_value& value) - { - this->table_.set(this->key_, value); - this->value_ = value.get_raw(); - } + void table_value::operator=(const script_value& value) + { + this->table_.set(this->key_, value); + this->value_ = value.get_raw(); + } - void table_value::operator=(const table_value& value) - { - this->table_.set(this->key_, value); - this->value_ = value.get_raw(); - } + void table_value::operator=(const table_value& value) + { + this->table_.set(this->key_, value); + this->value_ = value.get_raw(); + } - bool table_value::operator==(const script_value& value) - { - return this->table_.get(this->key_) == value; - } + bool table_value::operator==(const script_value& value) + { + return this->table_.get(this->key_) == value; + } - bool table_value::operator==(const table_value& value) - { - return this->table_.get(this->key_) == value; - } + bool table_value::operator==(const table_value& value) + { + return this->table_.get(this->key_) == value; + } - /*************************************************************** - * Function - **************************************************************/ + /*************************************************************** + * Function + **************************************************************/ - function::function(game::hks::lua_function func) - { - const auto state = *game::hks::lua_state; - this->ptr = game::hks::cclosure_Create(state, func, 0, 0, 0); - this->type = game::hks::HksObjectType::TCFUNCTION; - this->add(); - } + function::function(game::hks::lua_function func) + { + const auto state = *game::hks::lua_state; + this->ptr = game::hks::cclosure_Create(state, func, 0, 0, 0); + this->type = game::hks::HksObjectType::TCFUNCTION; + this->add(); + } - function::function(game::hks::cclosure* ptr_, game::hks::HksObjectType type_) - : ptr(ptr_) - , type(type_) - { - this->add(); - } + function::function(game::hks::cclosure* ptr_, game::hks::HksObjectType type_) + : ptr(ptr_) + , type(type_) + { + this->add(); + } - function::function(const function& other) - { - this->operator=(other); - } + function::function(const function& other) + { + this->operator=(other); + } - function::function(function&& other) noexcept - { - this->ptr = other.ptr; - this->type = other.type; - this->ref = other.ref; - other.ref = 0; - } + function::function(function&& other) noexcept + { + this->ptr = other.ptr; + this->type = other.type; + this->ref = other.ref; + other.ref = 0; + } - function::~function() - { - this->release(); - } + function::~function() + { + this->release(); + } - function& function::operator=(const function& other) - { - if (&other != this) - { - this->release(); - this->ptr = other.ptr; - this->type = other.type; - this->ref = other.ref; - this->add(); - } + function& function::operator=(const function& other) + { + if (&other != this) + { + this->release(); + this->ptr = other.ptr; + this->type = other.type; + this->ref = other.ref; + this->add(); + } - return *this; - } + return *this; + } - function& function::operator=(function&& other) noexcept - { - if (&other != this) - { - this->release(); - this->ptr = other.ptr; - this->type = other.type; - this->ref = other.ref; - other.ref = 0; - } + function& function::operator=(function&& other) noexcept + { + if (&other != this) + { + this->release(); + this->ptr = other.ptr; + this->type = other.type; + this->ref = other.ref; + other.ref = 0; + } - return *this; - } + return *this; + } - void function::add() - { - game::hks::HksObject value{}; - value.v.cClosure = this->ptr; - value.t = this->type; + void function::add() + { + game::hks::HksObject value{}; + value.v.cClosure = this->ptr; + value.t = this->type; - const auto state = *game::hks::lua_state; - const auto top = state->m_apistack.top; + const auto state = *game::hks::lua_state; + const auto top = state->m_apistack.top; - push_value(value); + push_value(value); - this->ref = game::hks::hksi_luaL_ref(*game::hks::lua_state, -10000); - state->m_apistack.top = top; - } + this->ref = game::hks::hksi_luaL_ref(*game::hks::lua_state, -10000); + state->m_apistack.top = top; + } - void function::release() - { - if (this->ref) - { - game::hks::hksi_luaL_unref(*game::hks::lua_state, -10000, this->ref); - } - } + void function::release() + { + if (this->ref) + { + game::hks::hksi_luaL_unref(*game::hks::lua_state, -10000, this->ref); + } + } - arguments function::call(const arguments& arguments) const - { - return call_script_function(*this, arguments); - } + arguments function::call(const arguments& arguments) const + { + return call_script_function(*this, arguments); + } } diff --git a/src/client/game/ui_scripting/types.hpp b/src/client/game/ui_scripting/types.hpp index 203b4a8a..6962a55d 100644 --- a/src/client/game/ui_scripting/types.hpp +++ b/src/client/game/ui_scripting/types.hpp @@ -5,132 +5,132 @@ namespace ui_scripting { - class lightuserdata - { - public: - lightuserdata(void*); - void* ptr; - }; + class lightuserdata + { + public: + lightuserdata(void*); + void* ptr; + }; - class userdata_value; + class userdata_value; - class userdata - { - public: - userdata(void*); + class userdata + { + public: + userdata(void*); - userdata(const userdata& other); - userdata(userdata&& other) noexcept; + userdata(const userdata& other); + userdata(userdata&& other) noexcept; - ~userdata(); + ~userdata(); - userdata& operator=(const userdata& other); - userdata& operator=(userdata&& other) noexcept; + userdata& operator=(const userdata& other); + userdata& operator=(userdata&& other) noexcept; - script_value get(const script_value& key) const; - void set(const script_value& key, const script_value& value) const; + script_value get(const script_value& key) const; + void set(const script_value& key, const script_value& value) const; - userdata_value operator[](const script_value& key) const; + userdata_value operator[](const script_value& key) const; - void* ptr; + void* ptr; - private: - void add(); - void release(); + private: + void add(); + void release(); - int ref{}; - }; + int ref{}; + }; - class userdata_value : public script_value - { - public: - userdata_value(const userdata& table, const script_value& key); - void operator=(const script_value& value); - bool operator==(const script_value& value); - private: - userdata userdata_; - script_value key_; - }; + class userdata_value : public script_value + { + public: + userdata_value(const userdata& table, const script_value& key); + void operator=(const script_value& value); + bool operator==(const script_value& value); + private: + userdata userdata_; + script_value key_; + }; - class table_value; + class table_value; - class table - { - public: - table(); - table(game::hks::HashTable* ptr_); + class table + { + public: + table(); + table(game::hks::HashTable* ptr_); - table(const table& other); - table(table&& other) noexcept; + table(const table& other); + table(table&& other) noexcept; - ~table(); + ~table(); - table& operator=(const table& other); - table& operator=(table&& other) noexcept; + table& operator=(const table& other); + table& operator=(table&& other) noexcept; - script_value get(const script_value& key) const; - void set(const script_value& key, const script_value& value) const; + script_value get(const script_value& key) const; + void set(const script_value& key, const script_value& value) const; - table_value operator[](const script_value& key) const; + table_value operator[](const script_value& key) const; - game::hks::HashTable* ptr; + game::hks::HashTable* ptr; - private: - void add(); - void release(); + private: + void add(); + void release(); - int ref{}; - }; + int ref{}; + }; - class table_value : public script_value - { - public: - table_value(const table& table, const script_value& key); - void operator=(const script_value& value); - void operator=(const table_value& value); - bool operator==(const script_value& value); - bool operator==(const table_value& value); - private: - table table_; - script_value key_; - }; + class table_value : public script_value + { + public: + table_value(const table& table, const script_value& key); + void operator=(const script_value& value); + void operator=(const table_value& value); + bool operator==(const script_value& value); + bool operator==(const table_value& value); + private: + table table_; + script_value key_; + }; - class function - { - public: - function(game::hks::lua_function); - function(game::hks::cclosure*, game::hks::HksObjectType); + class function + { + public: + function(game::hks::lua_function); + function(game::hks::cclosure*, game::hks::HksObjectType); - template - function(F f) - { - this->ptr = ui_scripting::convert_function(f); - this->type = game::hks::TCFUNCTION; - } + template + function(F f) + { + this->ptr = ui_scripting::convert_function(f); + this->type = game::hks::TCFUNCTION; + } - function(const function& other); - function(function&& other) noexcept; + function(const function& other); + function(function&& other) noexcept; - ~function(); + ~function(); - function& operator=(const function& other); - function& operator=(function&& other) noexcept; + function& operator=(const function& other); + function& operator=(function&& other) noexcept; - arguments call(const arguments& arguments) const; + arguments call(const arguments& arguments) const; - template - arguments operator()(T... arguments) const - { - return this->call({arguments...}); - } + template + arguments operator()(T... arguments) const + { + return this->call({arguments...}); + } - game::hks::cclosure* ptr; - game::hks::HksObjectType type; + game::hks::cclosure* ptr; + game::hks::HksObjectType type; - private: - void add(); - void release(); + private: + void add(); + void release(); - int ref{}; - }; + int ref{}; + }; }