fixed nullablity in arrayobject.cs

lostmsu · lostmsu · commit 307604058883 · 2021-10-17T19:26:13.000-07:00
diff --git a/src/runtime/arrayobject.cs b/src/runtime/arrayobject.cs
@@ -29,7 +29,7 @@ public static NewReference tp_new(BorrowedReference tp, BorrowedReference args,
                 return Exceptions.RaiseTypeError("array constructor takes no keyword arguments");
             }
 
-            var self = GetManagedObject(tp) as ArrayObject;
+            var self = (ArrayObject)GetManagedObject(tp)!;
             if (!self.type.Valid)
             {
                 return Exceptions.RaiseTypeError(self.type.DeletedMessage);
@@ -63,14 +63,14 @@ public static NewReference tp_new(BorrowedReference tp, BorrowedReference args,
                     return NewInstance(arrType.GetElementType(), tp, dimensions);
                 }
             }
-            object result;
+            object? result;
 
             // this implements casting to Array[T]
             if (!Converter.ToManaged(op, arrType, out result, true))
             {
                 return default;
             }
-            return CLRObject.GetReference(result, tp);
+            return CLRObject.GetReference(result!, tp);
         }
 
         static NewReference CreateMultidimensional(Type elementType, long[] dimensions, BorrowedReference shapeTuple, BorrowedReference pyType)
