RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:17:35 +00:00
Code Issues Activity Actions

jp: Use new format functions

Browse source
This commit is contained in:
Linus Groh 2020-12-14 18:28:40 +00:00 • committed by Andreas Kling
parent bceb5b60f7
commit e68f4111ea
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Userland/jp.cpp
View file

@ -38,7 +38,7 @@ static void print(const JsonValue& value, int indent = 0);
static void print_indent(int indent) static void print_indent(int indent)
{ {
for (int i = 0; i < indent; ++i) for (int i = 0; i < indent; ++i)
printf(" "); out(" ");
} }
int main(int argc, char** argv) int main(int argc, char** argv)
@ -57,7 +57,7 @@ int main(int argc, char** argv)
auto file = Core::File::construct(path); auto file = Core::File::construct(path);
if (!file->open(Core::IODevice::ReadOnly)) { if (!file->open(Core::IODevice::ReadOnly)) {
fprintf(stderr, "Couldn't open %s for reading: %s\n", path, file->error_string()); warnln("Couldn't open {} for reading: {}", path, file->error_string());
return 1; return 1;
} }
@ -69,12 +69,12 @@ int main(int argc, char** argv)
auto file_contents = file->read_all(); auto file_contents = file->read_all();
auto json = JsonValue::from_string(file_contents); auto json = JsonValue::from_string(file_contents);
if (!json.has_value()) { if (!json.has_value()) {
fprintf(stderr, "Couldn't parse %s as JSON\n", path); warnln("Couldn't parse {} as JSON", path);
return 1; return 1;
} }
print(json.value()); print(json.value());
printf("\n"); outln();
return 0; return 0;
} }
@ -82,40 +82,40 @@ int main(int argc, char** argv)
void print(const JsonValue& value, int indent) void print(const JsonValue& value, int indent)
{ {
if (value.is_object()) { if (value.is_object()) {
printf("{\n"); outln("{{");
value.as_object().for_each_member([&](auto& member_name, auto& member_value) { value.as_object().for_each_member([&](auto& member_name, auto& member_value) {
print_indent(indent + 1); print_indent(indent + 1);
printf("\"\033[33;1m%s\033[0m\": ", member_name.characters()); out("\"\033[33;1m{}\033[0m\": ", member_name);
print(member_value, indent + 1); print(member_value, indent + 1);
printf(",\n"); outln(",");
}); });
print_indent(indent); print_indent(indent);
printf("}"); out("}}");
return; return;
} }
if (value.is_array()) { if (value.is_array()) {
printf("[\n"); outln("[");
value.as_array().for_each([&](auto& entry_value) { value.as_array().for_each([&](auto& entry_value) {
print_indent(indent + 1); print_indent(indent + 1);
print(entry_value, indent + 1); print(entry_value, indent + 1);
printf(",\n"); outln(",");
}); });
print_indent(indent); print_indent(indent);
printf("]"); out("]");
return; return;
} }
if (value.is_string()) if (value.is_string())
printf("\033[31;1m"); out("\033[31;1m");
else if (value.is_number()) else if (value.is_number())
printf("\033[35;1m"); out("\033[35;1m");
else if (value.is_bool()) else if (value.is_bool())
printf("\033[32;1m"); out("\033[32;1m");
else if (value.is_null()) else if (value.is_null())
printf("\033[34;1m"); out("\033[34;1m");
if (value.is_string()) if (value.is_string())
putchar('"'); out("\"");
printf("%s", value.to_string().characters()); out("{}", value.to_string());
if (value.is_string()) if (value.is_string())
putchar('"'); out("\"");
printf("\033[0m"); out("\033[0m");
} }