Add support of multi-level pointers

Author: filipsajdak

source/cppfront.cpp

@@ -1071,6 +1071,10 @@ class cppfront
         assert(n.identifier);
         emit(*n.identifier);
 
+        for (auto _ : n.pointer_declarators) {
+            printer.print_cpp2("*", n.position());
+        }
+
         if (!n.template_args.empty()) {
             printer.print_cpp2("<", n.open_angle);
             auto first = true;
@@ -1572,9 +1576,9 @@ class cppfront
                 auto& unqual = std::get<id_expression_node::unqualified>(id->id);
                 assert(unqual);
                 auto decl = sema.get_declaration_of(*unqual->identifier);
-                //  TODO: Generalize this -- for now we detect only cases of the form "p: *int = ...;"
-                //        We don't recognize pointer types that are deduced, multi-level, or from Cpp1
-                if (decl && decl->declaration && decl->declaration->pointer_declarator) {
+                //  TODO: Generalize this -- for now we detect only multi-level cases of the form "p: ***int = ...;"
+                //        We don't recognize pointer types that are deduced or from Cpp1
+                if (decl && decl->declaration && !decl->declaration->pointer_declarators.empty()) {
                     if (n.ops.empty()) {
                         last_postfix_expr_was_pointer = true;
                     }
@@ -2155,10 +2159,6 @@ class cppfront
         }
         else {
             emit( id_expr );
-            if (n.declaration->pointer_declarator) {
-                printer.print_cpp2(" ", n.declaration->pointer_declarator->position());
-                emit(*n.declaration->pointer_declarator);
-            }
         }
 
         //  Then any suffix
@@ -2538,9 +2538,6 @@ class cppfront
                 }
                 printer.preempt_position(n.position());
                 emit( *type );
-                if (n.pointer_declarator) {
-                    printer.print_cpp2("*", n.position());
-                }
                 //  one pointer is enough for now, pointer-to-function fun can be later
                 if (!n.initializer) {
                     printer.print_cpp2( ">", n.position() );

source/parse.h

@@ -846,7 +846,7 @@ struct declaration_node
     source_position pos;
     std::unique_ptr<unqualified_id_node> identifier;
 
-    token const* pointer_declarator = nullptr;
+    std::vector<token const*> pointer_declarators;
 
     enum active { function, object };
     std::variant<
@@ -2812,8 +2812,10 @@ class parser
 
         //  Or a pointer to a type, declaring a pointer object
         else if (curr().type() == lexeme::Multiply) {
-            n->pointer_declarator = &curr();
-            next();
+            while (curr().type() == lexeme::Multiply) {
+                n->pointer_declarators.push_back(&curr());
+                next();
+            }
             if (auto t = id_expression()) {
                 n->type = std::move(t);
                 assert (n->type.index() == declaration_node::object);
@@ -2866,7 +2868,7 @@ class parser
             n->equal_sign = curr().position();
             next();
 
-            if (n->pointer_declarator) {
+            if (!n->pointer_declarators.empty()) {
                 if (curr() == "nullptr" ||
                     isdigit(std::string_view(curr())[0]) ||
                     (curr() == "(" && peek(1) && *peek(1) == ")")