Initial pointer support, ugly toast

nimterop/ast.nim

@@ -137,11 +137,15 @@ proc enumSpecifier(node: ref Ast, name = "") =
 
 proc typeDefinition(node: ref Ast) =
   if node.children.len() == 2:
-    let
+    var
       name = getNodeValIf(node.children[1], "type_identifier")
+      pname = getNodeValIf(node.children[1], "pointer_declarator")
       ptyp = getNodeValIf(node.children[0], "primitive_type")
       ttyp = getNodeValIf(node.children[0], "type_identifier")
 
+    if name.len() == 0 and node.children[1].sym == "pointer_declarator" and node.children[1].children.len() == 1:
+      name = getNodeValIf(node.children[1].children[0], "type_identifier")
+
     if name.nBl and name notin gTypes:
       if ptyp.nBl:
         # typedef int X
@@ -217,8 +221,6 @@ proc genNimAst*(node: ref Ast) =
     of "enum_specifier":
       if node.parent.sym notin ["type_definition", "declaration"]:
         enumSpecifier(node)
-    of "":
-      return
 
   for child in node.children:
     genNimAst(child)

nimterop/getters.nim

@@ -8,7 +8,7 @@ proc getIdentifier*(str: string): string =
   result = str.strip(chars={'_'})
 
 proc getType*(str: string): string =
-  result = str.strip(chars={'_'}).replace(re"([u]?int[\d]+)_t", "$1")
+  result = str.strip(chars={'_'}).replace(re"([u]?int[\d]+)_t", "$1").replace(re"^void$", "object")
   
 proc getLit*(str: string): string =
   if str.contains(re"^[\-]?[\d]+$") or

nimterop/lisp.nim

@@ -13,16 +13,14 @@ proc tokenize(fullpath: string) =
   
   gTokens = @[]
   idx = 0
-  for i in staticExec("toast " & fullpath):
+  for i in staticExec("toast -u " & fullpath):
     case i:
-      of ' ', '\n', '\r', ')':
+      of ' ', '\n', '\r', '(', ')':
         if collect.nBl:
           gTokens.add(collect)
           collect = ""
-        if i == ')':
+        if i in ['(', ')']:
-          gTokens.add(")")
+          gTokens.add($i)
-      of '(':
-        gTokens.add("(")
       else:
         collect &= $i
 

toast.nim

@@ -8,6 +8,9 @@ const HELP = """
 > toast header.h
 """
 
+var
+  gPretty = true
+
 proc printLisp(root: TSNode, data: var string) =
   var
     node = root
@@ -16,21 +19,30 @@ proc printLisp(root: TSNode, data: var string) =
     
   while true:
     if not node.tsNodeIsNull():
-      stdout.write spaces(depth) & "(" & $node.tsNodeType() & " " & $node.tsNodeStartByte() & " " & $node.tsNodeEndByte()
+      if gPretty:
+        stdout.write spaces(depth)
+      stdout.write "(" & $node.tsNodeType() & " " & $node.tsNodeStartByte() & " " & $node.tsNodeEndByte()
 
     if node.tsNodeNamedChildCount() != 0:
+      if gPretty:
         echo ""
       nextnode = node.tsNodeNamedChild(0)
       depth += 1
     else:
+      if gPretty:
         echo ")"
+      else:
+        stdout.write ")"
       nextnode = node.tsNodeNextNamedSibling()
 
     if nextnode.tsNodeIsNull():
       while true:
         node = node.tsNodeParent()
         depth -= 1
+        if gPretty:
           echo spaces(depth) & ")"
+        else:
+          stdout.write ")"
         if node == root:
           break
         if not node.tsNodeNextNamedSibling().tsNodeIsNull():
@@ -93,6 +105,8 @@ proc parseCli() =
     if param in ["-h", "--help", "-?", "/?", "/h"]:
       echo HELP
       quit()
+    elif param == "-u":
+      gPretty = false
     else:
       process(param)