Update name of declared_that_funcs

hsutter · hsutter · commit 177006a885b7 · 2023-07-23T11:43:03.000-07:00
Also commit some unfinished `enum` work...
diff --git a/regression-tests/test-results/clang-12/run-tests-clang-12.sh b/regression-tests/test-results/clang-12/run-tests-clang-12.sh
@@ -22,4 +22,3 @@ done
 rm -f *.obj *.exp *.lib
 printf "\nDone: %s .cpp tests compiled\n" "$count"
 printf "\n      %s .cpp executables generated and run\n" "$exe_count"
-echo "$(date +"%T")"
diff --git a/regression-tests/test-results/gcc-13/run-tests-gcc-13.sh b/regression-tests/test-results/gcc-13/run-tests-gcc-13.sh
@@ -22,4 +22,3 @@ done
 rm -f *.obj *.exp *.lib
 printf "\nDone: %s .cpp tests compiled\n" "$count"
 printf "\n      %s .cpp executables generated and run\n" "$exe_count"
-echo "$(date +"%T")"
diff --git a/regression-tests/test-results/msvc-2022/MSVC-version.output b/regression-tests/test-results/msvc-2022/MSVC-version.output
@@ -1,3 +1,3 @@
-Microsoft (R) C/C++ Optimizing Compiler Version 19.36.32534 for x86
+Microsoft (R) C/C++ Optimizing Compiler Version 19.36.32537 for x86
 Copyright (C) Microsoft Corporation.  All rights reserved.
 
diff --git a/regression-tests/test-results/msvc-2022/run-tests-msvc-2022.bat b/regression-tests/test-results/msvc-2022/run-tests-msvc-2022.bat
@@ -24,4 +24,3 @@ echo.
 echo Done: %count% .cpp tests compiled
 echo.
 echo.      %exe_count% executables generated and run
-echo %TIME%
diff --git a/regression-tests/test-results/run-tests.bat b/regression-tests/test-results/run-tests.bat
@@ -29,4 +29,3 @@ echo.      %total_count% total
 if %total_count% NEQ %count% (
     echo.      *** MISMATCH: should equal total tests run
 )
-echo %TIME%
diff --git a/regression-tests/test-results/version b/regression-tests/test-results/version
@@ -1,5 +1,5 @@
 
-cppfront compiler v0.2.1   Build 8618:1139
+cppfront compiler v0.2.1   Build 8723:1124
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0
diff --git a/source/build.info b/source/build.info
@@ -1 +1 @@
-"8618:1139"
+"8723:1124"
diff --git a/source/cppfront.cpp b/source/cppfront.cpp
@@ -1024,17 +1024,17 @@ class cppfront
     //  their .epilog, by reference for performance while still having lifetime safety
     struct function_info
     {
-        declaration_node const*               decl                    = {};
-        declaration_node::declared_that_funcs declared_that_functions = {};
-        function_prolog                       prolog                  = {};
-        std::vector<std::string>              epilog                  = {};
+        declaration_node const*                    decl                         = {};
+        declaration_node::declared_value_set_funcs declared_value_set_functions = {};
+        function_prolog                            prolog                       = {};
+        std::vector<std::string>                   epilog                       = {};
 
         function_info(
             declaration_node const* decl_,
-            declaration_node::declared_that_funcs declared_that_functions_
+            declaration_node::declared_value_set_funcs declared_value_set_functions_
         )
             : decl{decl_}
-            , declared_that_functions{declared_that_functions_}
+            , declared_value_set_functions{declared_value_set_functions_}
         { }
     };
     class current_functions_
@@ -1043,7 +1043,7 @@ class cppfront
     public:
         auto push(
             declaration_node const*               decl,
-            declaration_node::declared_that_funcs thats
+            declaration_node::declared_value_set_funcs thats
         ) {
             list.emplace_back(decl, thats);
         }
@@ -5294,7 +5294,7 @@ class cppfront
 
             current_functions.push(
                 &n,
-                n.find_parent_declared_that_functions()
+                n.find_parent_declared_value_set_functions()
                 );
             auto guard = finally([&]{ current_functions.pop(); });
 
@@ -5443,8 +5443,8 @@ class cppfront
                             //  A1) This is '(out   this, that)'
                             //      and no  '(inout this, that)' was written by the user
                             (
-                                &n == current_functions.back().declared_that_functions.out_this_in_that
-                                && !current_functions.back().declared_that_functions.inout_this_in_that
+                                &n == current_functions.back().declared_value_set_functions.out_this_in_that
+                                && !current_functions.back().declared_value_set_functions.inout_this_in_that
                                 )
                             ||
                             //  A2) This is '(out   this, move that)'
