PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

dynamic::valtype renamed to dynamic::Type

Browse Source
This commit is contained in:
MihailRis
2024-05-08 04:06:24 +03:00
parent d680ae1b10
commit 65e85f362c
4 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/AssetsLoader.cpp
+3 -3
View File
@@ -131,11 +131,11 @@ void AssetsLoader::processPreloadList(AssetType tag, dynamic::List* list) {
} }
for (uint i = 0; i < list->size(); i++) { for (uint i = 0; i < list->size(); i++) {
auto value = list->get(i); auto value = list->get(i);
switch (static_cast<dynamic::valtype>(value.index())) { switch (static_cast<dynamic::Type>(value.index())) {
case dynamic::valtype::string: case dynamic::Type::string:
processPreload(tag, std::get<std::string>(value), nullptr); processPreload(tag, std::get<std::string>(value), nullptr);
break; break;
case dynamic::valtype::map: { case dynamic::Type::map: {
auto map = std::get<dynamic::Map_sptr>(value); auto map = std::get<dynamic::Map_sptr>(value);
auto name = map->get<std::string>("name"); auto name = map->get<std::string>("name");
processPreload(tag, name, map.get()); processPreload(tag, name, map.get());
src/coders/binary_json.cpp
+8 -8
View File
@@ -10,22 +10,22 @@ using namespace json;
using namespace dynamic; using namespace dynamic;
static void to_binary(ByteBuilder& builder, const Value& value) { static void to_binary(ByteBuilder& builder, const Value& value) {
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::none: case Type::none:
throw std::runtime_error("none value is not implemented"); throw std::runtime_error("none value is not implemented");
case valtype::map: { case Type::map: {
auto bytes = to_binary(std::get<Map_sptr>(value).get()); auto bytes = to_binary(std::get<Map_sptr>(value).get());
builder.put(bytes.data(), bytes.size()); builder.put(bytes.data(), bytes.size());
break; break;
} }
case valtype::list: case Type::list:
builder.put(BJSON_TYPE_LIST); builder.put(BJSON_TYPE_LIST);
for (auto& element : std::get<List_sptr>(value)->values) { for (auto& element : std::get<List_sptr>(value)->values) {
to_binary(builder, element); to_binary(builder, element);
} }
builder.put(BJSON_END); builder.put(BJSON_END);
break; break;
case valtype::integer: { case Type::integer: {
auto val = std::get<integer_t>(value); auto val = std::get<integer_t>(value);
if (val >= 0 && val <= 255) { if (val >= 0 && val <= 255) {
builder.put(BJSON_TYPE_BYTE); builder.put(BJSON_TYPE_BYTE);
@@ -42,14 +42,14 @@ static void to_binary(ByteBuilder& builder, const Value& value) {
} }
break; break;
} }
case valtype::number: case Type::number:
builder.put(BJSON_TYPE_NUMBER); builder.put(BJSON_TYPE_NUMBER);
builder.putFloat64(std::get<number_t>(value)); builder.putFloat64(std::get<number_t>(value));
break; break;
case valtype::boolean: case Type::boolean:
builder.put(BJSON_TYPE_FALSE + std::get<bool>(value)); builder.put(BJSON_TYPE_FALSE + std::get<bool>(value));
break; break;
case valtype::string: case Type::string:
builder.put(BJSON_TYPE_STRING); builder.put(BJSON_TYPE_STRING);
builder.put(std::get<std::string>(value)); builder.put(std::get<std::string>(value));
break; break;
src/data/dynamic.cpp
+36 -36
View File
@@ -4,11 +4,11 @@ using namespace dynamic;
std::string List::str(size_t index) const { std::string List::str(size_t index) const {
const auto& value = values[index]; const auto& value = values[index];
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::string: return std::get<std::string>(value); case Type::string: return std::get<std::string>(value);
case valtype::boolean: return std::get<bool>(value) ? "true" : "false"; case Type::boolean: return std::get<bool>(value) ? "true" : "false";
case valtype::number: return std::to_string(std::get<double>(value)); case Type::number: return std::to_string(std::get<double>(value));
case valtype::integer: return std::to_string(std::get<int64_t>(value)); case Type::integer: return std::to_string(std::get<int64_t>(value));
default: default:
throw std::runtime_error("type error"); throw std::runtime_error("type error");
} }
@@ -16,11 +16,11 @@ std::string List::str(size_t index) const {
number_t List::num(size_t index) const { number_t List::num(size_t index) const {
const auto& value = values[index]; const auto& value = values[index];
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::number: return std::get<number_t>(value); case Type::number: return std::get<number_t>(value);
case valtype::integer: return std::get<integer_t>(value); case Type::integer: return std::get<integer_t>(value);
case valtype::string: return std::stoll(std::get<std::string>(value)); case Type::string: return std::stoll(std::get<std::string>(value));
case valtype::boolean: return std::get<bool>(value); case Type::boolean: return std::get<bool>(value);
default: default:
throw std::runtime_error("type error"); throw std::runtime_error("type error");
} }
@@ -28,11 +28,11 @@ number_t List::num(size_t index) const {
integer_t List::integer(size_t index) const { integer_t List::integer(size_t index) const {
const auto& value = values[index]; const auto& value = values[index];
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::number: return std::get<number_t>(value); case Type::number: return std::get<number_t>(value);
case valtype::integer: return std::get<integer_t>(value); case Type::integer: return std::get<integer_t>(value);
case valtype::string: return std::stoll(std::get<std::string>(value)); case Type::string: return std::stoll(std::get<std::string>(value));
case valtype::boolean: return std::get<bool>(value); case Type::boolean: return std::get<bool>(value);
default: default:
throw std::runtime_error("type error"); throw std::runtime_error("type error");
} }
@@ -56,9 +56,9 @@ List* List::list(size_t index) const {
bool List::flag(size_t index) const { bool List::flag(size_t index) const {
const auto& value = values[index]; const auto& value = values[index];
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::integer: return std::get<integer_t>(value); case Type::integer: return std::get<integer_t>(value);
case valtype::boolean: return std::get<bool>(value); case Type::boolean: return std::get<bool>(value);
default: default:
throw std::runtime_error("type error"); throw std::runtime_error("type error");
} }
@@ -101,11 +101,11 @@ std::string Map::get(const std::string& key, const std::string def) const {
if (found == values.end()) if (found == values.end())
return def; return def;
auto& value = found->second; auto& value = found->second;
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::string: return std::get<std::string>(value); case Type::string: return std::get<std::string>(value);
case valtype::boolean: return std::get<bool>(value) ? "true" : "false"; case Type::boolean: return std::get<bool>(value) ? "true" : "false";
case valtype::number: return std::to_string(std::get<number_t>(value)); case Type::number: return std::to_string(std::get<number_t>(value));
case valtype::integer: return std::to_string(std::get<integer_t>(value)); case Type::integer: return std::to_string(std::get<integer_t>(value));
default: throw std::runtime_error("type error"); default: throw std::runtime_error("type error");
} }
} }
@@ -115,11 +115,11 @@ number_t Map::get(const std::string& key, double def) const {
if (found == values.end()) if (found == values.end())
return def; return def;
auto& value = found->second; auto& value = found->second;
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::number: return std::get<number_t>(value); case Type::number: return std::get<number_t>(value);
case valtype::integer: return std::get<integer_t>(value); case Type::integer: return std::get<integer_t>(value);
case valtype::string: return std::stoull(std::get<std::string>(value)); case Type::string: return std::stoull(std::get<std::string>(value));
case valtype::boolean: return std::get<bool>(value); case Type::boolean: return std::get<bool>(value);
default: throw std::runtime_error("type error"); default: throw std::runtime_error("type error");
} }
} }
@@ -129,11 +129,11 @@ integer_t Map::get(const std::string& key, integer_t def) const {
if (found == values.end()) if (found == values.end())
return def; return def;
auto& value = found->second; auto& value = found->second;
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::number: return std::get<number_t>(value); case Type::number: return std::get<number_t>(value);
case valtype::integer: return std::get<integer_t>(value); case Type::integer: return std::get<integer_t>(value);
case valtype::string: return std::stoull(std::get<std::string>(value)); case Type::string: return std::stoull(std::get<std::string>(value));
case valtype::boolean: return std::get<bool>(value); case Type::boolean: return std::get<bool>(value);
default: throw std::runtime_error("type error"); default: throw std::runtime_error("type error");
} }
} }
@@ -143,9 +143,9 @@ bool Map::get(const std::string& key, bool def) const {
if (found == values.end()) if (found == values.end())
return def; return def;
auto& value = found->second; auto& value = found->second;
switch (static_cast<valtype>(value.index())) { switch (static_cast<Type>(value.index())) {
case valtype::integer: return std::get<integer_t>(value); case Type::integer: return std::get<integer_t>(value);
case valtype::boolean: return std::get<bool>(value); case Type::boolean: return std::get<bool>(value);
default: throw std::runtime_error("type error"); default: throw std::runtime_error("type error");
} }
} }
src/data/dynamic.hpp
+1 -1
View File
@@ -14,7 +14,7 @@ namespace dynamic {
class Map; class Map;
class List; class List;
enum class valtype { enum class Type {
none=0, map, list, string, number, boolean, integer none=0, map, list, string, number, boolean, integer
}; };