From 6b8a687d48c8e32e372a897e5455bbf30251c01f Mon Sep 17 00:00:00 2001
From: kevstone <kev@apperoso.com>
Date: Thu, 18 Jan 2024 08:55:09 +0000
Subject: [PATCH] Fix parsing bug; set extra debug control for AST parser (as
 it's noisy)

---
 .../default/default_cast_parser.py            | 21 +++++++++++++------
 .../default/default_ccode_converter.py        |  3 ++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/clang_convert/default/default_cast_parser.py b/src/clang_convert/default/default_cast_parser.py
index 67266525b..1b2baa6d1 100755
--- a/src/clang_convert/default/default_cast_parser.py
+++ b/src/clang_convert/default/default_cast_parser.py
@@ -35,6 +35,13 @@ class DefaultCASTParser:
         self._conversion_data = conversion_data
         self._macros = macros
 
+        # Local override - resets the current debug state at function exit!
+        include_ast_parser_debugging = False
+        global_debug_enabled = debug.debug_enabled
+
+        if global_debug_enabled and not include_ast_parser_debugging:
+            debug.disable_debug()
+
         ccode_objects = code_objects.CodeObjects()
 
         if isinstance(cnode, list):
@@ -51,6 +58,9 @@ class DefaultCASTParser:
             else:
                 debug.line("to_ccode_objects", f"Code object is None for node spelling=[{cnode.spelling}] type=[{cnode.type.spelling}] kind=[{cnode.kind}]")
         
+        if global_debug_enabled and not include_ast_parser_debugging:
+            debug.enable_debug()
+
         return ccode_objects
 
     # Main entry point to parse an AST node and return a CodeInterface objects
@@ -83,17 +93,17 @@ class DefaultCASTParser:
     # Default behaviour for node kinds that we ignore
     def parse_node_ignored_kind(self, node):
         debug.line("parse_node_ignored_kind", f"*** IGNORING *** spelling=[{node.spelling}] kind=[{node.kind}]")
-        if node.kind == clang.cindex.CursorKind.UNEXPOSED_DECL:
+        '''if node.kind == clang.cindex.CursorKind.UNEXPOSED_DECL:
             debug.line("parse_node_ignored_kind", f"     Not dumping node - could be a lot of tokens if #include !")
         else:
-            cnode_utils.dump_node(node,5)
+            cnode_utils.dump_node(node,5)'''
 
         return None
 
     # Placeholder for node kinds that we should support, but haven't yet implemented!
     def parse_node_not_implemented(self, node):
         debug.line("parse_node_not_implemented", f"*** kind=[{node.kind}] not implemented ***")
-        cnode_utils.dump_node(node,5)
+        #cnode_utils.dump_node(node,5)
         debug.line("parse_node_not_implemented", f"No convert routine implemented for kind=[{node.kind}]")
         assert False, f"No convert routine implemented for kind=[{node.kind}]"
         return None
@@ -147,7 +157,6 @@ class DefaultCASTParser:
     def parse_COMPOUND_STMT(self, node):
 
         debug.line("parse_COMPOUND_STMT", f">>> spelling=[{node.spelling}] kind=[{node.kind}]")
-        cnode_utils.dump_node(node, 1)
 
         stmt_lines = code_lines.CodeLines()
 
@@ -431,8 +440,8 @@ class DefaultCASTParser:
         # Find the operator by excluding operand tokens
         operator_tokens = [t for t in tokens if t not in right_tokens]
         debug.line("parse_UNARY_OPERATOR", f"Unary Operator = [{operator_tokens}]")
-        debug.line("parse_UNARY_OPERATOR", f"right_operand...")
-        cnode_utils.dump_node(right_operand)
+        #debug.line("parse_UNARY_OPERATOR", f"right_operand...")
+        #cnode_utils.dump_node(right_operand)
 
         operator_str = "".join(t for t in operator_tokens)
         right_operand_cvalue = self.parse_ast_node(right_operand)
diff --git a/src/clang_convert/default/default_ccode_converter.py b/src/clang_convert/default/default_ccode_converter.py
index 1f6570c62..0f8fdc7e6 100755
--- a/src/clang_convert/default/default_ccode_converter.py
+++ b/src/clang_convert/default/default_ccode_converter.py
@@ -75,7 +75,8 @@ class DefaultCCodeConverter:
     def convert_cfunction_body(self, cfunc):
         function_body_ast_parser = self.cast_parser_class()
         function_body_ccode_objects = function_body_ast_parser.to_ccode_objects(cfunc.body, self._conversion_data, self._ccode.macro_details)
-        return function_body_ccode_objects.as_lines()
+        function_body_cppcode_objects = conversion_funcs.convert_ccode_object_collection(function_body_ccode_objects, self._conversion_data)
+        return function_body_cppcode_objects.as_lines()
 
     # Standard function conversion: returns: funcsig, body
     def convert_function_helper(self, cfunc):