[WIP] TS read class/signal/slot

- ADDED ::
  - Support for reading Qt signals, slots
  - General C++ method, constructor handling
- NEXT ::
  - Make a simplified test for Qt wrapper generator before going into
    wrapping whole Qt library.
  - #25

.gitignore

@@ -62,4 +62,5 @@ wrap-examples.rst
 
 # End of https://www.toptal.com/developers/gitignore/api/c++
 
-**/.gdb_history
+**/.gdb_history
+*.code-workspace

hcparse.code-workspace

@@ -2,7 +2,13 @@
 	"folders": [
 		{
 			"path": "."
+		},
+		{
+			"path": "/mnt/workspace/github/hlibgit2"
+		},
+		{
+			"path": "/mnt/workspace/github/hlibssh2"
 		}
 	],
 	"settings": {}
-}
+}

nim.cfg

@@ -1,4 +1,7 @@
 --showAllMismatches:on
 # added by nimph:
 # added by nimph:
---path="/mnt/workspace/github/deps/pkgs/unicodedb-#master/src/"
+# added by nimph:
+--path="/mnt/workspace/github/deps/pkgs/fusion-#master/src/"
+# added by nimph:
+--path="/mnt/workspace/github/deps/pkgs/unicodedb-0.10.0/src/"

src/hcparse/hc_codegen.nim

@@ -20,6 +20,8 @@ type
 
     nameStyle*: IdentStyle
 