@@ -133,13 +133,13 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,
         /// </summary>
         public new static NewReference mp_subscript(BorrowedReference ob, BorrowedReference idx)
         {
-            var obj = (CLRObject)GetManagedObject(ob);
-            var arrObj = (ArrayObject)GetManagedObjectType(ob);
+            var obj = (CLRObject)GetManagedObject(ob)!;
+            var arrObj = (ArrayObject)GetManagedObjectType(ob)!;
             if (!arrObj.type.Valid)
             {
                 return Exceptions.RaiseTypeError(arrObj.type.DeletedMessage);
             }
-            var items = obj.inst as Array;
+            var items = (Array)obj.inst;
             Type itemType = arrObj.type.Value.GetElementType();
             int rank = items.Rank;
             nint index;
@@ -346,10 +346,10 @@ private static NewReference RaiseIndexMustBeIntegerError(BorrowedReference idx)
         /// </summary>
         public static int sq_contains(BorrowedReference ob, BorrowedReference v)
         {
-            var obj = (CLRObject)GetManagedObject(ob);
+            var obj = (CLRObject)GetManagedObject(ob)!;
             Type itemType = obj.inst.GetType().GetElementType();
-            var items = obj.inst as IList;
-            object value;
+            var items = (IList)obj.inst;
+            object? value;
 
             if (!Converter.ToManaged(v, itemType, out value, false))
             {
@@ -383,7 +383,7 @@ static int GetBuffer(BorrowedReference obj, out Py_buffer buffer, PyBUF flags)
             Type itemType = self.GetType().GetElementType();
 
             bool formatRequested = (flags & PyBUF.FORMATS) != 0;
-            string format = GetFormat(itemType);
+            string? format = GetFormat(itemType);
             if (formatRequested && format is null)
             {
                 Exceptions.SetError(Exceptions.BufferError, "unsupported element type: " + itemType.Name);
@@ -495,7 +495,7 @@ static unsafe IntPtr ToUnmanaged<T>(T[] array) where T : unmanaged
             [typeof(double)] = "d",
         };
 
-        static string GetFormat(Type elementType)
+        static string? GetFormat(Type elementType)
             => ItemFormats.TryGetValue(elementType, out string result) ? result : null;
 
         static readonly GetBufferProc getBufferProc = GetBuffer;
diff --git a/src/runtime/bufferinterface.cs b/src/runtime/bufferinterface.cs
@@ -17,7 +17,7 @@ pointed to by strides in simple case.*/
         public bool _readonly;
         public int ndim;
         [MarshalAs(UnmanagedType.LPStr)]
-        public string format;
+        public string? format;
         public IntPtr shape;
         public IntPtr strides;
         public IntPtr suboffsets;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static NewReference tp_new(BorrowedReference tp, BorrowedReference args,`
`29`	`29`	`return Exceptions.RaiseTypeError("array constructor takes no keyword arguments");`
`30`	`30`	`}`
`31`	`31`
`32`		`- var self = GetManagedObject(tp) as ArrayObject;`
	`32`	`+ var self = (ArrayObject)GetManagedObject(tp)!;`
`33`	`33`	`if (!self.type.Valid)`
`34`	`34`	`{`
`35`	`35`	`return Exceptions.RaiseTypeError(self.type.DeletedMessage);`
`@@ -63,14 +63,14 @@ public static NewReference tp_new(BorrowedReference tp, BorrowedReference args,`
`63`	`63`	`return NewInstance(arrType.GetElementType(), tp, dimensions);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`		`- object result;`
	`66`	`+ object? result;`
`67`	`67`
`68`	`68`	`// this implements casting to Array[T]`
`69`	`69`	`if (!Converter.ToManaged(op, arrType, out result, true))`
`70`	`70`	`{`
`71`	`71`	`return default;`
`72`	`72`	`}`
`73`		`- return CLRObject.GetReference(result, tp);`
	`73`	`+ return CLRObject.GetReference(result!, tp);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`static NewReference CreateMultidimensional(Type elementType, long[] dimensions, BorrowedReference shapeTuple, BorrowedReference pyType)`
`@@ -133,13 +133,13 @@ static NewReference NewInstance(Type elementType, BorrowedReference arrayPyType,`
`133`	`133`	`/// </summary>`
`134`	`134`	`public new static NewReference mp_subscript(BorrowedReference ob, BorrowedReference idx)`
`135`	`135`	`{`
`136`		`- var obj = (CLRObject)GetManagedObject(ob);`
`137`		`- var arrObj = (ArrayObject)GetManagedObjectType(ob);`
	`136`	`+ var obj = (CLRObject)GetManagedObject(ob)!;`
	`137`	`+ var arrObj = (ArrayObject)GetManagedObjectType(ob)!;`
`138`	`138`	`if (!arrObj.type.Valid)`
`139`	`139`	`{`
`140`	`140`	`return Exceptions.RaiseTypeError(arrObj.type.DeletedMessage);`
`141`	`141`	`}`
`142`		`- var items = obj.inst as Array;`
	`142`	`+ var items = (Array)obj.inst;`
`143`	`143`	`Type itemType = arrObj.type.Value.GetElementType();`
`144`	`144`	`int rank = items.Rank;`
`145`	`145`	`nint index;`
`@@ -346,10 +346,10 @@ private static NewReference RaiseIndexMustBeIntegerError(BorrowedReference idx)`
`346`	`346`	`/// </summary>`
`347`	`347`	`public static int sq_contains(BorrowedReference ob, BorrowedReference v)`
`348`	`348`	`{`
`349`		`- var obj = (CLRObject)GetManagedObject(ob);`
	`349`	`+ var obj = (CLRObject)GetManagedObject(ob)!;`
`350`	`350`	`Type itemType = obj.inst.GetType().GetElementType();`
`351`		`- var items = obj.inst as IList;`
`352`		`- object value;`
	`351`	`+ var items = (IList)obj.inst;`
	`352`	`+ object? value;`
`353`	`353`
`354`	`354`	`if (!Converter.ToManaged(v, itemType, out value, false))`
`355`	`355`	`{`
`@@ -383,7 +383,7 @@ static int GetBuffer(BorrowedReference obj, out Py_buffer buffer, PyBUF flags)`
`383`	`383`	`Type itemType = self.GetType().GetElementType();`
`384`	`384`
`385`	`385`	`bool formatRequested = (flags & PyBUF.FORMATS) != 0;`
`386`		`- string format = GetFormat(itemType);`
	`386`	`+ string? format = GetFormat(itemType);`
`387`	`387`	`if (formatRequested && format is null)`
`388`	`388`	`{`
`389`	`389`	`Exceptions.SetError(Exceptions.BufferError, "unsupported element type: " + itemType.Name);`
`@@ -495,7 +495,7 @@ static unsafe IntPtr ToUnmanaged<T>(T[] array) where T : unmanaged`
`495`	`495`	`[typeof(double)] = "d",`
`496`	`496`	`};`
`497`	`497`
`498`		`- static string GetFormat(Type elementType)`
	`498`	`+ static string? GetFormat(Type elementType)`
`499`	`499`	`=> ItemFormats.TryGetValue(elementType, out string result) ? result : null;`
`500`	`500`
`501`	`501`	`static readonly GetBufferProc getBufferProc = GetBuffer;`