Merge branch 'develop'

Author: iMichka

.github/workflows/tests.yml

@@ -1,4 +1,10 @@
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+
 jobs:
   tests:
     name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.version }}-python-${{ matrix.python-version }}-${{ matrix.castxml-epic }}
@@ -93,12 +99,7 @@ jobs:
         if: matrix.os == 'macos-12'
         run: |
           wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/5d937e938f7b882a3a3e7941e68f8312d0898aaf2082e00003dd362b1ba70b98b0a08706a1be28e71652a6a0f1e66f89768b5eaa20e5a100592d5b3deefec3f0/download | tar zxf - -C ~/
-      - name: Setup castxml config
-        if: matrix.compiler == 'gcc' && matrix.version == '9'
-        run: mv unittests/configs/gcc9.cfg unittests/xml_generator.cfg;
       - name: Run tests
         run: |
           export PATH=~/castxml/bin:$PATH
-          coverage run -m unittests.test_all
-          coverage combine
-          coverage xml
+          pytest tests

.gitignore

@@ -2,6 +2,10 @@
 *.pyo
 *~
 docs/_build
+tests/temp
+tests/data/pygccxml.cache
+tests/data/directory_cache_test
+tests/data/ogre.1.7.xml
 unittests/temp
 unittests/data/pygccxml.cache
 unittests/data/directory_cache_test

CHANGELOG.md

@@ -18,7 +18,7 @@ keywords = [
   "CastXML",
   "gccxml",
 ]
