fix(cpp1): recognize alias to _qualified-id_

Author: JohelEGP

regression-tests/pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2

@@ -26,6 +26,8 @@ f: <T, V: T::value_type> (x: T::value_type) -> T::value_type = {
   _ = :w::value_type = x;
   v: type == w;
   _ = :v::value_type = x;
+  a: type == T::type;
+  _ = :a::value_type = x;
 
   {
     // Test that there's no prefixed `typename` to....

regression-tests/test-results/pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp

@@ -7,11 +7,11 @@
 #include "cpp2util.h"
 
 
-#line 44 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 46 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
 template<typename T> class t;
 
 
-#line 89 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 91 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
 template<typename T> class v;
 
 
@@ -23,14 +23,14 @@ template<typename T> using identity = T;
 template<typename T, T::value_type V> [[nodiscard]] auto f(cpp2::in<typename T::value_type> x) -> T::value_type;
 
 
-#line 44 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 46 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
 template<typename T> class t {
 struct u_x_as_base { T::value_type x; };
 
-#line 45 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 47 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
   public: class u: public u_x_as_base, public T::type {
 
-#line 48 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 50 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
   };
   public: T::value_type x {0}; 
 };
@@ -45,15 +45,15 @@ template<typename T> auto id(cpp2::in<std::integral_constant<cpp2::i32,T::value>
 auto main() -> int;
 
 
-#line 89 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 91 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
 template<typename T> class v {
   public: explicit v(T const& x);
-#line 90 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 92 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
   public: auto operator=(T const& x) -> v& ;
 
   public: v(v const&) = delete; /* No 'that' constructor, suppress copy */
   public: auto operator=(v const&) -> void = delete;
-#line 91 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 93 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
 };
 
 
@@ -65,7 +65,7 @@ template<typename T, T::value_type V> [[nodiscard]] auto f(cpp2::in<typename T::
   cpp2::Default.expects(cpp2::is<typename T::value_type>(x), "");
   cpp2::deferred_init<typename T::value_type> y; 
   y.construct(x);
-  using z = typename T::value_type;
+  using z = T::value_type;
   return { typename T::value_type{x} }; 
 
   // Dependent *template-id*s.
@@ -87,6 +87,8 @@ template<typename T, T::value_type V> [[nodiscard]] auto f(cpp2::in<typename T::
   (void) typename w::value_type{x};
   using v = w;
   (void) typename v::value_type{x};
+  using a = T::type;
+  (void) typename a::value_type{x};
 
   {
     // Test that there's no prefixed `typename` to....
@@ -102,7 +104,7 @@ template<typename T, T::value_type V> [[nodiscard]] auto f(cpp2::in<typename T::
   }
 }
 
-#line 54 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 56 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
 template<typename T> auto init(cpp2::out<std::integral_constant<cpp2::i32,T::value>> x) -> void{x.construct(); }
 template<typename T> auto init(cpp2::out<std::integral_constant<cpp2::i32,T::value>> x, T const& _) -> void{x.construct(); }
 template<typename T> [[nodiscard]] auto id(cpp2::in<std::integral_constant<cpp2::i32,T::value>> x) -> auto&& { return x;  }
@@ -138,11 +140,11 @@ auto main() -> int{
   (void) []<typename T>(cpp2::in<typename T::value_type> x) -> void{(void) []() -> void{(void) []() -> void{(void) []() -> void{}; }; }; };
 }
 
-#line 90 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 92 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
   template <typename T> v<T>::v(T const& x){}
-#line 90 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 92 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
   template <typename T> auto v<T>::operator=(T const& x) -> v& {
                                   return *this;
-#line 90 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
+#line 92 "pure2-bugfix-for-dependent-types-and-deducible-parameters.cpp2"
   }
 

source/cppfront.cpp

@@ -1794,13 +1794,11 @@ class cppfront
     auto is_dependent(const type_id_node& n)
         -> bool
     {
-        // Its value is an _unqualified-id_
-        if (n.id.index() == type_id_node::unqualified) {
-            auto& id = *get_if<type_id_node::unqualified>(&n.id);
-            if (id->open_angle == source_position{}) {
-                // that is dependent.
-                return is_dependent(*id);
-            }
+        if (auto qual = get_if<id_expression_node::qualified>(&n.id)) {
+            return is_dependent(**qual);
+        }
+        else if (auto unqual = get_if<id_expression_node::unqualified>(&n.id)) {
+            return is_dependent(**unqual);
         }
         return false;
     }
@@ -5069,7 +5067,7 @@ class cppfront
                         "using "
                             + print_to_string(*n.identifier)
                             + " = "
-                            + print_to_string( *std::get<alias_node::a_type>(a->initializer) )
+                            + print_to_string( *std::get<alias_node::a_type>(a->initializer), true )
                             + ";\n",
                         n.position()
                     );