Skip to content

Allow decoders to decode Python types derived from primitives #1986

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

Merged
filmor merged 2 commits into from
Oct 28, 2022
Merged

Allow decoders to decode Python types derived from primitives #1986

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6c024c
explicit functions for exact type checks
lostmsu Oct 24, 2022
782a0e5
allow decoders to override conversion of types derived from primitive…
lostmsu Oct 24, 2022
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
Next Next commit
explicit functions for exact type checks
  • Loading branch information
@lostmsu
lostmsu committed Oct 24, 2022
commit d6c024c8fb891024cbe7045268a0ca74351c547b
15 changes: 12 additions & 3 deletions src/runtime/Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,8 +1094,13 @@ internal static nint PyBuffer_SizeFromFormat(string format)
internal static bool PyInt_Check(BorrowedReference ob)
=> PyObject_TypeCheck(ob, PyLongType);

internal static bool PyInt_CheckExact(BorrowedReference ob)
=> PyObject_TypeCheckExact(ob, PyLongType);

internal static bool PyBool_Check(BorrowedReference ob)
=> PyObject_TypeCheck(ob, PyBoolType);
internal static bool PyBool_CheckExact(BorrowedReference ob)
=> PyObject_TypeCheckExact(ob, PyBoolType);

internal static NewReference PyInt_FromInt32(int value) => PyLong_FromLongLong(value);

Expand Down Expand Up @@ -1141,6 +1146,8 @@ internal static NewReference PyLong_FromString(string value, int radix)

internal static bool PyFloat_Check(BorrowedReference ob)
=> PyObject_TypeCheck(ob, PyFloatType);
internal static bool PyFloat_CheckExact(BorrowedReference ob)
=> PyObject_TypeCheckExact(ob, PyFloatType);

/// <summary>
/// Return value: New reference.
Expand Down Expand Up @@ -1282,9 +1289,9 @@ internal static bool PyFloat_Check(BorrowedReference ob)
// Python string API
//====================================================================
internal static bool PyString_Check(BorrowedReference ob)
{
return PyObject_TYPE(ob) == PyStringType;
}
=> PyObject_TypeCheck(ob, PyStringType);
internal static bool PyString_CheckExact(BorrowedReference ob)
=> PyObject_TypeCheckExact(ob, PyStringType);

internal static NewReference PyString_FromString(string value)
{
Expand Down Expand Up @@ -1643,6 +1650,8 @@ internal static bool PyType_IsSubtype(BorrowedReference t1, BorrowedReference t2
return Delegates.PyType_IsSubtype(t1, t2);
}

internal static bool PyObject_TypeCheckExact(BorrowedReference ob, BorrowedReference tp)
=> PyObject_TYPE(ob) == tp;
internal static bool PyObject_TypeCheck(BorrowedReference ob, BorrowedReference tp)
{
BorrowedReference t = PyObject_TYPE(ob);
Expand Down