mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 20:11:34 +00:00
Code Issues Releases Wiki Activity

less complicated context override

Browse source
This commit is contained in:
Evil Eye 2020-04-04 14:09:00 +02:00
parent a16727d5e3
commit 8c433d587c
3 changed files with 15 additions and 23 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; Compiler::Locals locals;
const Compiler::ContextRestore&& restore = mErrorHandler.setContext(name2 + "[local variables]", true); const Compiler::ContextOverride override(mErrorHandler, name2 + "[local variables]");
std::istringstream stream (script->mScriptText); std::istringstream stream (script->mScriptText);
Compiler::QuickFileParser parser (mErrorHandler, mCompilerContext, locals); Compiler::QuickFileParser parser (mErrorHandler, mCompilerContext, locals);

20
components/compiler/streamerrorhandler.cpp
View file

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

16
components/compiler/streamerrorhandler.hpp
View file

@ -7,13 +7,14 @@
namespace Compiler namespace Compiler
{ {
class ContextRestore; class ContextOverride;
/// \brief Error handler implementation: Write errors into logging stream /// \brief Error handler implementation: Write errors into logging stream
class StreamErrorHandler : public ErrorHandler class StreamErrorHandler : public ErrorHandler
{ {
std::string mContext; std::string mContext;
friend class ContextOverride;
// not implemented // not implemented
StreamErrorHandler (const StreamErrorHandler&); StreamErrorHandler (const StreamErrorHandler&);
@ -27,7 +28,7 @@ namespace Compiler
public: public:
ContextRestore setContext(const std::string& context, bool restore = false); void setContext(const std::string& context);
// constructors // constructors
@ -35,16 +36,17 @@ namespace Compiler
///< constructor ///< constructor
}; };
class ContextRestore class ContextOverride
{ {
StreamErrorHandler* mHandler; StreamErrorHandler& mHandler;
const std::string mContext; const std::string mContext;
public: public:
ContextRestore (StreamErrorHandler* handler, const std::string& context); ContextOverride (StreamErrorHandler& handler, const std::string& context);
ContextRestore (ContextRestore&& other); ContextOverride (const ContextOverride&) = delete;
ContextOverride& operator= (const ContextOverride&) = delete;
~ContextRestore(); ~ContextOverride();
}; };
} }