YAML: Try to recover from more types of errors

Author: chaoticgd

common/YAML.cpp

@@ -3,8 +3,6 @@
 
 #include "YAML.h"
 
-#include "Assertions.h"
-
 #if RYML_VERSION_MAJOR > 0 || RYML_VERSION_MINOR >= 11
 #include "c4/yml/error.def.hpp" // for ryml::err_basic_format etc
 #endif
@@ -28,15 +26,16 @@ std::optional<ryml::Tree> ParseYAMLFromString(ryml::csubstr yaml, ryml::csubstr
 	callbacks.set_user_data(static_cast<void*>(&context));
 
 	callbacks.set_error_basic([](ryml::csubstr msg, const ryml::ErrorDataBasic& errdata, void* user_data) {
+		RapidYAMLContext* context = static_cast<RapidYAMLContext*>(user_data);
+
 		std::string description;
 		auto callback = [&description](ryml::csubstr string) {
 			description.append(string.str, string.len);
 		};
 		ryml::err_basic_format(std::move(callback), msg, errdata);
 
-		// We might have already returned, so don't try to recover.
-		pxFailRel(description.c_str());
-		std::abort();
+		Error::SetString(context->error, std::move(description));
+		std::longjmp(context->env, 1);
 	});
 
 	callbacks.set_error_parse([](ryml::csubstr msg, const ryml::ErrorDataParse& errdata, void* user_data) {
@@ -53,15 +52,16 @@ std::optional<ryml::Tree> ParseYAMLFromString(ryml::csubstr yaml, ryml::csubstr
 	});
 
 	callbacks.set_error_visit([](ryml::csubstr msg, const ryml::ErrorDataVisit& errdata, void* user_data) {
+		RapidYAMLContext* context = static_cast<RapidYAMLContext*>(user_data);
+
 		std::string description;
 		auto callback = [&description](ryml::csubstr string) {
 			description.append(string.str, string.len);
 		};
 		ryml::err_visit_format(std::move(callback), msg, errdata);
 
-		// We've probably already returned, so don't try to recover.
-		pxFailRel(description.c_str());
-		std::abort();
+		Error::SetString(context->error, std::move(description));
+		std::longjmp(context->env, 1);
 	});
 #else
 	callbacks.m_user_data = static_cast<void*>(&context);