Skip to content

Generate correct adapter code for rvalue return types #25

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
slburson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Generate correct adapter code for rvalue return types #25

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
29 changes: 15 additions & 14 deletions src/gen/common/generator/function.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,21 +168,22 @@
(string= (claw.spec:foreign-entity-name result-type) "void"))
(format stream "~A;" invocation))
(result-type-adapted-from
(let* ((unconsted-result-type-c-name (claw.spec:format-foreign-entity-c-name
unconsted-result-type)))
(if (typep result-type-adapted-from 'claw.spec:foreign-reference)
(format stream "return (~A) ~@[~A~](&~A);"
unconsted-result-type-c-name
(when (claw.spec:foreign-reference-rvalue-p result-type-adapted-from)
"std::move")
(if (typep result-type-adapted-from 'claw.spec:foreign-reference)
(if (claw.spec:foreign-reference-rvalue-p result-type-adapted-from)
(format stream "return (&(~A&)~A);"
(claw.spec:format-foreign-entity-c-name
(claw.spec:foreign-enveloped-entity unconsted-result-type))
invocation)
(format stream "return (~A) (&~A);"
(claw.spec:format-foreign-entity-c-name unconsted-result-type)
invocation))
(if (eq *adapt-mode* :c++)
(format stream "new (__claw_result_) ~A(~A);~%return __claw_result_;"
(claw.spec:format-full-foreign-entity-name
(claw.spec:foreign-enveloped-entity unconsted-result-type))
invocation)
(if (eq *adapt-mode* :c++)
(format stream "new (__claw_result_) ~A(~A);~%return __claw_result_;"
(claw.spec:format-full-foreign-entity-name
(claw.spec:foreign-enveloped-entity unconsted-result-type))
invocation)
(format stream "(*__claw_result_) = ~A;~%return __claw_result_;"
invocation)))))
(format stream "(*__claw_result_) = ~A;~%return __claw_result_;"
invocation))))
((typep unconsted-result-type 'claw.spec:foreign-pointer)
(format stream "return (~A) ~A;"
(claw.spec:format-foreign-entity-c-name result-type)
Expand Down