-version = "2.5.0"
+version = "2.6.0"
 
 classifiers = [
   "Development Status :: 5 - Production/Stable",
@@ -55,6 +55,7 @@ test = [
   "coverage",
   "coveralls",
   "pycodestyle",
+  "pytest",
 ]
 docs = [
   "sphinx",

docs/install.rst

@@ -647,14 +647,14 @@ def remove_defaults(self, type_or_string):
 
 unordered_set_traits = container_traits_impl_t(
     'unordered_set',
-    1,
+    0,
     'value_type',
     'erase_hash_allocator',
     unordered_maps_and_sets=True)
 
 unordered_multiset_traits = container_traits_impl_t(
     'unordered_multiset',
-    1,
+    0,
     'value_type',
     'erase_hash_allocator',
     unordered_maps_and_sets=True)

pyproject.toml

@@ -9,6 +9,7 @@
 
 from . import algorithms_cache
 from . import byte_info
+from . import elaborated_info
 
 
 class type_t(byte_info.byte_info):
@@ -593,10 +594,10 @@ def __init__(self, base):
         compound_t.__init__(self, base)
 
     def build_decl_string(self, with_defaults=True):
-        if hasattr(self.base.declaration, "elaborated_type_specifier"):
+        prefix = ""
+        if isinstance(self.base, type(declarated_t)) and \
+                isinstance(self.base.declaration, type(elaborated_info)):
             prefix = self.base.declaration.elaborated_type_specifier + " "
-        else:
-            prefix = ""
         return prefix + self.base.build_decl_string(with_defaults)
 
     def _clone_impl(self):

src/pygccxml/declarations/container_traits.py

@@ -11,6 +11,7 @@
 import os
 import copy
 import platform
+import shutil
 import subprocess
 import warnings
 # In py3, ConfigParser was renamed to the more-standard configparser.
@@ -129,16 +130,12 @@ def compiler(self, compiler):
 
     @property
     def xml_generator(self):
-        """get xml_generator (gccxml or castxml)"""
+        """get xml_generator"""
         return self.__xml_generator
 
     @xml_generator.setter
     def xml_generator(self, xml_generator):
-        """set xml_generator (gccxml or castxml)"""
-        if "real" in xml_generator:
-            # Support for gccxml.real from newer gccxml package
-            # Can be removed once gccxml support is dropped.
-            xml_generator = "gccxml"
+        """set xml_generator"""
         self.__xml_generator = xml_generator
 
     @property
@@ -241,9 +238,8 @@ def raise_on_wrong_settings(self):
         self.__ensure_dir_exists(self.working_directory, 'working directory')
         for idir in self.include_paths:
             self.__ensure_dir_exists(idir, 'include directory')
-        if self.__xml_generator not in ["castxml", "gccxml"]:
-            msg = ('xml_generator("%s") should either be ' +
-                   '"castxml" or "gccxml".') % self.xml_generator
+        if self.__xml_generator != "castxml":
+            msg = f"xml_generator ({self.xml_generator}) can only be 'castxml'"
             raise RuntimeError(msg)
 
 
@@ -456,35 +452,20 @@ def create_compiler_path(xml_generator, compiler_path):
     if xml_generator == 'castxml' and compiler_path is None:
         if platform.system() == 'Windows':
             # Look for msvc
-            compiler_path = __get_first_compiler_in_path('where', 'cl')
+            compiler_path = shutil.which('cl')
             # No msvc found; look for mingw
-            if compiler_path == '':
-                compiler_path = __get_first_compiler_in_path('where', 'mingw')
+            if compiler_path is None:
+                compiler_path = shutil.which('mingw')
         else:
             # OS X or Linux
             # Look for clang first, then gcc
-            compiler_path = __get_first_compiler_in_path('which', 'clang++')
+            compiler_path = shutil.which('clang++')
             # No clang found; use gcc
-            if compiler_path == '':
-                compiler_path = __get_first_compiler_in_path('which', 'c++')
-
-        if compiler_path == "":
-            compiler_path = None
+            if compiler_path is None:
+                compiler_path = shutil.which('c++')
 
     return compiler_path
 
 
-def __get_first_compiler_in_path(command, compiler_name):
-    p = subprocess.Popen(
-        [command, compiler_name],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE)
-    path = p.stdout.read().decode("utf-8").rstrip().split("\r\n")[0].rstrip()
-    p.wait()
-    p.stdout.close()
-    p.stderr.close()
-    return path
-
-
 if __name__ == '__main__':
     print(load_xml_generator_configuration('xml_generator.cfg').__dict__)

src/pygccxml/declarations/cpptypes.py

@@ -56,6 +56,7 @@
 XML_AN_STATIC = "static"
 XML_AN_THROW = "throw"
 XML_AN_TYPE = "type"
+XML_AN_ORIGINAL_TYPE = "original_type"
 XML_AN_VIRTUAL = "virtual"
 XML_AN_VOLATILE = "volatile"
 XML_NN_ARGUMENT = "Argument"
@@ -558,7 +559,10 @@ def __read_argument(self, attrs):
                 XML_AN_NAME,
                 'arg%d' % len(
                     self.__inst.arguments))
-            argument.decl_type = attrs[XML_AN_TYPE]
+            argument.decl_type = attrs.get(
+                XML_AN_ORIGINAL_TYPE,
+                attrs.get(XML_AN_TYPE)
+            )
             argument.default_value = attrs.get(XML_AN_DEFAULT)
             self.__read_attributes(argument, attrs)
             self.__inst.arguments.append(argument)
@@ -576,8 +580,8 @@ def __read_calldef(self, calldef, attrs, is_declaration):
         if is_declaration:
             self.__calldefs.append(calldef)
             calldef.name = attrs.get(XML_AN_NAME, '')
-            calldef.has_extern = attrs.get(XML_AN_EXTERN, False)
-            calldef.has_inline = bool(attrs.get(XML_AN_INLINE, "") == "1")
+            calldef.has_extern = bool(attrs.get(XML_AN_EXTERN, False))
+            calldef.has_inline = bool(attrs.get(XML_AN_INLINE, False))
             throw_stmt = attrs.get(XML_AN_THROW)
             if None is throw_stmt:
                 calldef.does_throw = True
@@ -593,9 +597,9 @@ def __read_calldef(self, calldef, attrs, is_declaration):
 
     def __read_member_function(self, calldef, attrs, is_declaration):
         self.__read_calldef(calldef, attrs, is_declaration)
-        calldef.has_const = attrs.get(XML_AN_CONST, False)
+        calldef.has_const = bool(attrs.get(XML_AN_CONST, False))
         if is_declaration:
-            calldef.has_static = attrs.get(XML_AN_STATIC, False)
+            calldef.has_static = bool(attrs.get(XML_AN_STATIC, False))
             if XML_AN_PURE_VIRTUAL in attrs:
                 calldef.virtuality = declarations.VIRTUALITY_TYPES.PURE_VIRTUAL
             elif XML_AN_VIRTUAL in attrs:
@@ -626,9 +630,9 @@ def __read_typedef(self, attrs):
 
     def __read_variable(self, attrs):
         type_qualifiers = declarations.type_qualifiers_t()
-        type_qualifiers.has_mutable = attrs.get(XML_AN_MUTABLE, False)
-        type_qualifiers.has_static = attrs.get(XML_AN_STATIC, False)
-        type_qualifiers.has_extern = attrs.get(XML_AN_EXTERN, False)
+        type_qualifiers.has_mutable = bool(attrs.get(XML_AN_MUTABLE, False))
+        type_qualifiers.has_static = bool(attrs.get(XML_AN_STATIC, False))
+        type_qualifiers.has_extern = bool(attrs.get(XML_AN_EXTERN, False))
         bits = attrs.get(XML_AN_BITS)
         if bits:
             bits = int(bits)

src/pygccxml/parser/config.py

@@ -8,7 +8,6 @@
 
 """
 
-from .utils import is_str
 from .utils import get_architecture
 from .utils import loggers
 from .utils import create_temp_file_name