Introduce a way to passe flags to the config and use it

This will allow to enable/disable stuff in the future.

The f1 flag, when set, will add the __va_list_tag declarations to the tree.
By default the flag is not set.

Author: iMichka

pygccxml/parser/config.py

@@ -43,7 +43,8 @@ def __init__(
             compiler=None,
             xml_generator="gccxml",
             keep_xml=False,
-            compiler_path=None):
+            compiler_path=None,
+            flags=None):
 
         object.__init__(self)
         self.__working_directory = working_directory
@@ -68,6 +69,10 @@ def __init__(
 
         self.__keep_xml = keep_xml
 
+        if flags is None:
+            flags = []
+        self.__flags = flags
+
         # If no compiler path was set and we are using castxml, set the path
         self.__compiler_path = create_compiler_path(
             xml_generator, compiler_path)
@@ -128,6 +133,18 @@ def keep_xml(self, keep_xml):
         """Set if xml files kept after errors."""
         self.__keep_xml = keep_xml
 
+    @property
+    def flags(self):
+        """Optional flags for pygccxml."""
+        return self.__flags
+
+    @flags.setter
+    def flags(self, flags):
+        """Optional flags for pygccxml."""
+        if flags is None:
+            flags = []
+        self.__flags = flags
+
     @property
     def compiler_path(self):
         """Get the path for the compiler."""
@@ -192,7 +209,8 @@ def __init__(
             compiler=None,
             xml_generator="gccxml",
             keep_xml=False,
-            compiler_path=None):
+            compiler_path=None,
+            flags=None):
 
         parser_configuration_t.__init__(
             self,
@@ -204,7 +222,8 @@ def __init__(
             compiler=compiler,
             xml_generator=xml_generator,
             keep_xml=keep_xml,
-            compiler_path=compiler_path)
+            compiler_path=compiler_path,
+            flags=flags)
 
         if gccxml_path != '':
             self.__gccxml_path = gccxml_path
@@ -400,6 +419,8 @@ def load_xml_generator_configuration(configuration, **defaults):
             cfg.xml_generator = value
         elif name == 'keep_xml':
             cfg.keep_xml = value
+        elif name == 'flags':
+            cfg.flags = value
         elif name == 'compiler_path':
             cfg.compiler_path = value
         else:

pygccxml/parser/scanner.py

@@ -205,7 +205,7 @@ def startElement(self, name, attrs):
             # With CastXML and clang some __va_list_tag declarations are
             # present in the tree: we do not want to have these in the tree.
             # This option is set to True by default
-            remove_va_list_tag = utils.remove__va_list_tag
+            remove_va_list_tag = "f1" not in self.config.flags
 
             if isinstance(obj, declarations.declaration_t):
 

pygccxml/utils/__init__.py

@@ -20,7 +20,3 @@
 
 # Version of xml generator which was used.
 xml_generator = None
-
-# With CastXML and clang some __va_list_tag declarations are present in the
-# tree. This options allows to remove them when parsing the xml file.
-remove__va_list_tag = True

unittests/test_va_list_tag_removal.py

@@ -31,7 +31,7 @@ def test_keep_va_list_tag(self):
         if "GCCXML" in self.config.xml_generator:
             return True
 
-        utils.remove__va_list_tag = False
+        self.config.flags = ["f1"]
         src_reader = parser.source_reader_t(self.config)
         decls = declarations.make_flatten(src_reader.read_string(self.__code))
 
@@ -62,7 +62,7 @@ def test_remove_va_list_tag(self):
         if "GCCXML" in self.config.xml_generator:
             return True
 
-        utils.remove__va_list_tag = True
+        self.config.flags = []
         src_reader = parser.source_reader_t(self.config)
         decls = declarations.make_flatten(src_reader.read_string(self.__code))