Merge pull request #35 from serjepatoff/fix-nim-2.0.4

Fix for Nim 2.0.0 - 2.0.4

README.md

@@ -27,7 +27,7 @@ requires "cppstl"
 
 ## Limitations
 
-``cppstl`` currently wraps :
+#### ``cppstl`` currently wraps :
 
 * ``std::string``
 * ``std::basic_string``
@@ -39,6 +39,26 @@ requires "cppstl"
   * ``std::unique_ptr``
   * ``std::shared_ptr``
 
+#### Avoid using wrapped STL objects in top-level Nim scope.
+  Most of the times it works on Nim 1.x but leads to both compile-time and runtime errors on 2.x.
+  So instantiate them in subroutines only to ensure portability between 1.x and 2.x.
+
+I.e this usecase is not recommended: 
+```
+when isMainModule:
+  var vec = initCppVector[int]()
+  vec.pushBack(20)
+```
+Use this one instead:
+```
+when isMainModule:
+  proc foo = 
+    var vec = initCppVector[int]()
+    vec.pushBack(20)
+  foo()
+```
+
+
 ## Contributions
 
 All contributions are welcome!

cppstl/std_string.nim

@@ -24,7 +24,7 @@ proc initCppString*(s: cstring, n: csize_t): CppString {.constructor, importcpp:
 proc initCppString*(first, last: CppStrConstIterator): CppString {.constructor, importcpp: "std::string(@)".}
 
 # Modifiers
-proc `+=`*(self: var CppString, str: cstring) {.importcpp: "# += #".}
+proc `+=`*(self: var CppString, str: cstring) {.importcpp: "(# += #)".}
 
 proc append*(self: var CppString, str: cstring) {.importcpp: "append".}
 proc append*(self: var CppString, str: cstring, n: csize_t) {.importcpp: "append".}
@@ -70,6 +70,14 @@ proc compare*(self: CppString, pos, l: csize_t, str: cstring, subpos, subl: csiz
 # Converter: CppStrIterator -> StrConstIterator
 converter CppStrIteratorToStrConstIterator*(s: CppStrIterator): CppStrConstIterator {.importcpp: "#".}
 
+# Relational operators
+proc `==`*(a: CppString, b: CppString): bool {.importcpp: "(# == #)".}
+proc `!=`*(a: CppString, b: CppString): bool {.importcpp: "(# != #)".}
+proc `<`*(a: CppString, b: CppString): bool  {.importcpp: "(# < #)".}
+proc `<=`*(a: CppString, b: CppString): bool {.importcpp: "(# <= #)".}
+proc `>`*(a: CppString, b: CppString): bool  {.importcpp: "(# > #)".}
+proc `>=`*(a: CppString, b: CppString): bool {.importcpp: "(# >= #)".}
+
 {.pop.}
 
 {.push inline.}

tests/tcomplex.nim

@@ -4,6 +4,7 @@ import complex
 import std/math
 import cppstl/std_complex
 
+
 proc main() =
   suite "CppComplex":
     test "constructors":
@@ -28,6 +29,7 @@ proc main() =
           refres = refa + refb
           res = a + b
         check almostEqual(refres, toComplex(res))
+
       block:
         var
           a = initCppComplex[float64](141.571, 124.412)
@@ -94,3 +96,4 @@ proc main() =
 
 when isMainModule:
   main()
+

tests/tpair.nim

@@ -116,5 +116,7 @@ proc main() =
       check tup == (first: f, second: s)
       check makePair(tup) == pair
 
+
 when isMainModule:
   main()
+

tests/tstring.nim

@@ -2,6 +2,7 @@
 import unittest
 import cppstl/std_string
 
+
 proc main() =
   suite "CppString":
     test "constructors and iterators":
@@ -416,5 +417,7 @@ proc main() =
         c = 'b'
       check s1.toString == "bbbbbbbbb"
 
+
 when isMainModule:
   main()
+

tests/tvector.nim

@@ -2,6 +2,7 @@
 import std/[unittest, strformat, sequtils]
 import cppstl/std_vector
 
+
 proc main() =
   suite "CppVector":
     test "constructor, size/len, empty":
@@ -445,4 +446,6 @@ proc main() =
       check v1 == @['w', 'x', 'y', 'z'].toCppVector()
       check v2 == @['a', 'b', 'c'].toCppVector()
 
-main()
+when isMainModule:
+  main()
+