Follow template type deduction through multiple specializations.

40d62647 · Robert Bradshaw · 8559d411 · 40d62647
Commit 40d62647 authored Dec 20, 2016 by Robert Bradshaw
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 8 deletions

Cython/Compiler/PyrexTypes.py Cython/Compiler/PyrexTypes.py +11 -8

No files found.
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -3510,14 +3510,17 @@ class CppClassType(CType):
                    for base in all_bases(parent):
                        yield base
            for actual_base in all_bases(actual):
-                if (actual_base.template_type
+                template_type = actual_base
-                    and self_template_type.empty_declaration_code()
+                while getattr(template_type, 'template_type', None):
-                        == actual_base.template_type.empty_declaration_code()):
+                    template_type = template_type.template_type
-                    return reduce(
+                    if (self_template_type.empty_declaration_code()
-                        merge_template_deductions,
+                            == template_type.empty_declaration_code()):
-                        [formal_param.deduce_template_params(actual_param)
+                        return reduce(
-                         for (formal_param, actual_param) in zip(self.templates, actual_base.templates)],
+                            merge_template_deductions,
-                        {})
+                            [formal_param.deduce_template_params(actual_param)
+                             for (formal_param, actual_param)
+                             in zip(self.templates, actual_base.templates)],
+                            {})
        else:
            return {}