@@ -5459,16 +5459,16 @@ class cppfront
                             //      assignment than like move construction, because assignments are designed
                             //      structurally to set the value of an existing 'this' object)
                             (
-                                &n == current_functions.back().declared_that_functions.out_this_move_that
-                                && !current_functions.back().declared_that_functions.inout_this_move_that
-                                && !current_functions.back().declared_that_functions.inout_this_in_that
+                                &n == current_functions.back().declared_value_set_functions.out_this_move_that
+                                && !current_functions.back().declared_value_set_functions.inout_this_move_that
+                                && !current_functions.back().declared_value_set_functions.inout_this_in_that
                                 )
                             ||
                             //  A3) This is '(out   this, something-other-than-that)'
                             (
                                 n.is_constructor()
                                 && !n.is_constructor_with_that()
-                                && !contains( current_functions.back().declared_that_functions.assignments_from, n.nth_parameter_type_name(2) )
+                                && !contains( current_functions.back().declared_value_set_functions.assignments_from, n.nth_parameter_type_name(2) )
                                 )
                             )
                         {
@@ -5483,15 +5483,15 @@ class cppfront
                                 //  M1) This is '(out   this,      that)'
                                 //      and no  '(out   this, move that)' was written by the user
                                 (
-                                    &n == current_functions.back().declared_that_functions.out_this_in_that
-                                    && !current_functions.back().declared_that_functions.out_this_move_that
+                                    &n == current_functions.back().declared_value_set_functions.out_this_in_that
+                                    && !current_functions.back().declared_value_set_functions.out_this_move_that
                                     )
                                 ||
                                 //  M2) This is '(inout this,      that)'
                                 //      and no  '(inout this, move that)' was written by the user
                                 (
-                                    &n == current_functions.back().declared_that_functions.inout_this_in_that
-                                    && !current_functions.back().declared_that_functions.inout_this_move_that
+                                    &n == current_functions.back().declared_value_set_functions.inout_this_in_that
+                                    && !current_functions.back().declared_value_set_functions.inout_this_move_that
                                     )
                                 )
                             {
diff --git a/source/parse.h b/source/parse.h
@@ -2875,16 +2875,16 @@ struct declaration_node
         return false;
     }
 
