Allow copy local params, and allow reclaimed keywords as identifiers

Allow `copy` statement/block parameter, closes #393

Allow `class` and `struct` and other reclaimed words as declared names, closes #394

Author: hsutter

regression-tests/test-results/pure2-return-tuple-no-identifier-error.cpp2.output

@@ -1,2 +1,4 @@
+pure2-return-tuple-no-identifier-error.cpp2...
 pure2-return-tuple-no-identifier-error.cpp2(1,11): error: expected identifier, not 'int'
 pure2-return-tuple-no-identifier-error.cpp2(1,16): error: expected identifier, not 'int'
+

regression-tests/test-results/pure2-return-tuple-no-type-error.cpp2.output

@@ -1,2 +1,4 @@
+pure2-return-tuple-no-type-error.cpp2...
 pure2-return-tuple-no-type-error.cpp2(1,11): error: return parameter 'a' must have a type
 pure2-return-tuple-no-type-error.cpp2(1,14): error: return parameter 'b' must have a type
+

regression-tests/test-results/pure2-types-inheritance.cpp

@@ -92,14 +92,14 @@ auto main() -> int;
 //=== Cpp2 function definitions =================================================
 
 
-    
+
     Human::~Human(){}
 #line 6 "pure2-types-inheritance.cpp2"
 namespace N {
 
         template <int I> Machine<I>::Machine(cpp2::in<std::string> id){}
-        template <int I> 
-        Machine<I>::~Machine(){}
+
+        template <int I> Machine<I>::~Machine(){}
 
 #line 11 "pure2-types-inheritance.cpp2"
 }

regression-tests/test-results/pure2-types-ordering-via-meta-functions.cpp

@@ -96,6 +96,7 @@ auto main() -> int;
 #line 4 "pure2-types-ordering-via-meta-functions.cpp2"
     }
 
+
 #line 9 "pure2-types-ordering-via-meta-functions.cpp2"
     case_insensitive_string::case_insensitive_string(cpp2::in<std::string> val)
                                                 : v{ val }
@@ -108,6 +109,7 @@ auto main() -> int;
 #line 9 "pure2-types-ordering-via-meta-functions.cpp2"
     }
 
+
 #line 14 "pure2-types-ordering-via-meta-functions.cpp2"
     person_in_family_tree::person_in_family_tree(cpp2::in<int> parents)
                                             : dummy_data{ parents }
@@ -119,20 +121,20 @@ auto main() -> int;
                                             return *this;
 #line 14 "pure2-types-ordering-via-meta-functions.cpp2"
     }
-    
+
+
     mystruct::mystruct(mystruct const& that)
                                 : val{ that.val }{}
 
