0.1.1, do notation with names

applicates.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.1.0"
+version       = "0.1.1"
 author        = "hlaaftana"
 description   = "\"pointers\" to cached AST that instantiate routines when called"
 license       = "MIT"

src/applicates.nim

@@ -150,7 +150,7 @@ macro applicate*(params, body): untyped =
       appl.apply()
 
     var c = 0
-    when false: # runnableExamples does not handle do: well
+    when false: # runnableExamples does not handle do: correctly, this works otherwise
       double(applicate do:
         double(applicate do:
           double(applicate do: inc c)))
@@ -250,11 +250,25 @@ macro applicate*(body): untyped =
 
     # const incr = applicate do (x: int) -> int: x + 1
     # doAssert incr.apply(x) == 4
+
+    # named:
+
+    # applicate named do (a, b; c: int):
+    #   let a = b(c)
+    # named.apply(upperA, char, 65)
+    # doAssert upperA == 'A'
   if body.kind == nnkDo:
-    if body[3][0].kind == nnkEmpty: body[3][0] = ident"untyped"
     let templ = newNimNode(nnkTemplateDef, body)
     for s in body:
       templ.add(s)
+    if templ[3][0].kind == nnkEmpty: templ[3][0] = ident"untyped"
+    result = getAst(makeTypedApplicate(templ))
+  elif body.kind in {nnkCall, nnkCommand} and body.len == 2 and body[1].kind == nnkDo:
+    let templ = newNimNode(nnkTemplateDef, body[1])
+    for s in body[1]:
+      templ.add(s)
+    if templ[3][0].kind == nnkEmpty: templ[3][0] = ident"untyped"
+    templ[0] = body[0]
     result = getAst(makeTypedApplicate(templ))
   else:
     let args = newPar()

tests/test_basic.nim

@@ -42,6 +42,15 @@ test "applicate macro and apply":
 
   foo.apply(5, FooType)
   check x.field == 5
+
+  const incr = applicate do (x: int) -> int: x + 1
+  doAssert incr.apply(x.field) == 6
+
+  applicate named do (a, b; c: int):
+    let a = b(c)
+
+  named.apply(upperA, char, 65)
+  doAssert upperA == 'A'
 
 test "operators":
   check (x !=> x[^1]) | "abc" == 'c'