Skip to content

Add checks for non-0-based arrays in addition and multiplication operators #1898

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
merged 2 commits into from
Feb 1, 2025
Merged

Add checks for non-0-based arrays in addition and multiplication operators #1898

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e22078
Add checks for non-0-based arrays in addition and multiplication oper…
BCSharp Feb 1, 2025
634ad52
Reorder operator methods
BCSharp Feb 1, 2025
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
36 changes: 19 additions & 17 deletions src/core/IronPython/Runtime/Operations/ArrayOps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,6 @@ namespace IronPython.Runtime.Operations {
public static class ArrayOps {
#region Python APIs

[SpecialName]
public static Array Add(Array data1, Array data2) {
if (data1 == null) throw PythonOps.TypeError("expected array for 1st argument, got None");
if (data2 == null) throw PythonOps.TypeError("expected array for 2nd argument, got None");

if (data1.Rank > 1 || data2.Rank > 1) throw new NotImplementedException("can't add multidimensional arrays");

Type type1 = data1.GetType();
Type type2 = data2.GetType();
Type type = (type1 == type2) ? type1.GetElementType()! : typeof(object);

Array ret = Array.CreateInstance(type, data1.Length + data2.Length);
Array.Copy(data1, 0, ret, 0, data1.Length);
Array.Copy(data2, 0, ret, data1.Length, data2.Length);
return ret;
}

[StaticExtensionMethod]
public static object __new__(CodeContext context, PythonType pythonType, int length) {
Type type = pythonType.UnderlyingSystemType.GetElementType()!;
Expand Down Expand Up @@ -143,12 +126,31 @@ public static object __ne__(CodeContext context, Array self, [NotNone] Array oth
[return: MaybeNotImplemented]
public static object __ne__(CodeContext context, object self, object? other) => NotImplementedType.Value;

[SpecialName]
public static Array Add(Array data1, Array data2) {
if (data1 == null) throw PythonOps.TypeError("expected array for 1st argument, got None");
if (data2 == null) throw PythonOps.TypeError("expected array for 2nd argument, got None");

if (data1.Rank > 1 || data2.Rank > 1) throw new NotImplementedException("can't add multidimensional arrays");
if (data1.GetLowerBound(0) != 0 || data2.GetLowerBound(0) != 0) throw new NotImplementedException("can't add non-0-based arrays");

Type type1 = data1.GetType();
Type type2 = data2.GetType();
Type type = (type1 == type2) ? type1.GetElementType()! : typeof(object);

Array ret = Array.CreateInstance(type, data1.Length + data2.Length);
Array.Copy(data1, 0, ret, 0, data1.Length);
Array.Copy(data2, 0, ret, data1.Length, data2.Length);
return ret;
}

/// <summary>
/// Multiply two object[] arrays - slow version, we need to get the type, etc...
/// </summary>
[SpecialName]
public static Array Multiply(Array data, int count) {
if (data.Rank > 1) throw new NotImplementedException("can't multiply multidimensional arrays");
if (data.GetLowerBound(0) != 0) throw new NotImplementedException("can't multiply non-0-based arrays");

Type elemType = data.GetType().GetElementType()!;
if (count <= 0) return Array.CreateInstance(elemType, 0);
Expand Down