-    struct declared_that_funcs {
+    struct declared_value_set_funcs {
         declaration_node const*  out_this_in_that     = {};
         declaration_node const*  out_this_move_that   = {};
         declaration_node const*  inout_this_in_that   = {};
         declaration_node const*  inout_this_move_that = {};
         std::vector<std::string> assignments_from     = {};
     };
 
-    auto find_declared_that_functions() const
-        -> declared_that_funcs
+    auto find_declared_value_set_functions() const
+        -> declared_value_set_funcs
     {
         if (!initializer) {
             return {};
@@ -2893,7 +2893,7 @@ struct declaration_node
         auto compound_stmt = initializer->get_if<compound_statement_node>();
         assert (compound_stmt);
 
-        auto ret = declared_that_funcs{};
+        auto ret = declared_value_set_funcs{};
         for (auto& o : compound_stmt->statements)
         {
             auto decl = o->get_if<declaration_node>();
@@ -2920,11 +2920,11 @@ struct declaration_node
         return ret;
     }
 
-    auto find_parent_declared_that_functions() const
-        -> declared_that_funcs
+    auto find_parent_declared_value_set_functions() const
+        -> declared_value_set_funcs
     {
         if (parent_is_type()) {
-            return parent_declaration->find_declared_that_functions();
+            return parent_declaration->find_declared_value_set_functions();
         }
         //  else
         return {};
diff --git a/source/reflect.h b/source/reflect.h
diff --git a/source/reflect.h2 b/source/reflect.h2

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-Microsoft (R) C/C++ Optimizing Compiler Version 19.36.32534 for x86`
	`1`	`+Microsoft (R) C/C++ Optimizing Compiler Version 19.36.32537 for x86`
`2`	`2`	`Copyright (C) Microsoft Corporation. All rights reserved.`
`3`	`3`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,3 @@ echo. %total_count% total`
`29`	`29`	`if %total_count% NEQ %count% (`
`30`	`30`	`echo. *** MISMATCH: should equal total tests run`
`31`	`31`	`)`
`32`		`-echo %TIME%`
Original file line number	Diff line number	Diff line change
`@@ -1024,17 +1024,17 @@ class cppfront`
`1024`	`1024`	`// their .epilog, by reference for performance while still having lifetime safety`
`1025`	`1025`	`struct function_info`
`1026`	`1026`	`{`
`1027`		`- declaration_node const* decl = {};`
`1028`		`- declaration_node::declared_that_funcs declared_that_functions = {};`
`1029`		`- function_prolog prolog = {};`
`1030`		`- std::vector<std::string> epilog = {};`
	`1027`	`+ declaration_node const* decl = {};`
	`1028`	`+ declaration_node::declared_value_set_funcs declared_value_set_functions = {};`
	`1029`	`+ function_prolog prolog = {};`
	`1030`	`+ std::vector<std::string> epilog = {};`
`1031`	`1031`
`1032`	`1032`	`function_info(`
`1033`	`1033`	`declaration_node const* decl_,`
`1034`		`- declaration_node::declared_that_funcs declared_that_functions_`
	`1034`	`+ declaration_node::declared_value_set_funcs declared_value_set_functions_`
`1035`	`1035`	`)`
`1036`	`1036`	`: decl{decl_}`
`1037`		`- , declared_that_functions{declared_that_functions_}`
	`1037`	`+ , declared_value_set_functions{declared_value_set_functions_}`
`1038`	`1038`	`{ }`
`1039`	`1039`	`};`
`1040`	`1040`	`class current_functions_`
`@@ -1043,7 +1043,7 @@ class cppfront`
`1043`	`1043`	`public:`
`1044`	`1044`	`auto push(`
`1045`	`1045`	`declaration_node const* decl,`
`1046`		`- declaration_node::declared_that_funcs thats`
	`1046`	`+ declaration_node::declared_value_set_funcs thats`
`1047`	`1047`	`) {`
`1048`	`1048`	`list.emplace_back(decl, thats);`
`1049`	`1049`	`}`
`@@ -5294,7 +5294,7 @@ class cppfront`
`5294`	`5294`
`5295`	`5295`	`current_functions.push(`
`5296`	`5296`	`&n,`
`5297`		`- n.find_parent_declared_that_functions()`
	`5297`	`+ n.find_parent_declared_value_set_functions()`
`5298`	`5298`	`);`
`5299`	`5299`	`auto guard = finally([&]{ current_functions.pop(); });`
`5300`	`5300`
`@@ -5443,8 +5443,8 @@ class cppfront`
`5443`	`5443`	`// A1) This is '(out this, that)'`
`5444`	`5444`	`// and no '(inout this, that)' was written by the user`
`5445`	`5445`	`(`
`5446`		`- &n == current_functions.back().declared_that_functions.out_this_in_that`
`5447`		`- && !current_functions.back().declared_that_functions.inout_this_in_that`
	`5446`	`+ &n == current_functions.back().declared_value_set_functions.out_this_in_that`
	`5447`	`+ && !current_functions.back().declared_value_set_functions.inout_this_in_that`
`5448`	`5448`	`)`
`5449`	`5449`	`\|\|`
`5450`	`5450`	`// A2) This is '(out this, move that)'`
`@@ -5459,16 +5459,16 @@ class cppfront`
`5459`	`5459`	`// assignment than like move construction, because assignments are designed`
`5460`	`5460`	`// structurally to set the value of an existing 'this' object)`
`5461`	`5461`	`(`
`5462`		`- &n == current_functions.back().declared_that_functions.out_this_move_that`
`5463`		`- && !current_functions.back().declared_that_functions.inout_this_move_that`
`5464`		`- && !current_functions.back().declared_that_functions.inout_this_in_that`
	`5462`	`+ &n == current_functions.back().declared_value_set_functions.out_this_move_that`
	`5463`	`+ && !current_functions.back().declared_value_set_functions.inout_this_move_that`
	`5464`	`+ && !current_functions.back().declared_value_set_functions.inout_this_in_that`
`5465`	`5465`	`)`
`5466`	`5466`	`\|\|`
`5467`	`5467`	`// A3) This is '(out this, something-other-than-that)'`
`5468`	`5468`	`(`
`5469`	`5469`	`n.is_constructor()`
`5470`	`5470`	`&& !n.is_constructor_with_that()`
`5471`		`- && !contains( current_functions.back().declared_that_functions.assignments_from, n.nth_parameter_type_name(2) )`
	`5471`	`+ && !contains( current_functions.back().declared_value_set_functions.assignments_from, n.nth_parameter_type_name(2) )`
`5472`	`5472`	`)`
`5473`	`5473`	`)`
`5474`	`5474`	`{`
`@@ -5483,15 +5483,15 @@ class cppfront`
`5483`	`5483`	`// M1) This is '(out this, that)'`
`5484`	`5484`	`// and no '(out this, move that)' was written by the user`
`5485`	`5485`	`(`
`5486`		`- &n == current_functions.back().declared_that_functions.out_this_in_that`
`5487`		`- && !current_functions.back().declared_that_functions.out_this_move_that`
	`5486`	`+ &n == current_functions.back().declared_value_set_functions.out_this_in_that`
	`5487`	`+ && !current_functions.back().declared_value_set_functions.out_this_move_that`
`5488`	`5488`	`)`
`5489`	`5489`	`\|\|`
`5490`	`5490`	`// M2) This is '(inout this, that)'`
`5491`	`5491`	`// and no '(inout this, move that)' was written by the user`
`5492`	`5492`	`(`
`5493`		`- &n == current_functions.back().declared_that_functions.inout_this_in_that`
`5494`		`- && !current_functions.back().declared_that_functions.inout_this_move_that`
	`5493`	`+ &n == current_functions.back().declared_value_set_functions.inout_this_in_that`
	`5494`	`+ && !current_functions.back().declared_value_set_functions.inout_this_move_that`
`5495`	`5495`	`)`
`5496`	`5496`	`)`
`5497`	`5497`	`{`