Merge pull request #19 from Clonkk/destroy_bug_15

Destroy bug 15

Author: Clonkk

cppstl/std_complex.nim

@@ -31,11 +31,11 @@ func conj*[T: SomeFloat](self: CppComplex[T]): CppComplex[T] {.importcpp: "std::
 {.pop.}
 
 import complex
-proc toComplex*[T](c: CppComplex[T]) : Complex[T] =
+proc toComplex*[T](c: CppComplex[T]): Complex[T] =
   result.re = c.real()
   result.im = c.imag()
 
-proc toCppComplex*[T](c: Complex[T]) : CppComplex[T] =
+proc toCppComplex*[T](c: Complex[T]): CppComplex[T] =
   result = initCppComplex(c.re, c.im)
 
 proc `$`*[T](c: CppComplex[T]): string =

cppstl/std_string.nim

@@ -287,7 +287,7 @@ proc last*(v: CppString): cchar {.inline.} =
   v.back()
 
 # Nim Iterators
-iterator items*(v: CppString): cchar=
+iterator items*(v: CppString): cchar =
   ## Iterate over all the elements in CppString `v`.
   for idx in 0.csize_t ..< v.len():
     yield v[idx]
@@ -297,7 +297,7 @@ iterator pairs*(v: CppString): (csize_t, cchar) =
   for idx in 0.csize_t ..< v.len():
     yield (idx, v[idx])
 
-iterator mitems*(v: var CppString): var cchar=
+iterator mitems*(v: var CppString): var cchar =
   ## Iterate over all the elements in CppString `v`.
   for idx in 0.csize_t ..< v.len():
     yield v[idx]

cppstl/std_vector.nim

@@ -483,7 +483,7 @@ proc last*[T](v: CppVector[T]): T {.inline.} =
 
 # Nim Iterators
 
-iterator items*[T](v: CppVector[T]): T=
+iterator items*[T](v: CppVector[T]): T =
   ## Iterate over all the elements in CppVector `v`.
   runnableExamples:
     var

tests/destroy_bug_15.nim

@@ -0,0 +1,28 @@
+import cppstl/std_vector
+
+type Foo = object
+  x: int
+
+proc `=destroy`*(a: var Foo) {.inline.} =
+  echo ("in destroy", a.x)
+
+proc main =
+  var v = initCppVector[Foo]()
+
+  v.add Foo(x: 10)
+  v.add Foo(x: 11)
+  v.add Foo(x: 12)
+
+  echo "ok0"
+  echo v
+
+  echo "ok1"
+  echo v
+
+  echo "ok2"
+
+  # Clear should call object destructor
+  v.clear()
+  echo "ok3"
+
+main()