Add Racket support for std::unique_ptr and std::auto_ptr
Equivalent to Guile implementation. Slight tweak to proxy ownership was required by adding in the own member to swig_mz_proxy.
This commit is contained in:
parent
5365149ae4
commit
48c644ea6e
9 changed files with 201 additions and 9 deletions
|
|
@ -1,6 +1,6 @@
|
|||
%module cpp11_std_unique_ptr
|
||||
|
||||
#if !(defined(SWIGGO) || defined(SWIGOCAML) || defined(SWIGMZSCHEME) || defined(SWIGR) || defined(SWIGSCILAB))
|
||||
#if !(defined(SWIGGO) || defined(SWIGOCAML) || defined(SWIGR) || defined(SWIGSCILAB))
|
||||
|
||||
%include "std_string.i"
|
||||
%include "std_unique_ptr.i"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#endif
|
||||
%}
|
||||
|
||||
#if !(defined(SWIGGO) || defined(SWIGOCAML) || defined(SWIGMZSCHEME) || defined(SWIGR) || defined(SWIGSCILAB))
|
||||
#if !(defined(SWIGGO) || defined(SWIGOCAML) || defined(SWIGR) || defined(SWIGSCILAB))
|
||||
|
||||
%include "std_string.i"
|
||||
//#include <iostream>
|
||||
|
|
|
|||
91
Examples/test-suite/mzscheme/li_std_auto_ptr_runme.scm
Normal file
91
Examples/test-suite/mzscheme/li_std_auto_ptr_runme.scm
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
(load-extension "li_std_auto_ptr.so")
|
||||
(require (lib "defmacro.ss"))
|
||||
|
||||
; Copied from ../schemerunme/li_std_auto_ptr.scm and modified for exceptions
|
||||
|
||||
; Define an equivalent to Guile's gc procedure
|
||||
(define-macro (gc)
|
||||
`(collect-garbage 'major))
|
||||
|
||||
(define checkCount
|
||||
(lambda (expected-count)
|
||||
(define actual-count (Klass-getTotal-count))
|
||||
(unless (= actual-count expected-count) (error (format "Counts incorrect, expected:~a actual:~a" expected-count actual-count)))))
|
||||
|
||||
; Test raw pointer handling involving virtual inheritance
|
||||
(define kini (new-KlassInheritance "KlassInheritanceInput"))
|
||||
(checkCount 1)
|
||||
(define s (useKlassRawPtr kini))
|
||||
(unless (string=? s "KlassInheritanceInput")
|
||||
(error "Incorrect string: " s))
|
||||
(set! kini '()) (gc)
|
||||
(checkCount 0)
|
||||
|
||||
; auto_ptr as input
|
||||
(define kin (new-Klass "KlassInput"))
|
||||
(checkCount 1)
|
||||
(define s (takeKlassAutoPtr kin))
|
||||
(checkCount 0)
|
||||
(unless (string=? s "KlassInput")
|
||||
(error "Incorrect string: " s))
|
||||
(unless (is-nullptr kin)
|
||||
(error "is_nullptr failed"))
|
||||
(set! kini '()) (gc) ; Should not fail, even though already deleted
|
||||
(checkCount 0)
|
||||
|
||||
(define kin (new-Klass "KlassInput"))
|
||||
(checkCount 1)
|
||||
(define s (takeKlassAutoPtr kin))
|
||||
(checkCount 0)
|
||||
(unless (string=? s "KlassInput")
|
||||
(error "Incorrect string: " s))
|
||||
(unless (is-nullptr kin)
|
||||
(error "is_nullptr failed"))
|
||||
|
||||
(define exception_thrown "no exception thrown for kin")
|
||||
(with-handlers ([exn:fail? (lambda (exn)
|
||||
(set! exception_thrown (exn-message exn)))])
|
||||
(takeKlassAutoPtr kin))
|
||||
(unless (string=? exception_thrown "takeKlassAutoPtr: cannot release ownership as memory is not owned for argument 1 of type 'Klass *'")
|
||||
(error "Wrong or no exception thrown: " exception_thrown))
|
||||
(set! kin '()) (gc) ; Should not fail, even though already deleted
|
||||
(checkCount 0)
|
||||
|
||||
(define kin (new-Klass "KlassInput"))
|
||||
(define notowned (get-not-owned-ptr kin))
|
||||
(set! exception_thrown "no exception thrown for notowned")
|
||||
(with-handlers ([exn:fail? (lambda (exn)
|
||||
(set! exception_thrown (exn-message exn)))])
|
||||
(takeKlassAutoPtr notowned))
|
||||
(unless (string=? exception_thrown "takeKlassAutoPtr: cannot release ownership as memory is not owned for argument 1 of type 'Klass *'")
|
||||
(error "Wrong or no exception thrown: " exception_thrown))
|
||||
(checkCount 1)
|
||||
(set! kin '()) (gc)
|
||||
(checkCount 0)
|
||||
|
||||
(define kini (new-KlassInheritance "KlassInheritanceInput"))
|
||||
(checkCount 1)
|
||||
(define s (takeKlassAutoPtr kini))
|
||||
(checkCount 0)
|
||||
(unless (string=? s "KlassInheritanceInput")
|
||||
(error "Incorrect string: " s))
|
||||
(unless (is-nullptr kini)
|
||||
(error "is_nullptr failed"))
|
||||
(set! kini '()) (gc) ; Should not fail, even though already deleted
|
||||
(checkCount 0)
|
||||
|
||||
; auto_ptr as output
|
||||
(define k1 (makeKlassAutoPtr "first"))
|
||||
(define k2 (makeKlassAutoPtr "second"))
|
||||
(checkCount 2)
|
||||
|
||||
(set! k1 '()) (gc)
|
||||
(checkCount 1)
|
||||
|
||||
(unless (string=? (Klass-getLabel k2) "second")
|
||||
(error "wrong object label" ))
|
||||
|
||||
(set! k2 '()) (gc)
|
||||
(checkCount 0)
|
||||
|
||||
(exit 0)
|
||||
|
|
@ -2,4 +2,8 @@
|
|||
|
||||
(require (lib "defmacro.ss"))
|
||||
|
||||
; Define an equivalent to Guile's gc procedure
|
||||
(define-macro (gc)
|
||||
`(collect-garbage 'major))
|
||||
|
||||
(load "../schemerunme/newobject1.scm")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue