Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No ParamCast exceptions #6

Merged
merged 3 commits into from
Dec 8, 2023
Merged

No ParamCast exceptions #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64307b2
add log when native param cast fails
AmyrAhmady Nov 1, 2023
9822472
better ParamCast error handling, remove exceptions
AmyrAhmady Dec 3, 2023
702d3ae
entirely change how PAramCast error handling works
AmyrAhmady Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 110 additions & 55 deletions Internal/NativeCast.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,6 @@

namespace pawn_natives
{
// This is for any casts that can't go on, but where this is somewhat expected. For example, a
// cast to a player when there is no player.
class ParamCastFailure : public std::invalid_argument
{
public:
explicit ParamCastFailure()
: std::invalid_argument("ParamCast failed acceptably.")
{
}
};

// This is for true cast errors.
class ParamCastError : public std::invalid_argument
{
public:
explicit ParamCastError()
: std::invalid_argument("ParamCast had an exception.")
{
}
};

template <typename T, typename = void>
struct ParamLookup
{
Expand Down Expand Up @@ -79,6 +58,11 @@ class ParamCast
return value_;
}

bool Error() const
{
return false;
}

static constexpr int Size = 1;

private:
Expand Down Expand Up @@ -116,6 +100,11 @@ class ParamCast<T const>
return value_;
}

bool Error() const
{
return false;
}

static constexpr int Size = 1;

private:
Expand Down Expand Up @@ -150,9 +139,12 @@ class ParamCast<T&>
amx_GetAddr(amx, params[idx], &src);
if (src == nullptr)
{
throw pawn_natives::ParamCastFailure();
error_ = true;
}
else
{
value_ = ParamLookup<T>::Ptr(src);
}
value_ = ParamLookup<T>::Ptr(src);
}

~ParamCast()
Expand All @@ -170,11 +162,20 @@ class ParamCast<T&>
return *value_;
}

bool Error() const
{
return error_;
}

static constexpr int Size = 1;

private:
T*
value_;

bool
error_
= false;
};

template <typename T>
Expand All @@ -196,9 +197,12 @@ class ParamCast<T const&>
amx_GetAddr(amx, params[idx], &src);
if (src == nullptr)
{
throw pawn_natives::ParamCastFailure();
error_ = true;
}
else
{
value_ = ParamLookup<T>::Ptr(src);
}
value_ = ParamLookup<T>::Ptr(src);
}

~ParamCast()
Expand All @@ -214,11 +218,20 @@ class ParamCast<T const&>
return *value_;
}

bool Error() const
{
return error_;
}

static constexpr int Size = 1;

private:
T*
value_;

bool
error_
= false;
};

// Use `string &`.
Expand Down Expand Up @@ -272,18 +285,21 @@ class ParamCast<std::string&>
amx_GetAddr(amx, params[idx], &addr_);
if (addr_ == nullptr)
{
throw pawn_natives::ParamCastFailure();
error_ = true;
}
else
{
#ifdef _WIN32
char* src = (char*)_malloca(len_);
amx_GetString(src, addr_, 0, len_);
value_ = src;
_freea(src);
char* src = (char*)_malloca(len_);
amx_GetString(src, addr_, 0, len_);
value_ = src;
_freea(src);
#else
char* src = (char*)alloca(len_);
amx_GetString(src, addr_, 0, len_);
value_ = src;
char* src = (char*)alloca(len_);
amx_GetString(src, addr_, 0, len_);
value_ = src;
#endif
}
}
else
{
Expand All @@ -307,6 +323,11 @@ class ParamCast<std::string&>
return value_;
}

bool Error() const
{
return error_;
}

static constexpr int Size = 2;

private:
Expand All @@ -318,6 +339,10 @@ class ParamCast<std::string&>

std::string
value_;

bool
error_
= false;
};

