From 79d3e2bdfd441d6eba2f22af78d5bea5e488daf1 Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Fri, 30 May 2014 22:19:32 +0200 Subject: Rewrote error handling based on exceptions * ErrorHandler is replaced by ErrorCapacitor ** temporarily registers itself as both the ProblemListener and ErrorHandler of a given XalanTransformer instance ** deregisters itself on destruction ** collects all problems and errors during its lifetime inside a internal std::vector instance ** if this instance is not empty it is thrown contained within a ErrorCapacitor::exception by the member method ErrorCapacitor::discharge * this enables using the same code for handling transformation compilation and generation errors and problems * updated test frontend accordingly --- src/support/error_capacitor.cc | 107 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 src/support/error_capacitor.cc (limited to 'src/support/error_capacitor.cc') diff --git a/src/support/error_capacitor.cc b/src/support/error_capacitor.cc new file mode 100644 index 0000000..e83ba9a --- /dev/null +++ b/src/support/error_capacitor.cc @@ -0,0 +1,107 @@ +#include "error_capacitor.h" + +#include + +#include + +#include "support/xalan_string.h" +#include "support/xerces_string_guard.h" + +namespace { + +inline std::string getMessage(const xercesc::SAXParseException& exception) { + return std::string( + *InputXSLT::XercesStringGuard(exception.getMessage()) + ); +} + +} + +namespace InputXSLT { + +ErrorCapacitor::ErrorCapacitor(xalan::XalanTransformer* transformer): + transformer_(transformer), + error_cache_(new error_cache()) { + this->transformer_->setErrorHandler(this); + this->transformer_->setProblemListener(this); +} + +ErrorCapacitor::~ErrorCapacitor() { + this->transformer_->setErrorHandler(nullptr); + this->transformer_->setProblemListener(nullptr); +} + +void ErrorCapacitor::discharge() { + if ( !this->error_cache_->empty() ) { + throw exception(std::move(this->error_cache_)); + } +} + +void ErrorCapacitor::warning(const xercesc::SAXParseException& exception) { + this->error_cache_->emplace_back( + "Warning: " + getMessage(exception) + ); +} + +void ErrorCapacitor::error(const xercesc::SAXParseException& exception) { + this->error_cache_->emplace_back( + "Error: " + getMessage(exception) + ); +} + +void ErrorCapacitor::fatalError(const xercesc::SAXParseException& exception) { + this->error_cache_->emplace_back( + "Fatal error: " + getMessage(exception) + ); +} + +void ErrorCapacitor::resetErrors() { } + +void ErrorCapacitor::problem( + xalan::ProblemListenerBase::eSource, + xalan::ProblemListenerBase::eClassification, + const xalan::XalanDOMString& message, + const xalan::Locator*, + const xalan::XalanNode* +) { + this->error_cache_->emplace_back( + "XSLT problem: " + toString(message) + ); +} + +void ErrorCapacitor::problem( + xalan::ProblemListenerBase::eSource, + xalan::ProblemListenerBase::eClassification, + const xalan::XalanNode*, + const xalan::ElemTemplateElement*, + const xalan::XalanDOMString& message, + const xalan::XalanDOMChar*, + xalan::XalanFileLoc, + xalan::XalanFileLoc +) { + this->error_cache_->emplace_back( + "XSLT problem: " + toString(message) + ); +} + +void ErrorCapacitor::problem( + xalan::ProblemListenerBase::eSource, + xalan::ProblemListenerBase::eClassification, + const xalan::XalanDOMString& message, + const xalan::XalanNode* +) { + this->error_cache_->emplace_back( + "XSLT problem: " + toString(message) + ); +} + +void ErrorCapacitor::setPrintWriter(xalan::PrintWriter*) { } + +ErrorCapacitor::exception::exception(error_cache_ptr ptr): + error_cache_(std::move(ptr)) { } + +auto ErrorCapacitor::exception::getCachedErrors() const -> const error_cache* { + return this->error_cache_.get(); +} + +} -- cgit v1.2.3