mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 07:45:36 +00:00
Code Issues Releases Wiki Activity

reset errorhandler context

Browse source
This commit is contained in:
Evil Eye 2020-04-02 20:14:52 +02:00
parent 2a31382e20
commit 8958e29187
3 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwscript/scriptmanagerimp.cpp
View file

@ -171,7 +171,7 @@ namespace MWScript
{
Compiler::Locals locals;
mErrorHandler.setContext(name2 + "[local variables]");
Compiler::ContextRestore restore = mErrorHandler.setContext(name2 + "[local variables]", true);
std::istringstream stream (script->mScriptText);
Compiler::QuickFileParser parser (mErrorHandler, mCompilerContext, locals);

17
components/compiler/streamerrorhandler.cpp
View file

@ -56,10 +56,25 @@ namespace Compiler
Log(logLevel) << text.str();
}
void StreamErrorHandler::setContext(const std::string &context)
ContextRestore StreamErrorHandler::setContext(const std::string &context, bool restore)
{
if (!restore)
{
mContext = context;
return {nullptr, {}};
}
ContextRestore restorer(this, mContext);
mContext = context;
return restorer;
}
StreamErrorHandler::StreamErrorHandler() {}
ContextRestore::ContextRestore(StreamErrorHandler* handler, const std::string& context) : mHandler(handler), mContext(context) {}
ContextRestore::~ContextRestore()
{
if(mHandler)
mHandler->setContext(mContext);
}
}

13
components/compiler/streamerrorhandler.hpp
View file

@ -7,6 +7,7 @@
namespace Compiler
{
class ContextRestore;
/// \brief Error handler implementation: Write errors into logging stream
class StreamErrorHandler : public ErrorHandler
@ -26,13 +27,23 @@ namespace Compiler
public:
void setContext(const std::string& context);
ContextRestore setContext(const std::string& context, bool restore = false);
// constructors
StreamErrorHandler ();
///< constructor
};
class ContextRestore
{
StreamErrorHandler* mHandler;
const std::string mContext;
public:
ContextRestore (StreamErrorHandler* handler, const std::string& context);
~ContextRestore();
};
}
#endif