Emit template-heads of type-scope object aliases in correct order, closes #802

Author: hsutter

regression-tests/mixed-fixed-type-aliases.cpp2

@@ -12,6 +12,10 @@ test: (x:_) = {
         << "\n";
 }
 
+mytype: @struct <T> type = {
+    myvalue: <U> bool == true;
+}
+
 main: (args) -> int = {
     y: my::u16 = 42;
     test(y);
@@ -21,4 +25,6 @@ main: (args) -> int = {
 
     for args do (arg)
         std::cout << std::filesystem::path(arg).filename() << "\n";
+
+    std::cout << "(mytype<int>::myvalue<int>)$\n";
 }

regression-tests/test-results/clang-12/mixed-fixed-type-aliases.cpp.execution

@@ -1,3 +1,4 @@
 true
 false
 "test.exe"
+true

regression-tests/test-results/gcc-10/mixed-fixed-type-aliases.cpp.execution

@@ -1,3 +1,4 @@
 true
 false
 "test.exe"
+true

regression-tests/test-results/gcc-13/mixed-fixed-type-aliases.cpp.execution

@@ -1,3 +1,4 @@
 true
 false
 "test.exe"
+true

regression-tests/test-results/mixed-fixed-type-aliases.cpp

@@ -6,6 +6,9 @@
 #include "cpp2util.h"
 
 
+#line 15 "mixed-fixed-type-aliases.cpp2"
+template<typename T> class mytype;
+    
 
 //=== Cpp2 type definitions and function declarations ===========================
 
@@ -22,6 +25,10 @@ auto test(auto const& x) -> void;
 
 
 #line 15 "mixed-fixed-type-aliases.cpp2"
+template<typename T> class mytype {
+    public: template<typename U> static const bool myvalue;
+};
+
 [[nodiscard]] auto main(int const argc_, char** argv_) -> int;
 
 
@@ -35,9 +42,13 @@ auto test(auto const& x) -> void{
         << "\n";
 }
 
+#line 16 "mixed-fixed-type-aliases.cpp2"
+    template <typename T> template<typename U> inline CPP2_CONSTEXPR bool mytype<T>::myvalue = true;
+
+#line 19 "mixed-fixed-type-aliases.cpp2"
 [[nodiscard]] auto main(int const argc_, char** argv_) -> int{
     auto const args = cpp2::make_args(argc_, argv_); 
-#line 16 "mixed-fixed-type-aliases.cpp2"
+#line 20 "mixed-fixed-type-aliases.cpp2"
     my::u16 y {42}; 
     test(std::move(y));
 
@@ -46,5 +57,7 @@ auto test(auto const& x) -> void{
 
     for ( auto const& arg : args ) 
         std::cout << CPP2_UFCS_0(filename, std::filesystem::path(arg)) << "\n";
+
+    std::cout << cpp2::to_string(mytype<int>::myvalue<int>) + "\n";
 }
 

regression-tests/test-results/msvc-2022/mixed-fixed-type-aliases.cpp.execution

@@ -1,3 +1,4 @@
 true
 false
 "test.exe"
+true

regression-tests/test-results/version

@@ -1,5 +1,5 @@
 
-cppfront compiler v0.3.0   Build 8B13:1628
+cppfront compiler v0.3.0   Build 8B14:0859
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0

source/build.info

@@ -1 +1 @@
-"8B13:1628"
+"8B14:0859"

source/to_cpp1.h

@@ -5133,6 +5133,15 @@ class cppfront
                 }
 
                 //  Emit template parameters if any
+                if (
+                    a->is_object_alias()
+                    && n.parent_is_type()
+                    && printer.get_phase() == printer.phase2_func_defs
+                    )
+                {
+                    emit_parent_template_parameters();
+                }
+
                 if (n.template_parameters) {
                     printer.print_cpp2("template", n.position());
                     emit(*n.template_parameters, false, true);
@@ -5202,7 +5211,6 @@ class cppfront
                                 return;
                             }
 
-                            emit_parent_template_parameters();
                             printer.print_cpp2(
                                 "inline CPP2_CONSTEXPR "
                                     + type