Skip to content

[embind] Always enable assertions during TypeScript generation. #21695

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 6 commits into from
Sep 26, 2024
Merged

[embind] Always enable assertions during TypeScript generation. #21695

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0483145
[embind] Always enable assertions during TypeScript generation.
brendandahl Apr 4, 2024
cd763dc
Merge branch 'main' into tsgen-enable-assertions
brendandahl Sep 24, 2024
1c14d74
Review comment.
brendandahl Sep 24, 2024
9652bd7
Use ifdefs.
brendandahl Sep 26, 2024
762bde7
Remove always assert.
brendandahl Sep 26, 2024
08a4ed2
Use exceptions.
brendandahl Sep 26, 2024
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
25 changes: 12 additions & 13 deletions src/embind/embind_gen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,10 +476,9 @@ var LibraryEmbind = {
}
argStart = 2;
}
#if ASSERTIONS
if (argsName.length)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add curly braces around the if body ?

assert(argsName.length == (argTypes.length - hasThis - 1), 'Argument names should match number of parameters.');
#endif
if (argsName.length && argsName.length != (argTypes.length - hasThis - 1))
throw new Error('Argument names should match number of parameters.');

const args = [];
for (let i = argStart, x = 0; i < argTypes.length; i++) {
if (x < argsName.length) {
Expand Down Expand Up @@ -621,9 +620,9 @@ var LibraryEmbind = {
setterContext) {
fieldName = readLatin1String(fieldName);
const readonly = setter === 0;
#if ASSERTIONS
assert(readonly || getterReturnType === setterArgumentType, 'Mismatched getter and setter types are not supported.');
#endif
if (!(readonly || getterReturnType === setterArgumentType))
throw new error('Mismatched getter and setter types are not supported.');

whenDependentTypesAreResolved([], [classType], function(classType) {
classType = classType[0];
whenDependentTypesAreResolved([], [getterReturnType], function(types) {
Expand Down Expand Up @@ -724,9 +723,9 @@ var LibraryEmbind = {
setterContext
) {
const valueArray = tupleRegistrations[rawTupleType];
#if ASSERTIONS
assert(getterReturnType === setterArgumentType, 'Mismatched getter and setter types are not supported.');
#endif
if (getterReturnType !== setterArgumentType)
throw new Error('Mismatched getter and setter types are not supported.');

valueArray.elementTypeIds.push(getterReturnType);
},
_embind_finalize_value_array__deps: ['$whenDependentTypesAreResolved', '$moduleDefinitions', '$tupleRegistrations'],
Expand Down Expand Up @@ -767,9 +766,9 @@ var LibraryEmbind = {
setterContext
) {
const valueObject = structRegistrations[structType];
#if ASSERTIONS
assert(getterReturnType === setterArgumentType, 'Mismatched getter and setter types are not supported.');
#endif
if (getterReturnType !== setterArgumentType)
throw new Error('Mismatched getter and setter types are not supported.');

valueObject.fieldTypeIds.push(getterReturnType);
valueObject.fieldNames.push(readLatin1String(fieldName));
},
Expand Down
Loading