Skip to content

src: return Maybe<> on pending exception when cpp exception disabled #927

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
legendecas merged 12 commits into from
Aug 3, 2021
Merged

src: return Maybe<> on pending exception when cpp exception disabled #927

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
451f27f
src: return Maybe<> on pending exception when cpp exception disabled
legendecas Mar 9, 2021
0f95980
fixup! remove the newly added napi_pending_exception checks
legendecas Jun 3, 2021
676798c
fixup! FunctionReference::New return type
legendecas Jun 9, 2021
6d16dda
fixup!
legendecas Jun 10, 2021
c1385ba
fixup! doc: test docs
legendecas Jun 10, 2021
b946305
fixup! linter complaints
legendecas Jun 10, 2021
fec9561
fixup! review suggestions
legendecas Jun 16, 2021
6012787
Merge branch 'main' into maybe
legendecas Jun 17, 2021
baf6ab8
fixup! remove unnecessary MaybeUnwrapOr
legendecas Jun 18, 2021
43e14e5
fixup! apply review suggestions
legendecas Jul 14, 2021
b16a549
Merge remote-tracking branch 'upstream/main' into maybe
legendecas Jul 14, 2021
68facc7
fixup! update Symbol::For
legendecas Jul 14, 2021
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
fixup! remove the newly added napi_pending_exception checks
  • Loading branch information
@legendecas
legendecas committed Jun 3, 2021
commit 0f95980dc1316f6769ed555e0e2abdfd3b711b3c
6 changes: 0 additions & 6 deletions napi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,12 @@ static_assert(sizeof(char16_t) == sizeof(wchar_t), "Size mismatch between char16
} while (0)

#define NAPI_THROW_IF_FAILED(env, status, ...) \
if ((status) == napi_pending_exception) { \
return __VA_ARGS__; \
} \
if ((status) != napi_ok) { \
Napi::Error::New(env).ThrowAsJavaScriptException(); \
return __VA_ARGS__; \
}

#define NAPI_THROW_IF_FAILED_VOID(env, status) \
if ((status) == napi_pending_exception) { \
return; \
} \
if ((status) != napi_ok) { \
Napi::Error::New(env).ThrowAsJavaScriptException(); \
return; \
Expand Down