0ad/source/gui/CGUISetting.cpp
wraitii 25490bfec3 Improve JS Exception handling.
- Check for pending exceptions after function calls and script
executions.
- Call LOGERROR instead of JS_ReportError when there is a conversion
error in FromJSVal, since that can only be called from C++ (where JS
errors don't really make sense). Instead, C++ callers of FromJSVal
should handle the failure and, themselves, either report an error or
simply do something else.
- Wrap JS_ReportError since that makes updating it later easier.

This isn't a systematical fix since ToJSVal also ought return a boolean
for failures, and we probably should trigger errors instead of warnings
on 'implicit' conversions, rather a preparation diff.

Part of the SM52 migration, stage: SM45 compatible (actually SM52
incompatible, too).

Based on a patch by: Itms
Comments by: Vladislavbelov, Stan`
Refs #742, #4893

Differential Revision: https://code.wildfiregames.com/D3093
This was SVN commit r24187.
2020-11-15 18:29:17 +00:00

87 lines
2.3 KiB
C++

/* Copyright (C) 2019 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
#include "precompiled.h"
#include "CGUISetting.h"
#include "gui/CGUI.h"
template<typename T>
CGUISetting<T>::CGUISetting(IGUIObject& pObject, const CStr& Name, T& Value)
: m_pSetting(Value), m_Name(Name), m_pObject(pObject)
{
}
template<typename T>
bool CGUISetting<T>::FromString(const CStrW& Value, const bool SendMessage)
{
T settingValue;
if (!CGUI::ParseString<T>(&m_pObject.GetGUI(), Value, settingValue))
return false;
m_pObject.SetSetting<T>(m_Name, settingValue, SendMessage);
return true;
};
template<>
bool CGUISetting<CGUIColor>::FromJSVal(const ScriptRequest& rq, JS::HandleValue Value, const bool SendMessage)
{
CGUIColor settingValue;
if (Value.isString())
{
CStr name;
if (!ScriptInterface::FromJSVal(rq, Value, name))
return false;
if (!settingValue.ParseString(m_pObject.GetGUI(), name))
{
LOGERROR("Invalid color '%s'", name.c_str());
return false;
}
}
else if (!ScriptInterface::FromJSVal<CColor>(rq, Value, settingValue))
return false;
m_pObject.SetSetting<CGUIColor>(m_Name, settingValue, SendMessage);
return true;
};
template<typename T>
bool CGUISetting<T>::FromJSVal(const ScriptRequest& rq, JS::HandleValue Value, const bool SendMessage)
{
T settingValue;
if (!ScriptInterface::FromJSVal<T>(rq, Value, settingValue))
return false;
m_pObject.SetSetting<T>(m_Name, settingValue, SendMessage);
return true;
};
template<typename T>
void CGUISetting<T>::ToJSVal(const ScriptRequest& rq, JS::MutableHandleValue Value)
{
ScriptInterface::ToJSVal<T>(rq, Value, m_pSetting);
};
#define TYPE(T) \
template class CGUISetting<T>; \
#include "gui/GUISettingTypes.h"
#undef TYPE