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

'dynamic' namespace refactor + sensitivity is a NumberSetting now

Browse Source
This commit is contained in:
MihailRis
2024-03-31 17:30:02 +03:00
parent 398347bd81
commit 48982e3478
14 changed files with 168 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/coders/binary_json.cpp
+19 -17
View File
@@ -10,20 +10,22 @@ using namespace dynamic;
static void to_binary(ByteBuilder& builder, const Value* value) {
switch (value->type) {
case valtype::none:
throw std::runtime_error("none value is not implemented");
case valtype::map: {
std::vector<ubyte> bytes = to_binary(value->value.map);
std::vector<ubyte> bytes = to_binary(std::get<Map*>(value->value));
builder.put(bytes.data(), bytes.size());
break;
}
case valtype::list:
builder.put(BJSON_TYPE_LIST);
for (auto& element : value->value.list->values) {
for (auto& element : std::get<List*>(value->value)->values) {
to_binary(builder, element.get());
}
builder.put(BJSON_END);
break;
case valtype::integer: {
int64_t val = value->value.integer;
auto val = std::get<integer_t>(value->value);
if (val >= 0 && val <= 255) {
builder.put(BJSON_TYPE_BYTE);
builder.put(val);
@@ -41,14 +43,14 @@ static void to_binary(ByteBuilder& builder, const Value* value) {
}
case valtype::number:
builder.put(BJSON_TYPE_NUMBER);
builder.putFloat64(value->value.decimal);
builder.putFloat64(std::get<number_t>(value->value));
break;
case valtype::boolean:
builder.put(BJSON_TYPE_FALSE + value->value.boolean);
builder.put(BJSON_TYPE_FALSE + std::get<bool>(value->value));
break;
case valtype::string:
builder.put(BJSON_TYPE_STRING);
builder.put(*value->value.str);
builder.put(std::get<std::string>(value->value));
break;
}
}
@@ -88,40 +90,40 @@ static Value* value_from_binary(ByteReader& reader) {
case BJSON_TYPE_DOCUMENT:
type = valtype::map;
reader.getInt32();
val.map = object_from_binary(reader);
val = object_from_binary(reader);
break;
case BJSON_TYPE_LIST:
type = valtype::list;
val.list = array_from_binary(reader);
val = array_from_binary(reader);
break;
case BJSON_TYPE_BYTE:
type = valtype::integer;
val.integer = reader.get();
val = reader.get();
break;
case BJSON_TYPE_INT16:
type = valtype::integer;
val.integer = reader.getInt16();
val = reader.getInt16();
break;
case BJSON_TYPE_INT32:
type = valtype::integer;
val.integer = reader.getInt32();
val = reader.getInt32();
break;
case BJSON_TYPE_INT64:
type = valtype::integer;
val.integer = reader.getInt64();
val = reader.getInt64();
break;
case BJSON_TYPE_NUMBER:
type = valtype::number;
val.decimal = reader.getFloat64();
val = reader.getFloat64();
break;
case BJSON_TYPE_FALSE:
case BJSON_TYPE_TRUE:
type = valtype::boolean;
val.boolean = typecode - BJSON_TYPE_FALSE;
val = typecode - BJSON_TYPE_FALSE;
break;
case BJSON_TYPE_STRING:
type = valtype::string;
val.str = new std::string(reader.getString());
val = reader.getString();
break;
default:
throw std::runtime_error(
@@ -166,8 +168,8 @@ std::unique_ptr<Map> json::from_binary(const ubyte* src, size_t size) {
if (value->type != valtype::map) {
throw std::runtime_error("root value is not an object");
}
std::unique_ptr<Map> obj (value->value.map);
value->value.map = nullptr;
std::unique_ptr<Map> obj (std::get<Map*>(value->value));
value->value = (Map*)nullptr;
return obj;
}
}
src/coders/json.cpp
+18 -17
View File
@@ -42,10 +42,11 @@ void stringify(const Value* value,
const std::string& indentstr,
bool nice) {
if (value->type == valtype::map) {
stringifyObj(value->value.map, ss, indent, indentstr, nice);
auto map = std::get<Map*>(value->value);
stringifyObj(map, ss, indent, indentstr, nice);
}
else if (value->type == valtype::list) {
auto list = value->value.list;
auto list = std::get<List*>(value->value);
if (list->size() == 0) {
ss << "[]";
return;
@@ -66,14 +67,14 @@ void stringify(const Value* value,
}
ss << ']';
} else if (value->type == valtype::boolean) {
ss << (value->value.boolean ? "true" : "false");
ss << (std::get<bool>(value->value) ? "true" : "false");
} else if (value->type == valtype::number) {
ss << std::setprecision(15);
ss << value->value.decimal;
ss << std::get<number_t>(value->value);
} else if (value->type == valtype::integer) {
ss << value->value.integer;
ss << std::get<integer_t>(value->value);
} else if (value->type == valtype::string) {
ss << escape_string(*value->value.str);
ss << escape_string(std::get<std::string>(value->value));
}
}
@@ -189,10 +190,10 @@ Value* Parser::parseValue() {
number_u num;
valtype type;
if (parseNumber(next == '-' ? -1 : 1, num)) {
val.integer = num.ival;
val = num.ival;
type = valtype::integer;
} else {
val.decimal = num.fval;
val = num.fval;
type = valtype::number;
}
return new Value(type, val);
@@ -200,43 +201,43 @@ Value* Parser::parseValue() {
if (is_identifier_start(next)) {
std::string literal = parseName();
if (literal == "true") {
val.boolean = true;
val = true;
return new Value(valtype::boolean, val);
} else if (literal == "false") {
val.boolean = false;
val = false;
return new Value(valtype::boolean, val);
} else if (literal == "inf") {
val.decimal = INFINITY;
val = INFINITY;
return new Value(valtype::number, val);
} else if (literal == "nan") {
val.decimal = NAN;
val = NAN;
return new Value(valtype::number, val);
}
throw error("invalid literal ");
}
if (next == '{') {
val.map = parseObject();
val = parseObject();
return new Value(valtype::map, val);
}
if (next == '[') {
val.list = parseList();
val = parseList();
return new Value(valtype::list, val);
}
if (is_digit(next)) {
number_u num;
valtype type;
if (parseNumber(1, num)) {
val.integer = num.ival;
val = num.ival;
type = valtype::integer;
} else {
val.decimal = num.fval;
val = num.fval;
type = valtype::number;
}
return new Value(type, val);
}
if (next == '"' || next == '\'') {
pos++;
val.str = new std::string(parseString(next));
val = parseString(next);
return new Value(valtype::string, val);
}
throw error("unexpected character '"+std::string({next})+"'");