template <>
Expand All @@ -336,24 +361,27 @@ class ParamCast<std::string const&>
amx_GetAddr(amx, params[idx], &addr);
if (addr == nullptr)
{
throw pawn_natives::ParamCastFailure();
error_ = true;
}
amx_StrLen(addr, &len);
if (len > 0)
else
{
amx_StrLen(addr, &len);
if (len > 0)
{
#ifdef _WIN32
char* src = (char*)_malloca(len + 1);
amx_GetString(src, addr, 0, len + 1);
value_ = src;
_freea(src);
char* src = (char*)_malloca(len + 1);
amx_GetString(src, addr, 0, len + 1);
value_ = src;
_freea(src);
#else
char* src = (char*)alloca(len + 1);
amx_GetString(src, addr, 0, len + 1);
value_ = src;
char* src = (char*)alloca(len + 1);
amx_GetString(src, addr, 0, len + 1);
value_ = src;
#endif
}
else
value_.clear();
}
else
value_.clear();
}

~ParamCast()
Expand All @@ -369,11 +397,20 @@ class ParamCast<std::string const&>
return value_;
}

bool Error() const
{
return error_;
}

static constexpr int Size = 1;

private:
std::string
value_;

bool
error_
= false;
};

template <>
Expand All @@ -386,9 +423,12 @@ class ParamCast<cell const*>
amx_GetAddr(amx, params[idx], &cptr);
if (cptr == nullptr)
{
throw pawn_natives::ParamCastFailure();
error_ = true;
}
else
{
value_ = cptr;
}
value_ = cptr;
}

~ParamCast()
Expand All @@ -404,11 +444,20 @@ class ParamCast<cell const*>
return value_;
}

bool Error() const
{
return error_;
}

static constexpr int Size = 1;

private:
cell const*
value_;

bool
error_
= false;
};

template <size_t N, typename... TS>
Expand All @@ -420,18 +469,24 @@ template <size_t N, typename T, typename... TS>
struct ParamArray<N, T, TS...>
{
template <class F, typename... NS>
static inline auto Call(F that, AMX* amx, cell* params, size_t prev, NS&&... vs)
-> decltype(ParamArray<N - 1, TS...>::Call(that, amx, params, prev + ParamCast<T>::Size, std::forward<NS>(vs)..., ParamCast<T>(amx, params, prev)))
static inline auto Call(F that, AMX* amx, cell* params, cell failRet, size_t prev, NS&&... vs)
-> decltype(ParamArray<N - 1, TS...>::Call(that, amx, params, failRet, prev + ParamCast<T>::Size, std::forward<NS>(vs)..., ParamCast<T>(amx, params, prev)))
{
return ParamArray<N - 1, TS...>::Call(that, amx, params, prev + ParamCast<T>::Size, std::forward<NS>(vs)..., ParamCast<T>(amx, params, prev));
auto ParamCast_ = ParamCast<T>(amx, params, prev);
if (ParamCast_.Error())
{
return failRet;
}

return ParamArray<N - 1, TS...>::Call(that, amx, params, failRet, prev + ParamCast<T>::Size, std::forward<NS>(vs)..., ParamCast_);
}
};

template <>
struct ParamArray<0>
{
template <class F, typename... NS>
static inline auto Call(F that, AMX* amx, cell* params, size_t prev, NS&&... vs)
static inline auto Call(F that, AMX* amx, cell* params, cell failRet, size_t prev, NS&&... vs)
-> decltype(that->Do(std::forward<NS>(vs)...))
{
return that->Do(std::forward<NS>(vs)...);
Expand All @@ -453,10 +508,10 @@ struct ParamData<T, TS...>
}

template <class F>
static inline auto Call(F that, AMX* amx, cell* params)
-> decltype(ParamArray<sizeof...(TS) + 1, T, TS...>::Call(that, amx, params, 1))
static inline auto Call(F that, AMX* amx, cell* params, cell failRet)
-> decltype(ParamArray<sizeof...(TS) + 1, T, TS...>::Call(that, amx, params, failRet, 1))
{
return ParamArray<sizeof...(TS) + 1, T, TS...>::Call(that, amx, params, 1);
return ParamArray<sizeof...(TS) + 1, T, TS...>::Call(that, amx, params, failRet, 1);
}
};

Expand All @@ -469,7 +524,7 @@ struct ParamData<>
}

template <class F>
static inline auto Call(F that, AMX*, cell*)
static inline auto Call(F that, AMX*, cell*, cell)
-> decltype(that->Do())
{
return that->Do();
Expand Down
Loading