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

Fixes before SW22. #2

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
feeley merged 5 commits into from
Sep 15, 2022
Merged

Fixes before SW22. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f1dd56
Missing DECREF after temp capsule creation.
belmarca Sep 15, 2022
4b097ea
Fix handling of generic calls (bad paren).
belmarca Sep 15, 2022
f3ddd2f
Use less recent API additions.
belmarca Sep 15, 2022
d485e72
Use Gambit C FFI for proper refcount handling.
belmarca Sep 15, 2022
9e202de
Add tuple to list conversion test.
belmarca Sep 15, 2022
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
19 changes: 12 additions & 7 deletions 19 python.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,6 +1600,8 @@ GIL_ACQUIRE();
PyObject *capsule = PyObject_GetAttrString(src, \"obj_capsule\");
void *rc = PyCapsule_GetPointer(capsule, NULL);

PYOBJECTPTR_DECREF(capsule, \"SchemeObject->object\");

dst = ___EXT(___data_rc)(rc);

GIL_RELEASE();
Expand Down Expand Up @@ -2006,10 +2008,10 @@ ___return(dst);
(cons (keyword->string arg) kw-keys)
(cons (car rest) kw-vals))
(error "Keyword argument has no value" args))
(loop (cdr args) (cons (car args) *args) kw-keys kw-vals))
(if (null? kw-keys)
(sfpc-call callable (list->vector (reverse *args)))
(sfpc-call-with-kw callable (list->vector (reverse *args)) kw-keys kw-vals))))))
(loop rest (cons arg *args) kw-keys kw-vals)))
(if (null? kw-keys)
(sfpc-call callable (list->vector (reverse *args)))
(sfpc-call-with-kw callable (list->vector (reverse *args)) kw-keys kw-vals)))))

(cond ((eq? arg1 (macro-absent-obj))
(sfpc-call callable '#()))
Expand Down Expand Up @@ -2185,11 +2187,11 @@ ___return(dst);
;; TODO: Handle **kwargs in Python call
(define (PyObject_CallFunctionObjArgs* callable args)
(if (not (pair? args))
(PyObject_CallNoArgs callable)
(PyObject_CallFunctionObjArgs0 callable)
(let ((arg1 (car args))
(rest (cdr args)))
(if (not (pair? rest))
(PyObject_CallOneArg callable arg1)
(PyObject_CallFunctionObjArgs1 callable arg1)
(let ((arg2 (car rest))
(rest (cdr rest)))
(if (not (pair? rest))
Expand Down Expand Up @@ -3054,7 +3056,10 @@ end-of-c-declare
(define python-exec
(sfpc-send-recv (get-scheme-fpc-state!) (vector op-get-exec)))

(define python-SchemeProcedure (python-eval "_SchemeProcedure"))
(define python-SchemeProcedure
(let ((_SchemeProcedure (python-eval "foreign(_SchemeProcedure)")))
(lambda (obj)
(PyObject_CallFunctionObjArgs1 _SchemeProcedure (object->SchemeObject obj)))))

((python-eval "__import__('sys').path.append")
(path-expand "site-packages" python-venv-lib-dir))
Expand Down
9 changes: 9 additions & 0 deletions 9 test/leaks.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,15 @@
(test 'vector->PyObject*/list f)
(test 'PyObject*/list->vector (lambda () (PyObject*/list->vector obj))))

(let* ((elem0 (exact-integer->PyObject*/int 0))
(elem1 (exact-integer->PyObject*/int 1))
(elem2 (exact-integer->PyObject*/int 2))
(x (list elem0 elem1 elem2))
(f (lambda () (list->PyObject*/tuple x)))
(obj (f)))
(test 'list->PyObject*/tuple f)
(test 'PyObject*/tuple->list (lambda () (PyObject*/tuple->list obj))))

(let* ((elem0 (exact-integer->PyObject*/int 0))
(elem1 (exact-integer->PyObject*/int 1))
(elem2 (exact-integer->PyObject*/int 2))
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.