From 1dc206edb9df8aec43fecf84589b1c84407be82e Mon Sep 17 00:00:00 2001 From: doctaweed <70249609+doctaweed@users.noreply.github.com> Date: Wed, 26 Aug 2020 19:34:54 -0600 Subject: [PATCH] More fixes Comment out related deci2 code until networking can be reworked. Resolved std::exception errors with a temporary fix --- game/runtime.cpp | 2 +- goalc/goos/Object.cpp | 2 +- goalc/goos/Reader.cpp | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/game/runtime.cpp b/game/runtime.cpp index 7bd2b42b66..89de649c25 100644 --- a/game/runtime.cpp +++ b/game/runtime.cpp @@ -227,7 +227,7 @@ void exec_runtime(int argc, char** argv) { // step 1: sce library prep iop::LIBRARY_INIT(); ee::LIBRARY_INIT_sceCd(); - ee::LIBRARY_INIT_sceDeci2(); + //ee::LIBRARY_INIT_sceDeci2(); ee::LIBRARY_INIT_sceSif(); // step 2: system prep diff --git a/goalc/goos/Object.cpp b/goalc/goos/Object.cpp index 649947d1f5..0b5792a039 100644 --- a/goalc/goos/Object.cpp +++ b/goalc/goos/Object.cpp @@ -151,7 +151,7 @@ bool Object::operator==(const Object& other) const { } default: - //throw std::exception("equality not implemented for " + print()); + throw std::exception("equality not implemented for"); } } diff --git a/goalc/goos/Reader.cpp b/goalc/goos/Reader.cpp index 33f1182d7b..58882e9cf6 100644 --- a/goalc/goos/Reader.cpp +++ b/goalc/goos/Reader.cpp @@ -588,7 +588,7 @@ bool Reader::try_token_as_binary(const Token& tok, Object& obj) { for (uint32_t i = 2; i < tok.text.size(); i++) { if (value & (0x8000000000000000)) { - throw std::exception("overflow in binary constant: " + tok.text); + throw std::exception("overflow in binary constant:)"); } value <<= 1u; @@ -628,7 +628,7 @@ bool Reader::try_token_as_hex(const Token& tok, Object& obj) { obj = Object::make_integer(v); return true; } catch (std::exception& e) { - throw std::exception("The number " + tok.text + " cannot be a hexadecimal constant"); + throw std::exception("The number cannot be a hexadecimal constant"); } } return false; @@ -662,7 +662,7 @@ bool Reader::try_token_as_integer(const Token& tok, Object& obj) { obj = Object::make_integer(v); return true; } catch (std::exception& e) { - throw std::exception("The number " + tok.text + " cannot be an integer constant"); + throw std::exception("The number cannot be an integer constant"); } } return false; @@ -697,8 +697,7 @@ bool Reader::try_token_as_char(const Token& tok, Object& obj) { * Used for reader errors, like "missing close paren" or similar. */ void Reader::throw_reader_error(TextStream& here, const std::string& err, int seek_offset) { - throw std::exception("Reader error:\n" + err + "\nat " + - db.get_info_for(here.text, here.seek + seek_offset)); + throw std::exception("Reader error at"); } /*!