Skip to content

Fix define-pyfun macro in compiled mode #13

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

Closed
sjamaan wants to merge 2 commits into from
Closed

Fix define-pyfun macro in compiled mode #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2217ed7
Fix define-pyfun macro in compiled mode
sjamaan Jul 4, 2025
4a97c48
Fix some potential issues in define-pymethod
sjamaan Jul 4, 2025
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: 11 additions & 8 deletions pyffi.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,8 @@ EOF
(%begin (r 'begin))
(%set! (r 'set!))
(not (r 'not))
(alist-ref (r 'alist-ref))
(alist-update! (r 'alist-update!))
(hash-table-ref/default (r 'hash-table-ref/default))
(hash-table-set! (r 'hash-table-set!))
(py-eval (r 'py-eval))
(py-apply (r 'py-apply))
(raise-python-exception (r 'raise-python-exception))
Expand Down Expand Up @@ -646,6 +646,7 @@ EOF
(let ((scheme-name (member 'scheme-name: rest))
(kw (member 'kw: rest)))
(let ((%define (r 'define))
(%receive (r 'receive))
(%quote (r 'quote))
(%cons (r 'cons))
(%list (r 'list))
Expand All @@ -658,6 +659,8 @@ EOF
(%if (r 'if))
(%list->vector (r 'list->vector))
(%->string (r '->string))
(args (r 'args))
(kwargs (r 'kwargs))
(parse-argument-list (r 'parse-argument-list))
(PyObject_GetAttrString (r 'PyObject_GetAttrString))
(PyObject_CallObject (r 'PyObject_CallObject))
Expand All @@ -671,15 +674,15 @@ EOF
(,PyObject_CallObject
(,PyObject_GetAttrString ,obj ,(->string name) )
(,%list->vector ,rest)))
(let ((kwargs (map (compose string->keyword symbol->string) (cadr kw))))
(let ((the-kwargs (map (compose string->keyword symbol->string) (cadr kw))))
`(,%define (,proc-name ,obj #!rest ,rest)
(receive
(args kwargs)
(,parse-argument-list ,rest ',kwargs)
(,%receive
(,args ,kwargs)
(,parse-argument-list ,rest ',the-kwargs)
(,PyObject_Call
(,PyObject_GetAttrString ,obj ,(->string name) )
(list->vector args)
(,%if (,%null? kwargs) #f kwargs))
(list->vector ,args)
(,%if (,%null? ,kwargs) #f ,kwargs))
))
))
))
Expand Down
Loading