updates to the code generator

Author: kdschlosser

gen/python_api_gen_mpy.py

@@ -624,7 +624,7 @@ def is_struct(type):
 
 forward_struct_decls = {}
 
-for item in ast.ext[:]:
+for item in ast.ext:
     if (
         isinstance(item, c_ast.Decl) and
         item.name is None and
@@ -633,17 +633,9 @@ def is_struct(type):
     ):
         if item.type.decls is None:
             forward_struct_decls[item.type.name] = [item]
-        else:
-            if item.type.name in forward_struct_decls:
-                decs = forward_struct_decls[item.type.name]
-                if len(decs) == 2:
-                    decl, td = decs
 
-                    td.type.type.decls = item.type.decls[:]
-
-                    ast.ext.remove(decl)
-                    ast.ext.remove(item)
-    elif (
+for item in ast.ext:
+    if (
         isinstance(item, c_ast.Typedef) and
         isinstance(item.type, c_ast.TypeDecl) and
         item.name and item.type.declname and item.name == item.type.declname and
@@ -654,6 +646,23 @@ def is_struct(type):
             forward_struct_decls[item.type.type.name].append(item)
 
 
+for item in ast.ext[:]:
+    if (
+        isinstance(item, c_ast.Decl) and
+        item.name is None and
+        isinstance(item.type, c_ast.Struct) and
+        item.type.name is not None
+    ):
+        if item.type.name in forward_struct_decls:
+            decs = forward_struct_decls[item.type.name]
+            if len(decs) == 2:
+                decl, td = decs
+
+                td.type.type.decls = item.type.decls[:]
+
+                ast.ext.remove(decl)
+                ast.ext.remove(item)
+
 
 # ast_file = open(os.path.join(os.path.dirname(__file__), 'ast.txt'), 'w')
 # ast_file.write(str(ast))