Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

src: remove TypedArray::unknown_array_type #1209

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

Closed
KevinEady wants to merge 1 commit into from
Closed

src: remove TypedArray::unknown_array_type #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 15 additions & 25 deletions 40 napi-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,19 +2003,13 @@ inline void DataView::WriteData(size_t byteOffset, T value) const {
////////////////////////////////////////////////////////////////////////////////

inline TypedArray::TypedArray()
: Object(), _type(TypedArray::unknown_array_type), _length(0) {}
: Object(), _type(napi_typedarray_type::napi_int8_array), _length(0) {}

inline TypedArray::TypedArray(napi_env env, napi_value value)
: Object(env, value), _type(TypedArray::unknown_array_type), _length(0) {}

inline TypedArray::TypedArray(napi_env env,
napi_value value,
napi_typedarray_type type,
size_t length)
: Object(env, value), _type(type), _length(length) {}

inline napi_typedarray_type TypedArray::TypedArrayType() const {
if (_type == TypedArray::unknown_array_type) {
: Object(env, value),
_type(napi_typedarray_type::napi_int8_array),
_length(0) {
if (value != nullptr) {
napi_status status =
napi_get_typedarray_info(_env,
_value,
Expand All @@ -2024,14 +2018,22 @@ inline napi_typedarray_type TypedArray::TypedArrayType() const {
nullptr,
nullptr,
nullptr);
NAPI_THROW_IF_FAILED(_env, status, napi_int8_array);
NAPI_THROW_IF_FAILED_VOID(_env, status);
}
}

inline TypedArray::TypedArray(napi_env env,
napi_value value,
napi_typedarray_type type,
size_t length)
: Object(env, value), _type(type), _length(length) {}

inline napi_typedarray_type TypedArray::TypedArrayType() const {
return _type;
}

inline uint8_t TypedArray::ElementSize() const {
switch (TypedArrayType()) {
switch (_type) {
case napi_int8_array:
case napi_uint8_array:
case napi_uint8_clamped_array:
Expand All @@ -2055,18 +2057,6 @@ inline uint8_t TypedArray::ElementSize() const {
}

inline size_t TypedArray::ElementLength() const {
if (_type == TypedArray::unknown_array_type) {
napi_status status =
napi_get_typedarray_info(_env,
_value,
&const_cast<TypedArray*>(this)->_type,
&const_cast<TypedArray*>(this)->_length,
nullptr,
nullptr,
nullptr);
NAPI_THROW_IF_FAILED(_env, status, 0);
}

return _length;
}

Expand Down
5 changes: 1 addition & 4 deletions 5 napi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,9 +1169,6 @@ class TypedArray : public Object {
napi_typedarray_type type,
size_t length);

static const napi_typedarray_type unknown_array_type =
static_cast<napi_typedarray_type>(-1);

template <typename T>
static
#if defined(NAPI_HAS_CONSTEXPR)
Expand All @@ -1191,7 +1188,7 @@ class TypedArray : public Object {
: std::is_same<T, int64_t>::value ? napi_bigint64_array
: std::is_same<T, uint64_t>::value ? napi_biguint64_array
#endif // NAPI_VERSION > 5
: unknown_array_type;
: napi_int8_array;
}
/// !endcond
};
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.