Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
flake = false;
};
cl-cc-vm = {
url = "github:nerima-lisp/cl-cc-vm/462213fcf5e0e6cecc09992e8cb0b7ed48dbce2f";
url = "github:nerima-lisp/cl-cc-vm/99f814e44e5bc83f578e433090b5014bb441db06";
flake = false;
};
# v1.0.0 -> v1.1.0: internal reorg (org package-standard adoption, file
Expand Down
6 changes: 3 additions & 3 deletions src/backend/vm-integration.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
(setf *js-apply-fn*
(labels ((invoke (fn args)
(cond
((cl-cc/vm::%vm-closure-object-p fn)
(cl-cc/vm::%vm-call-closure-sync fn cl-cc/vm:*vm-state* args))
((cl-cc/vm:%vm-closure-object-p fn)
(cl-cc/vm:%vm-call-closure-sync fn cl-cc/vm:*vm-state* args))
;; A callable JS object (e.g. `super', Intl/Symbol stubs)
;; carries its implementation under __call__.
((and (hash-table-p fn) (gethash "__call__" fn))
Expand All @@ -28,7 +28,7 @@
#'invoke))
;; Recognize a compiled-JS method (a vm-closure) as callable.
(setf *js-callable-p*
(lambda (x) (or (functionp x) (cl-cc/vm::%vm-closure-object-p x))))
(lambda (x) (or (functionp x) (cl-cc/vm:%vm-closure-object-p x))))
;; Bind `this' for a method/constructor call in BOTH the host special and the
;; VM-global %js-this (a compiled-JS body reads `this' via vm-get-global).
;; Save/restore around the call so nested method calls restore the receiver.
Expand Down
Loading