mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-12 04:49:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

logs: prefer exceptions over stdout logs around defenums (#1887)

Browse Source 
This was causing an issue in the LSP because the `fmt::print`s clash
with the transport over stdin/out
This commit is contained in:
Tyler Wilding
2022-09-16 20:27:22 -04:00
committed by GitHub
parent 82e0517275
commit 0f4f70e66d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/type_system/defenum.cpp
+9 -7
View File
@@ -9,6 +9,7 @@
#include "deftype.h"
#include "common/goos/ParseHelpers.h"
#include "common/log/log.h"
#include "common/util/BitUtils.h"
#include "third-party/fmt/core.h"
@@ -84,8 +85,8 @@ EnumType* parse_defenum(const goos::Object& defenum,
} else if (symbol_string(option_value) == "#f") {
is_bitfield = false;
} else {
fmt::print("Invalid option {} to :bitfield option.\n", option_value.print());
throw std::runtime_error("invalid bitfield option");
throw std::runtime_error(
fmt::format("Invalid option {} to :bitfield option.\n", option_value.print()));
}
} else if (option_name == ":copy-entries") {
auto other_info = ts->try_enum_lookup(parse_typespec(ts, option_value));
@@ -100,8 +101,7 @@ EnumType* parse_defenum(const goos::Object& defenum,
entries[e.first] = e.second;
}
} else {
fmt::print("Unknown option {} for defenum.\n", option_name);
throw std::runtime_error("unknown option for defenum");
throw std::runtime_error(fmt::format("Unknown option {} for defenum.\n", option_name));
}
if (iter->is_pair()) {
@@ -125,12 +125,13 @@ EnumType* parse_defenum(const goos::Object& defenum,
if (!rest->is_empty_list()) {
auto& value = car(rest);
if (!value.is_int()) {
fmt::print("Expected integer for enum value, got {}\n", value.print());
throw std::runtime_error(
fmt::format("Expected integer for enum value, got {}\n", value.print()));
}
auto entry_val = value.integer_obj.value;
if (!integer_fits(entry_val, type->get_load_size(), type->get_load_signed())) {
fmt::print("Integer {} does not fit inside a {}\n", entry_val, type->get_name());
lg::warn("Integer {} does not fit inside a {}\n", entry_val, type->get_name());
}
if (!entries.size()) {
@@ -140,7 +141,8 @@ EnumType* parse_defenum(const goos::Object& defenum,
rest = cdr(rest);
if (!rest->is_empty_list()) {
fmt::print("Got too many items in defenum {} entry {}\n", name, entry_name);
throw std::runtime_error(
fmt::format("Got too many items in defenum {} entry {}\n", name, entry_name));
}
entries[entry_name] = entry_val;