Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-03 19:26:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

C++ FFI fixes.

Browse source
This commit is contained in:
Alex Shinn 2015-03-06 17:41:29 +09:00
parent 64c148c9ce
commit 214a1aaf78
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/chibi-ffi
View file

@ -1141,7 +1141,7 @@
(cat " tmp" (type-index a)
" = new " (type-c-name-derefed (type-base a)) "();\n")
(cat " tmp" (type-index a) " = "
(if (type-struct-type a)
(if #t ;(type-struct-type a)
(lambda () (cat "(" (type-c-name (type-base a))
(if (type-pointer? a) "*" "")
")"))
@ -1288,8 +1288,15 @@
(cat " if (len" i " != " len ")\n"
" free(tmp" i ");\n"))
(cat " len" i " *= 2;\n"
" tmp" i
" = calloc(len" i ", sizeof(tmp" i "[0]));\n"
" tmp" i " = "
(lambda () (cat "(" (type-c-name (type-base a))
(if (or (type-pointer? a)
(and (not *c++?*)
(string-type? a)))
"*"
"")
")"))
" calloc(len" i ", sizeof(tmp" i "[0]));\n"
" goto loop;\n")))))
(else
;; TODO: free other results
@ -1742,7 +1749,10 @@
" (sexp ctx, sexp self, sexp_sint_t n, sexp x) {\n"
" if (sexp_cpointer_freep(x)) {\n"
" " (if method? "" cname) "("
(if method? (string-append "((" (mangle name) "*)") "")
(if method? "(" "")
"\n#ifdef __cplusplus\n"
"(" (mangle name) "*)"
"\n#endif\n"
"sexp_cpointer_value(x)"
(if method? (string-append ")->" (x->string cname) "()") "")
");\n"