From 5d7166261712c0c590b519dddc413a599b598e07 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Fri, 14 Apr 2017 20:33:03 +0200
Subject: [PATCH] fixed .component macro

---
 docs.rst => docs/docs.rst |  0
 src/components.nim        | 27 +++++++++++++++------------
 src/karax.nim             |  1 -
 src/karaxprelude.nim      |  3 +++
 4 files changed, 18 insertions(+), 13 deletions(-)
 rename docs.rst => docs/docs.rst (100%)
 create mode 100644 src/karaxprelude.nim

diff --git a/docs.rst b/docs/docs.rst
similarity index 100%
rename from docs.rst
rename to docs/docs.rst
diff --git a/src/components.nim b/src/components.nim
index 30d5922..52775df 100644
--- a/src/components.nim
+++ b/src/components.nim
@@ -78,7 +78,9 @@ macro component*(prc: untyped): untyped =
     isvirtual = ComponentKind.Node
   else:
     error "component must return VNode or Node"
-  n[0] = ident("inner" & $name)
+  let realName = if name.kind == nnkPostfix: name[1] else: name
+  let nn = $realName
+  n[0] = ident("inner" & nn)
   var unpackCall = newCall(n[0])
   var counter = 0
   for i in 1.. <params.len:
@@ -89,27 +91,28 @@ macro component*(prc: untyped): untyped =
       unpackCall.add unpack(typ, counter)
       inc counter
 
-  template vwrapper(wname, nameStrLit, unpackCall) {.dirty.} =
-    proc wname*(args: seq[VNode]): VNode =
+  template vwrapper(pname, cname, nameStrLit, unpackCall) {.dirty.} =
+    proc pname(args: seq[VNode]): VNode =
       unpackCall
-    vcomponents[cstring(nameStrLit)] = wname
+    vcomponents[cstring(nameStrLit)] = cname
 
-  template dwrapper(wname, nameStrLit, unpackCall) {.dirty.} =
-    proc wname(args: seq[VNode]): Node =
+  template dwrapper(pname, cname, nameStrLit, unpackCall) {.dirty.} =
+    proc pname(args: seq[VNode]): Node =
       unpackCall
-    dcomponents[cstring(nameStrLit)] = wname
+    dcomponents[cstring(nameStrLit)] = cname
 
   result = newTree(nnkStmtList, n)
   if isvirtual == ComponentKind.VNode:
-    result.add getAst(vwrapper(newname name, newLit($name), unpackCall))
+    result.add getAst(vwrapper(newname name, realName, newLit(nn), unpackCall))
   else:
-    result.add getAst(dwrapper(newname name, newLit($name), unpackCall))
-  allcomponents[$name] = isvirtual
+    result.add getAst(dwrapper(newname name, realName, newLit(nn), unpackCall))
+  allcomponents[nn] = isvirtual
   when defined(debugKaraxDsl):
     echo repr result
 
 when isMainModule:
-  proc foo(x, y: int, b: bool; s: cstring): VNode {.component.} =
+  proc public*(x, y: int, b: bool; s: cstring): VNode {.component.} =
+    discard
+  proc private(x, y: int, b: bool; s: cstring): VNode {.component.} =
     discard
 
-
diff --git a/src/karax.nim b/src/karax.nim
index 0007ce5..99e103b 100644
--- a/src/karax.nim
+++ b/src/karax.nim
@@ -51,7 +51,6 @@ type
   Timeout* = ref object
 
 var
-  document* {.importc.}: Document
   toFocus: Node
   toFocusV: VNode
 
diff --git a/src/karaxprelude.nim b/src/karaxprelude.nim
new file mode 100644
index 0000000..285730a
--- /dev/null
+++ b/src/karaxprelude.nim
@@ -0,0 +1,3 @@
+## Include file that contains the common imports for the Karax framework.
+
+import karax, karaxdsl, vdom, components