Add option to disable generating includes

Author: Adikso

extract.py

@@ -4,11 +4,16 @@
 
 
 @click.command()
+@click.option('--format', type=click.Choice(['cpp', 'pointers_cpp'], case_sensitive=False), default='cpp')
+@click.option('--includes/--no-includes', default=True)
 @click.argument('input', type=click.File('rb'))
-@click.option('--format', type=click.Choice(['cpp', 'pointers_cpp'], case_sensitive=False))
-def extract(input, format):
+def extract(input, format, includes):
+    config = {
+        'includes': includes
+    }
+
     result = process(input)
-    output = convert(result, format)
+    output = convert(result, format, config)
 
     print(output)
 

extractdebug/converters/converter.py

@@ -1,6 +1,7 @@
 class Converter:
-    def __init__(self, result):
+    def __init__(self, result, config):
         self.result = result
+        self.config = config
 
     @staticmethod
     def name():

extractdebug/converters/original_cpp.py

@@ -8,9 +8,10 @@
 
 
 class OriginalCPPConverter(Converter):
-    def __init__(self, result, on_entry_render=None):
-        super().__init__(result)
+    def __init__(self, result, config, on_entry_render=None):
+        super().__init__(result, config)
         self.includes = defaultdict(set)
+        self.used_types = defaultdict(set)
         self.on_entry_render = on_entry_render
 
     @staticmethod
@@ -28,17 +29,18 @@ def convert(self):
             file_output = f'// Source file: {file_relative_path}\n'
             file_output += f'#ifndef {simple_name}_H\n#define {simple_name}_H\n\n'
 
-            for included_file_path in self.includes[file_path]:
-                if included_file_path.startswith(self.result.base_dir):
-                    included_relative_path = relative_path(file_path, included_file_path)
-                    include_name = included_relative_path.decode('utf-8')
-                    file_output += f'#include "{include_name}"\n'
-                else:
-                    include_name = included_file_path.decode('utf-8')
-                    file_output += f'#include <{include_name}>\n'
-
-            if self.includes[file_path]:
-                file_output += '\n'
+            if self.config['includes']:
+                for included_file_path in self.includes[file_path]:
+                    if included_file_path.startswith(self.result.base_dir):
+                        included_relative_path = relative_path(file_path, included_file_path)
+                        include_name = included_relative_path.decode('utf-8')
+                        file_output += f'#include "{include_name}"\n'
+                    else:
+                        include_name = included_file_path.decode('utf-8')
+                        file_output += f'#include <{include_name}>\n'
+
+                if self.includes[file_path]:
+                    file_output += '\n'
 
             for entry in entries:
                 if self.on_entry_render:

extractdebug/converters/pointers_cpp.py

@@ -1,11 +1,11 @@
 from extractdebug.converters import OriginalCPPConverter
 from extractdebug.converters.original_cpp import CPPClass, CPPMethod, CPPNamespace, CPPField
-from extractdebug.extractors.extractor import Type, TypeModifier
+from extractdebug.extractors.extractor import Type
 
 
 class PointersCPPConverter(OriginalCPPConverter):
-    def __init__(self, result):
-        super().__init__(result, on_entry_render=self.on_entry_render)
+    def __init__(self, result, config):
+        super().__init__(result, config, on_entry_render=self.on_entry_render)
 
     @staticmethod
     def name():

extractdebug/processor.py

@@ -11,12 +11,12 @@ def process(file):
     return extractor.extract(file)
 
 
-def convert(result, format):
+def convert(result, format, config):
     converter = find_converter(format)
     if not converter:
         return None
 
-    return converter(result).convert()
+    return converter(result, config).convert()
 
 
 def find_extractor(file):