Simplify .xnif.

Author: wltsmrz

nimler.nim

@@ -126,36 +126,28 @@ proc genNifWrapper(nifName: NimNode, fn: NimNode): NimNode {.compileTime.} =
   let rbody = newTree(nnkStmtList, fn)
   let rcall = newCall(fn.name, ident("env"))
 
+  template tNifFn(n, rbody) {.dirty.} =
+    func n(env: ptr ErlNifEnv; argc: cint; argv: ErlNifArgs): ErlNifTerm =
+      rbody
+  template tReturnTerm(v) =
+    return toTerm(env, v)
+  template tFromTerm(a, b, c) =
+    let a = fromTerm(env, argv[b], c)
+  template tCheckTerm(p) =
+    if unlikely(isNone(p)):
+      return enif_make_badarg(env)
+  template tGetFromTerm(p) =
+    unsafeGet(p)
+
   for i in 2 ..< len(fn.params):
     let p = fn.params[i]
-    let arg = newTree(nnkBracketExpr, ident("argv"), newLit(i-2))
-    rbody.add(newTree(nnkLetSection, newTree(nnkIdentDefs,
-      p[0],
-      newNimNode(nnkEmpty),
-      newCall("fromTerm", ident("env"), arg, p[1]))))
-    rbody.add(newTree(nnkIfStmt, newTree(nnkElifBranch,
-      newCall("unlikely", newCall("isNone", p[0])),
-      newTree(nnkReturnStmt, newCall("enif_make_badarg", ident("env"))))))
-    rcall.add(newCall("unsafeGet", p[0]))
-
-  rbody.add(newTree(nnkReturnStmt, newCall("toTerm", ident("env"), rcall)))
-
-  let rfn = newProc(rname, [], rbody, fn.kind)
-  rfn.params = newTree(nnkFormalParams,
-    ident("ErlTerm"),
-    newTree(nnkIdentDefs,
-      ident("env"),
-      newNimNode(nnkPtrTy).add(ident("ErlNifEnv")),
-      newNimNode(nnkEmpty)),
-    newTree(nnkIdentDefs,
-      ident("argc"),
-      ident("cint"),
-      newNimNode(nnkEmpty)),
-    newTree(nnkIdentDefs,
-      ident("argv"),
-      ident("ErlNifArgs"),
-      newNimNode(nnkEmpty)))
+    rbody.add(getAst(tFromTerm(p[0], newLit(i-2), p[1])))
+    rbody.add(getAst(tCheckTerm(p[0])))
+    rcall.add(getAst(tGetFromTerm(p[0])))
+
+  rbody.add(getAst(tReturnTerm(rcall)))
 
+  let rfn = getAst(tNifFn(rname, rbody))
   rfn.pragma = copyPragmaWithout(fn.pragma, "raises")
   rfn.pragma.add(ident("nif"))
   rfn.pragma.add(newTree(nnkExprColonExpr,

tests/codec/NimlerWrapper.ex

@@ -1,7 +1,8 @@
 defmodule NimlerCodec do
   @on_load :init
 
-  def init(), do: :erlang.load_nif(to_charlist(Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
+  def init(), do: :erlang.load_nif(to_charlist(
+      Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
 
   def codec_options(_, _), do: exit(:nif_library_not_loaded)
   def codec_int(_, _), do: exit(:nif_library_not_loaded)

tests/dirty_nif/NimlerWrapper.ex

@@ -1,7 +1,8 @@
 defmodule NimlerDirtyNif do
   @on_load :init
 
-  def init(), do: :erlang.load_nif(to_charlist(Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
+  def init(), do: :erlang.load_nif(to_charlist(
+      Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
 
   def dirty_cpu(), do: exit(:nif_library_not_loaded)
   def dirty_io(), do: exit(:nif_library_not_loaded)

tests/init_api/NimlerWrapper.ex

@@ -1,7 +1,8 @@
 defmodule NimlerInitApi do
   @on_load :init
 
-  def init(), do: :erlang.load_nif(to_charlist(Path.join(Path.dirname(__ENV__.file), 'nif')), 123)
+  def init(), do: :erlang.load_nif(to_charlist(
+      Path.join(Path.dirname(__ENV__.file), 'nif')), 123)
 
   def test(), do: exit(:nif_library_not_loaded)
   def test_priv(), do: exit(:nif_library_not_loaded)

tests/init_resource/NimlerWrapper.ex

@@ -1,7 +1,8 @@
 defmodule NimlerInitResource do
   @on_load :init
 
-  def init(), do: :erlang.load_nif(to_charlist(Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
+  def init(), do: :erlang.load_nif(to_charlist(
+      Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
 
   def new(), do: exit(:nif_library_not_loaded)
   def set(_, _), do: exit(:nif_library_not_loaded)

tests/integration/NimlerWrapper.ex

@@ -1,7 +1,8 @@
 defmodule NimlerIntegration do
   @on_load :init
 
-  def init(), do: :erlang.load_nif(to_charlist(Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
+  def init(), do: :erlang.load_nif(to_charlist(
+      Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
 
   def is_atom(_), do: exit(:nif_library_not_loaded)
   def is_binary(_), do: exit(:nif_library_not_loaded)

tests/message/NimlerWrapper.ex

@@ -1,7 +1,8 @@
 defmodule NimlerMessage do
   @on_load :init
 
-  def init(), do: :erlang.load_nif(to_charlist(Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
+  def init(), do: :erlang.load_nif(to_charlist(
+      Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
 
   def send_message(_, _), do: exit(:nif_library_not_loaded)
   def send_message_caller(_), do: exit(:nif_library_not_loaded)

tests/resource/NimlerWrapper.ex

@@ -1,7 +1,8 @@
 defmodule NimlerWrapper do
   @on_load :init
 
-  def init(), do: :erlang.load_nif(to_charlist(Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
+  def init(), do: :erlang.load_nif(to_charlist(
+      Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
 
   def create_resource(), do: exit(:nif_library_not_loaded)
   def update_resource(_), do: exit(:nif_library_not_loaded)

tests/timeslice/NimlerWrapper.ex

@@ -1,7 +1,8 @@
 defmodule NimlerTimeslice do
   @on_load :init
 
-  def init(), do: :erlang.load_nif(to_charlist(Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
+  def init(), do: :erlang.load_nif(to_charlist(
+      Path.join(Path.dirname(__ENV__.file), 'nif')), 0)
 
   def test_consume_timeslice(_, _), do: exit(:nif_library_not_loaded)