Correctly cpp2::-qualify unique.new and shared.new

Closes #939

Author: hsutter

regression-tests/test-results/version

@@ -1,5 +1,5 @@
 
-cppfront compiler v0.3.0   Build 9115:1948
+cppfront compiler v0.3.0   Build 9116:1001
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0

source/build.info

@@ -1 +1 @@
-"9115:1948"
+"9116:1001"

source/lex.h

@@ -810,6 +810,46 @@ auto lex_line(
     };
 
 
+    auto qualify_cpp2_special_names = [&]
+    {
+        auto i = std::ssize(tokens)-1;
+
+        //  If the last three tokens are "unique/shared" "." "new", add "cpp2::"
+
+        if (
+            i >= 2
+            && (tokens[i-2] == "unique" || tokens[i-2] == "shared")
+            && tokens[i-1] == "."
+            && tokens[i] == "new"
+            )
+        {
+            auto pos = tokens[i-2].position();
+
+            generated_text.push_back( "cpp2" );
+            tokens.insert(
+                tokens.end()-3,
+                token{
+                    &generated_text.back()[0],
+                    std::ssize(generated_text.back()),
+                    pos,
+                    lexeme::Identifier
+                }
+            );
+
+            generated_text.push_back( "::" );
+            tokens.insert(
+                tokens.end()-3,
+                token{
+                    &generated_text.back()[0],
+                    std::ssize(generated_text.back()),
+                    pos,
+                    lexeme::Scope
+                }
+            );
+        }
+    };
+
+
     //  Local helper functions for readability
     //
     auto peek = [&](int num) {
@@ -831,6 +871,7 @@ auto lex_line(
 
         merge_cpp1_multi_token_fundamental_type_names();
         merge_operator_function_names();
+        qualify_cpp2_special_names();
     };
 
 

source/to_cpp1.h

@@ -1743,6 +1743,7 @@ class cppfront
     )
         -> void
     {   STACKINSTR
+        assert( n.identifier );
         auto last_use = is_definite_last_use(n.identifier);
 
         bool add_forward =
@@ -1862,20 +1863,6 @@ class cppfront
             return;
         }
 
-        //  Implicit "cpp2::" qualification of "unique.new" and "shared.new"
-        if (
-            n.ids.size() == 2
-            && (
-                *n.ids[0].id->identifier == "unique"
-                || *n.ids[0].id->identifier == "shared"
-                )
-            && *n.ids[1].scope_op == "."
-            && *n.ids[1].id->identifier == "new"
-            )
-        {
-            printer.print_cpp2("cpp2::", n.position());
-        }
-
         auto ident = std::string{};
         printer.emit_to_string(&ident);