+
+
 const
   cxxCodegenConf* = CodegenConf(
     isIcpp: true
@@ -103,6 +105,10 @@ proc toNNode*[N](
       else:
         result = newNType[N]("ptr", @[toNNode[N](t.wrapped, conf, anon)])
 
+    of ctkLVref:
+      # QUESTION how to map lvref properly?
+      result = toNNode[N](t.wrapped, conf, anon)
+
     of ctkProc:
       var pragma: Pragma[N]
       if ctfNoCdeclProc notin t.flags:
@@ -260,7 +266,7 @@ proc toNNode*[N](
     def: CxxProc,
     conf: CodegenConf,
     anon: var seq[NimDecl[N]],
-    onConstructor: CxxTypeKind = ctkIdent
+    onConstructor: NimConstructorTarget = nctRegular
   ): ProcDecl[N] =
 
   result = newProcDecl[N](def.nimName)
@@ -270,28 +276,58 @@ proc toNNode*[N](
   if cpfExportc in def.flags:
     result.addPragma("exportc", newNLit[N, string](def.cxxName.cxxStr()))
 
+  if cpfVariadic in def.flags: result.addPragma("varargs")
+  if cpfSlot in def.flags: result.addPragma("qslot")
+  if cpfSignal in def.flags: result.addPragma("qsignal")
+
+  if def.isConstructor:
+    let name = conf.getSuffix(result.name)
+
+    var cbind = def.cbind
+    case onConstructor:
+      of nctRegular:
+        cbind.icpp.standaloneProc(def.getIcppName())
+        result.addPragma toNNode[N](cbind, conf, def.nimName)
+
+        result.addPragma("constructor")
+        result.name = "init" & name
+
+      of nctPtr:
+        cbind.icpp.standaloneProc("new " & def.getIcppName())
+        result.addPragma toNNode[N](cbind, conf, def.nimName)
+
+        result.name = "cnew" & name
+
+      of nctRef:
+        result.name = "new" & name
+
+  elif def.isMethod():
+    var ret = toNNode[N](def.methodOf.get(), conf, anon)
+    if not def.isConst():
+      ret = newNType[N]("var", @[ret])
+
+    result.addArgument("this", ret)
+    result.addPragma toNNode[N](def.getCbindAs(), conf, def.nimName)
+
   else:
-    result.addPragma toNNode[N](
-      def.getCbindAs(ctkIdent), conf, def.nimName)
+    result.addPragma toNNode[N](def.getCbindAs(), conf, def.nimName)
 
-  if cpfVariadic in def.flags:
-    result.addPragma("varargs")
 
-  if def.isConstructor and onConstructor == ctkIdent:
-    result.addPragma("constructor")
 
+  let ret: NType[N] =
+    if def.isConstructor:
+      let base: NType[N] = toNNode[N](def.getConstructed(), conf, anon)
+      case onConstructor:
+        of nctRegular: base
+        of nctPtr: newNType[N]("ptr", @[base])
+        of nctRef: newNType[N]("ref", @[base])
 
-  let ret = def.getReturn(onConstructor)
-  if "git_object_t" in $def.getReturn(onConstructor):
-    echov ret
-    echov ret.flags
+    else:
+      toNNode[N](def.returnType, conf, anon)
 
   # nim's overload-resolution-in-generics magic
-  proc_decl.`returnType=`(result, toNNode[N](ret, conf, anon))
+  proc_decl.`returnType=`(result, ret)
 
-  if def.methodOf.isSome():
-    result.addArgument(
-      "this", toNNode[N](def.methodOf.get(), conf, anon))
 
   for arg in def.arguments:
     result.addArgument toNNode[N](arg, conf, anon)
@@ -319,7 +355,7 @@ proc toNNode*[N](
   result.add toNimDecl(res)
 
   for meth in obj.methods:
-    result.add toNNode[N](meth, conf, anon, ctkPtr)
+    result.add toNNode[N](meth, conf, anon, nctPtr)
 
   for n in obj.nested:
     result.add toNNode[N](n, conf, anon)
@@ -500,8 +536,7 @@ proc toNNode*[N](
       result.add toNNode[N](entry.cxxEnum, conf)
 
     of cekProc:
-      result.add toNNode[N](
-        entry.cxxProc, conf, anon, ctkPtr).toNimDecl()
+      result.add toNNode[N](entry.cxxProc, conf, anon).toNimDecl()
 
     of cekForward:
       result.add toNNode[N](entry.cxxForward, conf)

src/hcparse/hc_impls.nim

@@ -240,6 +240,11 @@ proc fixContextedName*(
 
   cache.newRename(name.nim, result)
 
+  let l = "LIBSSH2_CHANNEL" in $name
+  if l:
+    echov name, " -> ", result
+
+
 
 proc getBaseFile*(conf: WrapConf, wrapped: WrappedFile): AbsFile =
   ## Return base file for generated wrapped one. For generated grouped

src/hcparse/hc_parsefront.nim

@@ -199,18 +199,30 @@ proc postFixEntries*(
   for item in mitems(entries):
     setHeaderRec(item, conf)
 
+
+proc postFixEntries*(
+    entries: sink seq[CxxEntry],
+    conf: CxxFixConf,
+    lib: CxxLibImport,
+    file: Option[AbsFile] = none AbsFile
+  ): seq[CxxEntry] =
+  result = entries
+  conf.postFixEntries(result, lib, file)
+
+
 iterator mentries*(files: var seq[CxxFile]): var CxxEntry =
   for file in mitems(files):
     for entry in mitems(file.entries):
       yield entry
 
 proc postFixEntries*(conf: CxxFixConf, files: var seq[CxxFile]) =
   var store = conf.typeStore
-  var cache: StringNameCache
 
   # Fix all identifier names in entry lists
-  for item in mentries(files):
-    fixIdentsRec(item, cache, conf)
+  for file in mitems(files):
+    var cache: StringNameCache
+    for item in mitems(file.entries):
+      fixIdentsRec(item, cache, conf)
 
   # Set spelling location file for all entries in the list
   for file in mitems(files):
@@ -230,6 +242,14 @@ proc postFixEntries*(conf: CxxFixConf, files: var seq[CxxFile]) =
   for item in mentries(files):
     setHeaderRec(item, conf)
 
+
+proc postFixEntries*(
+  files: sink seq[CxxFile], conf: CxxFixConf): seq[CxxFile] =
+
+  result = files
+  conf.postFixEntries(result)
+
+
 proc wrapViaTs*(
     str: string,
     conf: CxxFixConf,
@@ -487,7 +507,12 @@ proc wrapCSharedLibViaTsWave*(
 proc validateGenerated*(files: GenFiles) =
   for file in items(files.genNim):
     try:
-      execShell shellCmd(nim, check, errormax = 3, $file)
+      execShell shellCmd(
+        nim,
+        check,
+        errormax = 3,
+        spellSuggest = 0,
+        $file)
 
     except ShellError:
       echo "> ", file