diff --git a/lime/utils/ArrayBufferView.hx b/lime/utils/ArrayBufferView.hx index 8979b9d8d..d3fc7206a 100644 --- a/lime/utils/ArrayBufferView.hx +++ b/lime/utils/ArrayBufferView.hx @@ -241,7 +241,9 @@ class ArrayBufferView { #if !no_typedarray_inline inline #end function toString() { - + + if (this == null) return null; + var name = switch(type) { case Int8: 'Int8Array'; diff --git a/lime/utils/Float32Array.hx b/lime/utils/Float32Array.hx index 258a9e539..54963271a 100644 --- a/lime/utils/Float32Array.hx +++ b/lime/utils/Float32Array.hx @@ -53,7 +53,7 @@ package lime.utils; #end } - function toString() return 'Float32Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Float32Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } @@ -107,7 +107,7 @@ abstract Float32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView { //Internal - function toString() return 'Float32Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Float32Array [byteLength:${this.byteLength}, length:${this.length}]' : null; inline function get_length() return this.length; diff --git a/lime/utils/Float64Array.hx b/lime/utils/Float64Array.hx index 7046cfa77..d84329620 100644 --- a/lime/utils/Float64Array.hx +++ b/lime/utils/Float64Array.hx @@ -53,7 +53,7 @@ package lime.utils; #end } - function toString() return 'Float64Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Float64Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } @@ -121,7 +121,7 @@ abstract Float64Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView { return ArrayBufferIO.setFloat64(this.buffer, this.byteOffset+(idx*BYTES_PER_ELEMENT), val); } - function toString() return 'Float64Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Float64Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } diff --git a/lime/utils/Int16Array.hx b/lime/utils/Int16Array.hx index 432ed36a6..517441fd8 100644 --- a/lime/utils/Int16Array.hx +++ b/lime/utils/Int16Array.hx @@ -53,7 +53,7 @@ package lime.utils; #end } - function toString() return 'Int16Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Int16Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } @@ -121,7 +121,7 @@ abstract Int16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView { return ArrayBufferIO.setInt16(this.buffer, this.byteOffset+(idx*BYTES_PER_ELEMENT), val); } - function toString() return 'Int16Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Int16Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } diff --git a/lime/utils/Int32Array.hx b/lime/utils/Int32Array.hx index 7baaeba09..c89b07b50 100644 --- a/lime/utils/Int32Array.hx +++ b/lime/utils/Int32Array.hx @@ -53,7 +53,7 @@ package lime.utils; #end } - function toString() return 'Int32Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Int32Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } @@ -121,7 +121,7 @@ abstract Int32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView { return ArrayBufferIO.setInt32(this.buffer, this.byteOffset+(idx*BYTES_PER_ELEMENT), val); } - function toString() return 'Int32Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Int32Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } diff --git a/lime/utils/Int8Array.hx b/lime/utils/Int8Array.hx index a56682848..2785966fb 100644 --- a/lime/utils/Int8Array.hx +++ b/lime/utils/Int8Array.hx @@ -51,7 +51,7 @@ package lime.utils; #end } - function toString() return 'Int8Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Int8Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } @@ -121,7 +121,7 @@ abstract Int8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView { return ArrayBufferIO.setInt8(this.buffer, this.byteOffset+idx, val); } - function toString() return 'Int8Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'Int8Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } diff --git a/lime/utils/UInt16Array.hx b/lime/utils/UInt16Array.hx index 3c3a5b249..69af7a87d 100644 --- a/lime/utils/UInt16Array.hx +++ b/lime/utils/UInt16Array.hx @@ -53,7 +53,7 @@ package lime.utils; #end } - function toString() return 'UInt16Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'UInt16Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } @@ -121,7 +121,7 @@ abstract UInt16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView { return ArrayBufferIO.setUint16(this.buffer, this.byteOffset+(idx*BYTES_PER_ELEMENT), val); } - function toString() return 'UInt16Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'UInt16Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } diff --git a/lime/utils/UInt32Array.hx b/lime/utils/UInt32Array.hx index 1dcb82f71..b8e0070bf 100644 --- a/lime/utils/UInt32Array.hx +++ b/lime/utils/UInt32Array.hx @@ -53,7 +53,7 @@ package lime.utils; #end } - function toString() return 'UInt32Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'UInt32Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } @@ -121,7 +121,7 @@ abstract UInt32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView { return ArrayBufferIO.setUint32(this.buffer, this.byteOffset+(idx*BYTES_PER_ELEMENT), val); } - function toString() return 'UInt32Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'UInt32Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } diff --git a/lime/utils/UInt8Array.hx b/lime/utils/UInt8Array.hx index f586bd7e5..4b1e18f65 100644 --- a/lime/utils/UInt8Array.hx +++ b/lime/utils/UInt8Array.hx @@ -53,7 +53,7 @@ package lime.utils; #end } - function toString() return 'UInt8Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'UInt8Array [byteLength:${this.byteLength}, length:${this.length}]' : null; } @@ -106,7 +106,7 @@ abstract UInt8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView { //Internal - function toString() return 'UInt8Array [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'UInt8Array [byteLength:${this.byteLength}, length:${this.length}]' : null; inline function get_length() return this.length; diff --git a/lime/utils/UInt8ClampedArray.hx b/lime/utils/UInt8ClampedArray.hx index 8d2cd8e4f..b78264790 100644 --- a/lime/utils/UInt8ClampedArray.hx +++ b/lime/utils/UInt8ClampedArray.hx @@ -53,7 +53,7 @@ package lime.utils; #end } - function toString() return 'UInt8ClampedArray [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'UInt8ClampedArray [byteLength:${this.byteLength}, length:${this.length}]' : null; //internal //clamp a Int to a 0-255 Uint8 @@ -129,7 +129,7 @@ abstract UInt8ClampedArray(ArrayBufferView) from ArrayBufferView to ArrayBufferV return ArrayBufferIO.setUint8Clamped(this.buffer, this.byteOffset+idx, val); } - function toString() return 'UInt8ClampedArray [byteLength:${this.byteLength}, length:${this.length}]'; + function toString() return this != null ? 'UInt8ClampedArray [byteLength:${this.byteLength}, length:${this.length}]' : null; }