Backport to 1.4.8 (#2)

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        nim: [ '1.6.0', 'stable', 'devel' ]
+        nim: [ '1.4.8', 'stable', 'devel' ]
     name: Nim ${{ matrix.nim }} sample
     steps:
       - uses: actions/checkout@v3

records.nimble

@@ -1,13 +1,13 @@
 import os
 
 # Package
-version = "0.5.1"
+version = "0.5.2"
 author = "Dan Rose"
 description = "Operations on tuples as heterogeneous record types a la Relational Algebra"
 license = "MIT"
 srcDir = "src"
 binDir = "build"
-requires "nim >= 1.6.0"
+requires "nim >= 1.4.8"
 
 task style, "enforce code style":
   var paths: seq[string]

src/records/tupleops.nim

@@ -57,19 +57,20 @@ template tupleKeys*(t: tuple): TupleKeys =
   ## Return all the field names of the given tuple
   tupleKeys(typeof t)
 
-proc project*(t: tuple, keys: static openArray[string]): tuple =
+proc project*[T: tuple](t: T, keys: static openArray[string]): auto =
   ## Rearrange/select named fields from a named tuple,
   ## returning a new named tuple
 
-  macro projImpl(): tuple =
-    result = newNimNode(nnkTupleConstr)
+  macro projImpl(): untyped =
+    let res = newNimNode(nnkPar)
     when keys.len != 0:
       for key in @keys:
-        result.add(newColonExpr(
+        res.add(newColonExpr(
           ident key,
           newDotExpr(bindSym "t", ident key)
         ))
-  projImpl()
+    res
+  return projImpl()
 
 proc reject*(t: tuple, keys: static openArray[string]): tuple =
   ## Given a tuple and a set of keys, return key-value pairs whose keys

tests/testLenientTuple.nim

@@ -13,12 +13,14 @@ test "testAssignment":
     check x[0] != y[0]
 
     let yAsX = y.to(typeof x)
-    check (typeof yAsX) is (typeof x)
-    check yAsX[0] == x[0]
+    check:
+        ((typeof yAsX) is (typeof x))
+        yAsX[0] == x[0]
 
     let y2AsX = y.to(typeof x)
-    check (typeof y2AsX) is (typeof x)
-    check y2AsX[0] == x[0]
+    check:
+        ((typeof y2AsX) is (typeof x))
+        y2AsX[0] == x[0]
 
 test "assignfrom":
     var dest = (x: 1, y: 2)

tests/testRelational.nim

@@ -2,11 +2,11 @@ import std/[sequtils, sugar, tables, unittest]
 import records/[relational, lenientTuple]
 
 test "joinSequences":
-  var squares = collect:
+  var squares = collect(newSeq):
     for i in -3..3:
       (x: i, y: (i*i))
   check len(squares) == 7
-  let squares2 = collect:
+  let squares2 = collect(newSeq):
     for i in -3..3:
       (y: i*i, z: i)
   let foo = join(squares, squares2)
@@ -19,7 +19,7 @@ test "joinSequences":
     check rec["z"]*rec["z"] == rec["y"]
 
 test "project":
-  let table = collect:
+  let table = collect(newSeq):
     for i in -3..3:
       (x: i, y: (i*i))
   let xs = project(table, ["x"])