Skip to content

[embind] Use ES6 class for ClassHandle. NFC #22706

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

Open
sbc100 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[embind] Use ES6 class for ClassHandle. NFC #22706

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
156 changes: 74 additions & 82 deletions src/embind/embind.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,8 @@ var LibraryEmbind = {
}));
},

$init_ClassHandle__deps: [
// root of all pointer and smart pointer handles in embind
$ClassHandle__deps: [
'$ClassHandle',
'$shallowCopyInternalPointer',
'$throwInstanceAlreadyDeleted',
Expand All @@ -1583,100 +1584,91 @@ var LibraryEmbind = {
'$throwBindingError',
'$detachFinalizer',
],
$init_ClassHandle: () => {
Object.assign(ClassHandle.prototype, {
"isAliasOf"(other) {
if (!(this instanceof ClassHandle)) {
return false;
}
if (!(other instanceof ClassHandle)) {
return false;
}

var leftClass = this.$$.ptrType.registeredClass;
var left = this.$$.ptr;
other.$$ = /** @type {Object} */ (other.$$);
var rightClass = other.$$.ptrType.registeredClass;
var right = other.$$.ptr;
$ClassHandle: class {
"isAliasOf"(other) {
if (!(this instanceof ClassHandle)) {
return false;
}
if (!(other instanceof ClassHandle)) {
return false;
}

while (leftClass.baseClass) {
left = leftClass.upcast(left);
leftClass = leftClass.baseClass;
}
var leftClass = this.$$.ptrType.registeredClass;
var left = this.$$.ptr;
other.$$ = /** @type {Object} */ (other.$$);
var rightClass = other.$$.ptrType.registeredClass;
var right = other.$$.ptr;

while (rightClass.baseClass) {
right = rightClass.upcast(right);
rightClass = rightClass.baseClass;
}
while (leftClass.baseClass) {
left = leftClass.upcast(left);
leftClass = leftClass.baseClass;
}

return leftClass === rightClass && left === right;
},
while (rightClass.baseClass) {
right = rightClass.upcast(right);
rightClass = rightClass.baseClass;
}

"clone"() {
if (!this.$$.ptr) {
throwInstanceAlreadyDeleted(this);
}
return leftClass === rightClass && left === right;
}

if (this.$$.preservePointerOnDelete) {
this.$$.count.value += 1;
return this;
} else {
var clone = attachFinalizer(Object.create(Object.getPrototypeOf(this), {
$$: {
value: shallowCopyInternalPointer(this.$$),
}
}));
"clone"() {
if (!this.$$.ptr) {
throwInstanceAlreadyDeleted(this);
}

clone.$$.count.value += 1;
clone.$$.deleteScheduled = false;
return clone;
}
},
if (this.$$.preservePointerOnDelete) {
this.$$.count.value += 1;
return this;
} else {
var clone = attachFinalizer(Object.create(Object.getPrototypeOf(this), {
$$: {
value: shallowCopyInternalPointer(this.$$),
}
}));

"delete"() {
if (!this.$$.ptr) {
throwInstanceAlreadyDeleted(this);
}
clone.$$.count.value += 1;
clone.$$.deleteScheduled = false;
return clone;
}
}

if (this.$$.deleteScheduled && !this.$$.preservePointerOnDelete) {
throwBindingError('Object already scheduled for deletion');
}
"delete"() {
if (!this.$$.ptr) {
throwInstanceAlreadyDeleted(this);
}

detachFinalizer(this);
releaseClassHandle(this.$$);
if (this.$$.deleteScheduled && !this.$$.preservePointerOnDelete) {
throwBindingError('Object already scheduled for deletion');
}

if (!this.$$.preservePointerOnDelete) {
this.$$.smartPtr = undefined;
this.$$.ptr = undefined;
}
},
detachFinalizer(this);
releaseClassHandle(this.$$);

"isDeleted"() {
return !this.$$.ptr;
},
if (!this.$$.preservePointerOnDelete) {
this.$$.smartPtr = undefined;
this.$$.ptr = undefined;
}
}

"deleteLater"() {
if (!this.$$.ptr) {
throwInstanceAlreadyDeleted(this);
}
if (this.$$.deleteScheduled && !this.$$.preservePointerOnDelete) {
throwBindingError('Object already scheduled for deletion');
}
deletionQueue.push(this);
if (deletionQueue.length === 1 && delayFunction) {
delayFunction(flushPendingDeletes);
}
this.$$.deleteScheduled = true;
return this;
},
});
},
"isDeleted"() {
return !this.$$.ptr;
}

$ClassHandle__docs: '/** @constructor */',
$ClassHandle__deps: ['$init_ClassHandle'],
$ClassHandle__postset: 'init_ClassHandle()',
// root of all pointer and smart pointer handles in embind
$ClassHandle: function() {
"deleteLater"() {
if (!this.$$.ptr) {
throwInstanceAlreadyDeleted(this);
}
if (this.$$.deleteScheduled && !this.$$.preservePointerOnDelete) {
throwBindingError('Object already scheduled for deletion');
}
deletionQueue.push(this);
if (deletionQueue.length === 1 && delayFunction) {
delayFunction(flushPendingDeletes);
}
this.$$.deleteScheduled = true;
return this;
}
},

$throwInstanceAlreadyDeleted__deps: ['$throwBindingError'],
Expand Down
Loading