-    auto mystruct::operator=(mystruct const& that) -> mystruct& {
+auto mystruct::operator=(mystruct const& that) -> mystruct& {
                                 val = that.val;
                                 return *this;}
-    mystruct::mystruct(mystruct&& that)
+mystruct::mystruct(mystruct&& that)
                                 : val{ std::move(that).val }{}
-    auto mystruct::operator=(mystruct&& that) -> mystruct& {
+auto mystruct::operator=(mystruct&& that) -> mystruct& {
                                 val = std::move(that).val;
                                 return *this;}
-    
-    mystruct::mystruct(){}
+mystruct::mystruct(){}
 #line 21 "pure2-types-ordering-via-meta-functions.cpp2"
 auto main() -> int{
     my_integer a {1}; 

regression-tests/test-results/pure2-types-value-types-via-meta-functions.cpp

@@ -92,20 +92,20 @@ template<typename T> auto test() -> void;
                                       return *this;
 #line 4 "pure2-types-value-types-via-meta-functions.cpp2"
     }
-    
+
+
     widget::widget(widget const& that)
                                 : val{ that.val }{}
 
-    auto widget::operator=(widget const& that) -> widget& {
+auto widget::operator=(widget const& that) -> widget& {
                                 val = that.val;
                                 return *this;}
-    widget::widget(widget&& that)
+widget::widget(widget&& that)
                                 : val{ std::move(that).val }{}
-    auto widget::operator=(widget&& that) -> widget& {
+auto widget::operator=(widget&& that) -> widget& {
                                 val = std::move(that).val;
                                 return *this;}
-    
-    widget::widget(){}
+widget::widget(){}
 #line 9 "pure2-types-value-types-via-meta-functions.cpp2"
     w_widget::w_widget(cpp2::in<int> i)
                                       : val{ i }
@@ -117,20 +117,20 @@ template<typename T> auto test() -> void;
                                       return *this;
 #line 9 "pure2-types-value-types-via-meta-functions.cpp2"
     }
-    
+
+
     w_widget::w_widget(w_widget const& that)
                                 : val{ that.val }{}
 
-    auto w_widget::operator=(w_widget const& that) -> w_widget& {
+auto w_widget::operator=(w_widget const& that) -> w_widget& {
                                 val = that.val;
                                 return *this;}
-    w_widget::w_widget(w_widget&& that)
+w_widget::w_widget(w_widget&& that)
                                 : val{ std::move(that).val }{}
-    auto w_widget::operator=(w_widget&& that) -> w_widget& {
+auto w_widget::operator=(w_widget&& that) -> w_widget& {
                                 val = std::move(that).val;
                                 return *this;}
-    
-    w_widget::w_widget(){}
+w_widget::w_widget(){}
 #line 14 "pure2-types-value-types-via-meta-functions.cpp2"
     p_widget::p_widget(cpp2::in<int> i)
                                       : val{ i }
@@ -142,20 +142,20 @@ template<typename T> auto test() -> void;
                                       return *this;
 #line 14 "pure2-types-value-types-via-meta-functions.cpp2"
     }
-    
+
+
     p_widget::p_widget(p_widget const& that)
                                 : val{ that.val }{}
 
-    auto p_widget::operator=(p_widget const& that) -> p_widget& {
+auto p_widget::operator=(p_widget const& that) -> p_widget& {
                                 val = that.val;
                                 return *this;}
-    p_widget::p_widget(p_widget&& that)
+p_widget::p_widget(p_widget&& that)
                                 : val{ std::move(that).val }{}
-    auto p_widget::operator=(p_widget&& that) -> p_widget& {
+auto p_widget::operator=(p_widget&& that) -> p_widget& {
                                 val = std::move(that).val;
                                 return *this;}
-    
-    p_widget::p_widget(){}
+p_widget::p_widget(){}
 #line 17 "pure2-types-value-types-via-meta-functions.cpp2"
 auto main() -> int{
     test<widget>();

regression-tests/test-results/run-tests.bat

@@ -1,4 +1,5 @@
 @echo off
+cppfront.exe -version > version
 del *.cpp *.output
 copy ..\*.cpp2 .
 set count=0

regression-tests/test-results/version

@@ -0,0 +1,9 @@
+
+cppfront compiler - v0.2.1, build 8427:1621
+Copyright(c) Herb Sutter, all rights reserved
+
+SPDX-License-Identifier: CC-BY-NC-ND-4.0
+  No commercial use
+  No forks/derivatives
+
+Absolutely no warranty - try at your own risk

source/common.h

@@ -744,17 +744,30 @@ class cmdline_processor
     auto print_version()
         -> void
     {
+        auto stamp = [](
+            std::string_view a = __DATE__, 
+            std::string_view b = __TIME__
+        )
+            -> std::string
+        {
+            std::unordered_map<std::string_view, char> m = { {"Jan",'1'}, {"Feb",'2'}, {"Mar",'3'}, {"Apr",'4'}, {"May",'5'}, {"Jun",'6'}, {"Jul",'7'}, {"Aug",'8'}, {"Sep",'9'}, {"Oct",'A'}, {"Nov",'B'}, {"Dec",'C'} };
+
+            auto ret = std::to_string(atoi(&a[9])-15);
+            ret += m[a.substr(0, 3)];
+            ret += a.substr(4,2);
+            ret += ":";
+            ret += b.substr(0,2);
+            ret += b.substr(3,2);
+            return ret;
+        };
+
         help_requested = true;
-        print("cppfront 0.1.1 compiler\nCopyright (C) Herb Sutter\n");
-        print("All rights reserved\n");
+        print("\ncppfront compiler - v0.2.1, build " + stamp());
+        print("\nCopyright(c) Herb Sutter, all rights reserved\n");
         print("\nSPDX-License-Identifier: CC-BY-NC-ND-4.0");
         print("\n  No commercial use");
-        print("\n  No forks/derivatives");
-        print("\n");
-        print("\nNote: This is a hilariously incomplete personal project.");
-        print("\nIt's known to be incomplet and incorrekt, and it has lots of b");
-        print("\nad formAt ting. Absolutely no warranty - try at your own risk.");
-        print("\n");
+        print("\n  No forks/derivatives\n");
+        print("\nAbsolutely no warranty - try at your own risk\n");
     }
 
 } cmdline;

source/cppfront.cpp

@@ -725,19 +725,24 @@ class positional_printer
     )
         -> void
     {
-        //  If we are in a generated text region (signified by negative
-        //  line numbers) shunt this call to print_extra instead
-        if (pos.lineno < 0) {
-            if (generated_pos_line != pos.lineno) {
-                *out << "\n" + std::string(last_line_indentation, ' ');
-                generated_pos_line = pos.lineno;
-            }
-            print_extra(s);
-            return;
-        }
+        //  If we're printing for real (not to a string target)
+        if (emit_target_stack.empty())
+        {
+            //  If we're in a generated text region (signified by negative
+            //  line numbers), then shunt this call to print_extra instead
+            if (pos.lineno < 1) {
+                if (generated_pos_line != pos.lineno) {
+                    *out << "\n" + std::string(last_line_indentation, ' ');
+                    generated_pos_line = pos.lineno;
+                }
+                print_extra(s);
+                return;
+            }
 
-        //  No longer in generated code, so reset the generated code counter
-        generated_pos_line = {};
+            //  Otherwise, we're no longer in generated code, so reset the
+            //  generated code counter
+            generated_pos_line = {};
+        }
 
         assert(
             is_open()
@@ -1549,6 +1554,7 @@ class cppfront
             || n == "xor"
             || n == "xor_eq"
             || n == "new"
+            || n == "class"
             || n == "struct"
             )
         {
@@ -4625,46 +4631,6 @@ class cppfront
                 ++object;
             }
 
-            ////  Each remaining object is required to have a default initializer,
-            ////  since it had no explicit initialization statement
-            //for (
-            //    ;
-            //    object != objects.end();
-            //    ++object
-            //    )
-            //{
-            //    auto object_name = canonize_object_name(*object);
-
-            //    if ((*object)->initializer)
-            //    {
-            //        //  Good. Entering here avoids emitting the error on the 'else'
-
-            //        auto initializer = print_to_string( *(*object)->initializer, false );
-            //        if (initializer.empty()) {
-            //            initializer = "{}";
-            //        }
-
-            //        //  Need to actually emit the initializer in an assignment operator
-            //        if (is_assignment)
-            //        {
-            //            current_functions.back().prolog.statements.push_back(
-            //                object_name +
-            //                " = " +
-            //                initializer +
-            //                ";"
-            //            );
-            //        }
-            //    }
-            //    else
-            //    {
-            //        errors.emplace_back(
-            //            n.position(),
-            //            object_name + " was not initialized in the operator= body and has no default initializer - " + error_msg
-            //        );
-            //        return;
-            //    }
-            //}
-
             //  Now no data members should be left over
             if (object != objects.end())
             {
@@ -4687,8 +4653,8 @@ class cppfront
         {
             printer.print_cpp2( prefix, n.position() );
             printer.print_cpp2( type_qualification_if_any_for(n), n.position() );
-            printer.print_cpp2( *n.parent_declaration->name(), n.position() );
-            emit( *func, n.name(), false, true);
+            printer.print_cpp2( print_to_string( *n.parent_declaration->name() ), n.position() );
+            emit( *func, n.name(), false, true );
         }
         //  For an assignment operator, similar to emitting an ordinary function
         else
@@ -4698,9 +4664,8 @@ class cppfront
                 && !current_functions.empty()
             );
             current_functions.back().epilog.push_back( "return *this;");
-            printer.print_cpp2( "auto " + type_qualification_if_any_for(n), n.position() );
-            printer.print_cpp2( *n.name(), n.identifier->position());
-            emit( *func, n.name());
+            printer.print_cpp2( "auto " + type_qualification_if_any_for(n) + print_to_string( *n.name() ), n.position());
+            emit( *func, n.name() );
         }
     }
 
@@ -4728,6 +4693,15 @@ class cppfront
             return;
         }
 
+        //  If this is a generated declaration (negative source line number),
+        //  add a line break before 
+        if (
+            printer.get_phase() == printer.phase2_func_defs
+            && n.position().lineno < 1
+            )
+        {
+            printer.print_extra("\n");
+        }
 
         //  Handle aliases
 
@@ -4894,7 +4868,7 @@ class cppfront
                 if (emit_as_base) {
                     printer.print_extra(
                         "\nstruct "
-                            + decl->parent_declaration->name()->to_string(true)
+                            + print_to_string(*decl->parent_declaration->name())
                             + "_"
                             + decl->name()->to_string(true)
                             + "_as_base { "
@@ -5074,7 +5048,7 @@ class cppfront
                             printer.print_cpp2(
                                 separator
                                     + " public "
-                                    + decl->parent_declaration->name()->to_string(true)
+                                    + print_to_string(*decl->parent_declaration->name())
                                     + "_"
                                     + decl->name()->to_string(true)
                                     + "_as_base",
@@ -5420,7 +5394,7 @@ class cppfront
                     printer.print_cpp2(
                         prefix
                             + type_qualification_if_any_for(n)
-                            + "~" + n.parent_declaration->name()->to_string(true),
+                            + "~" + print_to_string(*n.parent_declaration->name()),
                         n.position()
                     );
                     emit( *func, n.name(), false, true);

source/lex.h

@@ -929,7 +929,7 @@ auto lex_line(
         const auto keys = std::regex(
             "^alignas|^alignof|^asm|^as|^auto|"
             "^bool|^break|"
-            "^case|^catch|^char16_t|^char32_t|^char8_t|^char|^class|^co_await|^co_return|"
+            "^case|^catch|^char16_t|^char32_t|^char8_t|^char|^co_await|^co_return|"
             "^co_yield|^concept|^const_cast|^consteval|^constexpr|^constinit|^const|^continue|"
             "^decltype|^default|^double|^do|^dynamic_cast|"
             "^else|^enum|^explicit|^export|^extern|"