Fix typedef struct bug

nimterop/grammar.nim

@@ -100,7 +100,8 @@ proc initGrammar() =
           gStateRT.typeStr &= &"    {fname}*: {ftyp}\n"
           i += 2
 
-  let fieldGrammar = """
+  let
+    fieldGrammar = """
       (field_identifier?)
       (array_declarator?
        (field_identifier)
@@ -108,10 +109,7 @@ proc initGrammar() =
       )
     """
 
-  # struct X {}
+    fieldListGrammar = &"""
-  gStateRT.grammar.add((&"""
-   (struct_specifier|union_specifier
-    (type_identifier)
       (field_declaration_list
        (field_declaration+
         {typeGrammar}
@@ -121,6 +119,13 @@ proc initGrammar() =
         )
        )
       )
+    """
+
+  # struct X {}
+  gStateRT.grammar.add((&"""
+   (struct_specifier|union_specifier
+    (type_identifier)
+    {fieldListGrammar}
    )
   """,
     proc (ast: ref Ast, node: TSNode) =
@@ -130,7 +135,10 @@ proc initGrammar() =
   # typedef struct X {}
   gStateRT.grammar.add((&"""
    (type_definition
-    {gStateRT.grammar[^1].grammar}
+    (struct_specifier|union_specifier
+     (type_identifier?)
+     {fieldListGrammar}
+    )
     (type_identifier)
    )
   """,

toast.nim

@@ -4,7 +4,7 @@ import treesitter/runtime
 import treesitter_c/c
 import treesitter_cpp/cpp
 
-import nimterop/[ast, globals, getters]
+import nimterop/[ast, globals, getters, grammar]
 
 proc printLisp(root: TSNode) =
   var
@@ -112,6 +112,7 @@ proc main(
     pnim = false,
     pretty = true,
     preprocess = false,
+    pgrammar = false,
     defines: seq[string] = @[],
     includeDirs: seq[string] = @[],
     source: seq[string],
@@ -126,7 +127,11 @@ proc main(
     defines: defines,
     includeDirs: includeDirs,
   )
-  if source.len != 0:
+
+  if pgrammar:
+    parseGrammar()
+    printGrammar()
+  elif source.len != 0:
     process(source[0])
 
 when isMainModule:
@@ -138,11 +143,13 @@ when isMainModule:
     "defines": "definitions to pass to preprocessor",
     "includeDirs": "include directory to pass to preprocessor",
     "preprocess": "run preprocessor on header",
+    "pgrammar": "print grammar",
     "source" : "C/C++ source/header",
   }, short = {
     "past": 'a',
     "pnim": 'n',
     "defines": 'D',
     "includeDirs": 'I',
-    "preprocess": 'p'
+    "preprocess": 'p',
+    "pgrammar": 'g'
   })