Skip to content

fix compiler warning #1226

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
lostmsu merged 8 commits into from
Sep 21, 2020
Merged

fix compiler warning #1226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cff4f4f
fix compiler warning
koubaa Sep 16, 2020
945db38
respond to PR review
koubaa Sep 18, 2020
0c6a7e2
changelog for PyIter change
koubaa Sep 18, 2020
8d74e1c
Fix issues
koubaa Sep 20, 2020
fb4123f
remove action
koubaa Sep 20, 2020
f9216a2
just throw
koubaa Sep 20, 2020
ce9a592
fix
koubaa Sep 21, 2020
d5de641
Merge branch 'master' into compiler-warning
lostmsu Sep 21, 2020
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
Prev Previous commit
Next Next commit
Fix issues
  • Loading branch information
@koubaa
koubaa committed Sep 20, 2020
commit 8d74e1c3488244a626c951b56b700f1804d14737
22 changes: 2 additions & 20 deletions src/runtime/pyiter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,6 @@ public PyIter(IntPtr ptr) : base(ptr)
{
}

private static IntPtr FromObject(PyObject iterable)
{
if (iterable == null)
{
throw new NullReferenceException();
}
IntPtr val = Runtime.PyObject_GetIter(iterable.obj);
if (val == IntPtr.Zero)
{
throw new PythonException();
}
return val;
}


/// <summary>
/// PyIter factory function.
/// </summary>
Expand All @@ -52,13 +37,10 @@ public static PyIter GetIter(PyObject iterable)
{
if (iterable == null)
{
throw new NullReferenceException();
throw new ArgumentNullException();
}
IntPtr val = Runtime.PyObject_GetIter(iterable.obj);
if (val == IntPtr.Zero)
{
throw new PythonException();
}
PythonException.ThrowIfIsNull(val);
return new PyIter(val);
}

Expand Down
3 changes: 2 additions & 1 deletion src/runtime/pythonexception.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,11 @@ internal static void ThrowIfIsNull(BorrowedReference reference)
}
}

public static void ThrowIfIsNotZero(int value)
public static void ThrowIfIsNotZero(int value, Action onBeforeThrow = null)
{
if (value != 0)
{
onBeforeThrow?.Invoke();
Comment thread
koubaa marked this conversation as resolved.
Outdated
throw new PythonException();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pytuple.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private static IntPtr FromArray(PyObject[] items)
IntPtr ptr = items[i].obj;
Runtime.XIncref(ptr);
int res = Runtime.PyTuple_SetItem(val, i, ptr);
PythonException.ThrowIfIsNotZero(res);
PythonException.ThrowIfIsNotZero(res, () => Runtime.Py_DecRef(val));
}
return val;
}
Expand Down