Fix for #6

.gitignore

@@ -1,2 +1,3 @@
 nimcache
-/test
+/test
+*.ndb

README.md

@@ -167,6 +167,12 @@ A couple of limitations fo the `variant` macro:
 
 In the future, Patty may also add copy constructors. Also, some work needs to be done to make it easier to use the generated contructors with `ref` types, in particular for the important case of recursive algebraic data types.
 
+Versions
+--------
+
+Patty 0.1.8 works for latest Nim (devel). For older versions of Nim (up to 0.13.0),
+use Patty 0.1.7.
+
 Things that do not work (yet)
 -----------------------------
 

patty.nim

@@ -188,13 +188,13 @@ macro variantp*(e: expr, body: stmt): stmt {. immediate .} =
 
 
 proc isObject(tp: NimNode): bool {. compileTime .} =
-  (tp.kind == nnkObjectTy) and (tp[1][0].kind != nnkRecCase)
+  (tp.kind == nnkObjectTy) and (tp[2][0].kind != nnkRecCase)
 
 proc isVariant(tp: NimNode): bool {. compileTime .} =
-  (tp.kind == nnkObjectTy) and (tp[1][0].kind == nnkRecCase)
+  (tp.kind == nnkObjectTy) and (tp[2][0].kind == nnkRecCase)
 
 proc discriminator(tp: NimNode): NimNode {. compileTime .} =
-  if (tp.kind == nnkObjectTy) and (tp[1][0].kind == nnkRecCase): tp[1][0][0]
+  if (tp.kind == nnkObjectTy) and (tp[2][0].kind == nnkRecCase): tp[2][0][0]
   else: nil
 
 proc variants(tp: NimNode): seq[NimNode] {. compileTime .} =
@@ -215,6 +215,7 @@ proc resolveSymbol(id: NimNode, syms: seq[NimNode]): tuple[index: int, sym: NimN
 proc findFields(tp: NimNode, index: int): seq[NimNode] {. compileTime .} =
   # ObjectTy
   #   Empty
+  #   Empty
   #   RecList
   #     RecCase
   #       Sym "kind"
@@ -234,7 +235,7 @@ proc findFields(tp: NimNode, index: int): seq[NimNode] {. compileTime .} =
   #         RecList
   #           Sym "side"
   let
-    recCase = tp[1][0]
+    recCase = tp[2][0]
     branch = recCase[index + 1]
     recList = branch[1]
   result = @[]
@@ -244,11 +245,12 @@ proc findFields(tp: NimNode, index: int): seq[NimNode] {. compileTime .} =
 proc findFields(tp: NimNode): seq[NimNode] {. compileTime .} =
   # ObjectTy
   #   Empty
+  #   Empty
   #   RecList
   #     Sym "name"
   #     Sym "surname"
   #     Sym "age"
-  let recList = tp[1]
+  let recList = tp[2]
   result = @[]
   for c in recList.children:
     result.add(c)

patty.nimble

@@ -1,10 +1,20 @@
-[Package]
-name          = "patty"
-version       = "0.1.7"
+mode = ScriptMode.Verbose
+
+version       = "0.1.8"
 author        = "Andrea Ferretti"
 description   = "Algebraic data types and pattern matching"
 license       = "Apache2"
-SkipFiles     = "test,test.nim,testhelp.nim"
+skipFiles     = @["test", "test.nim", "testhelp.nim"]
+
+requires "nim >= 0.11.2"
+
 
-[Deps]
-Requires: "nim >= 0.11.2"
+task tests, "run tests":
+  --hints: off
+  --linedir: on
+  --stacktrace: on
+  --linetrace: on
+  --debuginfo
+  --path: "."
+  --run
+  setCommand "c", "test"