Clonkk · Clonkk · Sep 16, 2024 · Sep 16, 2024 · Sep 16, 2024 · Sep 16, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,5 +32,4 @@ jobs:
       - run: nimble install -y
       - run: testament p "tests/t*.nim"
       - run: nimble test
-      - run: nimble gendoc
 
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,9 +13,7 @@ jobs:
 
       - uses: jiro4989/setup-nim-action@v2
         with:
-          # TODO use 2.2.0 when it's released - gendoc is broken om 2.0.8
-          nim-version: devel 
-          use-nightlies: true
+          nim-version: stable 
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - run: nimble install -y
       - name: Set CI config github

diff --git a/.github/workflows/docstest.yml b/.github/workflows/docstest.yml
@@ -0,0 +1,22 @@
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - devel
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest 
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup nim
+        uses: jiro4989/setup-nim-action@v2
+        with:
+          nim-version: stable 
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: nimble install -y
+      - run: nimble gendoc
+
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,6 @@
-# Trick to ignore extension-less binaries
-# Ignore all
-*
-
-# Unignore all with extensions
-!*.*
-
-# Unignore all dirs
-!*/
-
 htmldocs
-
+docs/
+!docs/index.html
 bin
 testresults/
 nimcache/
diff --git a/config.nims b/config.nims
@@ -1,9 +1,7 @@
 when not compiles(nimVersion):
   const nimVersion = (major: NimMajor, minor: NimMinor, patch: NimPatch)
 
-when nimVersion >= (1, 3, 3):
-  # https://github.com/nim-lang/Nim/commit/9502e39b634eea8e04f07ddc110b466387f42322
-  switch("backend", "cpp")
+switch("backend", "cpp")
 
 when defined(macosx):
   switch("cc", "gcc")
diff --git a/cppstl.nim b/cppstl.nim
@@ -11,6 +11,11 @@ export std_complex
 import cppstl/std_pair
 export std_pair
 
+when not defined(cpp):
+  {.error: "C++ backend required to use STL wrapper".}
+# std=c++11 at least needed
+# {.passC: "-std=c++11".}
+
 ## Nim wrapper for C++ STL :
 ##   * ``std::vector`` mapped to ``CppVector``
 ##   * ``std::basic_string`` mapped to ``CppBasicString``
@@ -32,17 +37,6 @@ runnableExamples:
     stdstr.replace(startportion, endportion, "QW")
     assert stdstr == "QWERTYUIOP"
 
-runnableExamples:
-  import cppstl
-  import math
-  var vec = initCppVector[float64]()
-  for i in 0..<5:
-    vec.push_back(sqrt(i.float64))
-  assert vec[0] == sqrt 0.0
-  assert vec[1] == sqrt 1.0
-  assert vec[2] == sqrt 2.0
-  assert vec[3] == sqrt 3.0
-
 runnableExamples:
   import cppstl
   import complex
@@ -51,7 +45,4 @@ runnableExamples:
   assert conj_z.real == z.real
   assert conj_z.imag == -z.imag
 
-when not defined(cpp):
-  {.error: "C++ backend required to use STL wrapper".}
-# std=c++11 at least needed
-# {.passC: "-std=c++11".}
+
diff --git a/docs/index.html b/docs/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE HTML>
+
 <html>
 
   <head>

diff --git a/tests/.gitignore b/tests/.gitignore
@@ -1,3 +1,12 @@
-bin
+# Trick to ignore extension-less binary
+# *
+# !*.*
+
+bin/
+# List of tests
 tstring
 tvector
+tcomplex
+tpair
+tsmart_ptrs
+tdestructor_codegen_bug
diff --git a/tests/config.nims b/tests/config.nims
@@ -1,6 +1,7 @@
 switch("path", "$projectDir/..")
 # switch("cc", "clang")
+switch("backend", "cpp")
+switch("cc", "gcc")
 when not defined(testing):
   switch("outdir", "tests/bin")
 
-switch("cc", "gcc")
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <!DOCTYPE HTML>
     <html>
       <head>
@@ Expand Down @@