Cleanup and simplification of comment and #line emission logic

Another step preparing to separate decl/defn comment emission, but for now continue to emit all the comments on the definitions

While we're at it, add a "no comment left behind" debug check

Author: hsutter

regression-tests/test-results/mixed-allcpp1-hello.cpp

@@ -13,4 +13,3 @@ auto main() -> int
     auto s = std::string{"world\n"};
     std::cout << "Hello " << s;
 }
-

regression-tests/test-results/mixed-as-for-variant-20-types.cpp

@@ -5,14 +5,13 @@ struct X { operator int() const { return I; } };
 
 #include "cpp2util.h"
 
-
 #line 4 "mixed-as-for-variant-20-types.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 3 "mixed-as-for-variant-20-types.cpp2"
 
+#line 4 "mixed-as-for-variant-20-types.cpp2"
 [[nodiscard]] auto main() -> int{
 
     std::variant<X<0>,X<1>,X<2>,X<3>,X<4>,X<5>,X<6>,X<7>,X<8>,X<9>,X<10>,X<11>,X<12>,X<13>,X<14>,X<15>,X<16>,X<17>,X<18>,X<19>> v {

regression-tests/test-results/mixed-bounds-check.cpp

@@ -5,14 +5,13 @@
 
 #include "cpp2util.h"
 
-
 #line 4 "mixed-bounds-check.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 3 "mixed-bounds-check.cpp2"
 
+#line 4 "mixed-bounds-check.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector v {1, 2, 3, 4, 5, -999}; 
     CPP2_UFCS_0(pop_back, v);

regression-tests/test-results/mixed-bounds-safety-with-assert-2.cpp

@@ -2,9 +2,9 @@
 
 #include "cpp2util.h"
 
-
 #line 2 "mixed-bounds-safety-with-assert-2.cpp2"
 [[nodiscard]] auto main() -> int;
+
 #line 10 "mixed-bounds-safety-with-assert-2.cpp2"
 auto add_42_to_subrange(auto& rng, cpp2::in<int> start, cpp2::in<int> end) -> void;
 #line 23 "mixed-bounds-safety-with-assert-2.cpp2"
@@ -15,8 +15,8 @@ auto add_42_to_subrange(auto& rng, cpp2::in<int> start, cpp2::in<int> end) -> vo
 
 //=== Cpp2 definitions ==========================================================
 
-#line 1 "mixed-bounds-safety-with-assert-2.cpp2"
 
+#line 2 "mixed-bounds-safety-with-assert-2.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector<int> v {1, 2, 3, 4, 5}; 
     add_42_to_subrange(v, 1, 3);

regression-tests/test-results/mixed-bounds-safety-with-assert.cpp

@@ -2,9 +2,9 @@
 
 #include "cpp2util.h"
 
-
 #line 2 "mixed-bounds-safety-with-assert.cpp2"
 [[nodiscard]] auto main() -> int;
+
 #line 7 "mixed-bounds-safety-with-assert.cpp2"
 auto print_subrange(auto const& rng, cpp2::in<int> start, cpp2::in<int> end) -> void;
 #line 19 "mixed-bounds-safety-with-assert.cpp2"
@@ -15,8 +15,8 @@ auto print_subrange(auto const& rng, cpp2::in<int> start, cpp2::in<int> end) ->
 
 //=== Cpp2 definitions ==========================================================
 
-#line 1 "mixed-bounds-safety-with-assert.cpp2"
 
+#line 2 "mixed-bounds-safety-with-assert.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector<int> v {1, 2, 3, 4, 5}; 
     print_subrange(std::move(v), 1, 13);

regression-tests/test-results/mixed-captures-in-expressions-and-postconditions.cpp

@@ -6,17 +6,16 @@
 
 #include "cpp2util.h"
 
-
 #line 5 "mixed-captures-in-expressions-and-postconditions.cpp2"
 [[nodiscard]] auto main() -> int;
-#line 17 "mixed-captures-in-expressions-and-postconditions.cpp2"
+
 #line 19 "mixed-captures-in-expressions-and-postconditions.cpp2"
 auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 4 "mixed-captures-in-expressions-and-postconditions.cpp2"
 
+#line 5 "mixed-captures-in-expressions-and-postconditions.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector<std::string> vec {
                "hello", "2022"}; 
@@ -32,11 +31,11 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void;
 std::vector<int> vec {}; 
 
 auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void
-{   
+
+#line 22 "mixed-captures-in-expressions-and-postconditions.cpp2"
+{
     cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS_0(ssize, vec)), "");
     auto post_21_5 = cpp2::finally_success([_0 = CPP2_UFCS_0(ssize, vec)]{cpp2::Default.expects(CPP2_UFCS_0(ssize, vec)==_0 + 1, "");} );
-#line 21 "mixed-captures-in-expressions-and-postconditions.cpp2"
-
 #line 23 "mixed-captures-in-expressions-and-postconditions.cpp2"
     CPP2_UFCS(insert, vec, CPP2_UFCS_0(begin, vec) + where, val);
 }

regression-tests/test-results/mixed-fixed-type-aliases.cpp

@@ -9,16 +9,16 @@ namespace my {
 
 #include "cpp2util.h"
 
-
 #line 8 "mixed-fixed-type-aliases.cpp2"
 auto test(auto const& x) -> void;
+
 #line 15 "mixed-fixed-type-aliases.cpp2"
 [[nodiscard]] auto main(int const argc_, char const* const* const argv_) -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 7 "mixed-fixed-type-aliases.cpp2"
 
+#line 8 "mixed-fixed-type-aliases.cpp2"
 auto test(auto const& x) -> void{
     std::cout 
         << std::boolalpha 

regression-tests/test-results/mixed-float-literals.cpp

@@ -58,16 +58,16 @@ void literals_cpp1() {
 
 #include "cpp2util.h"
 
-
 #line 57 "mixed-float-literals.cpp2"
 auto literals_cpp2() -> void;
+
 #line 114 "mixed-float-literals.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 56 "mixed-float-literals.cpp2"
 
+#line 57 "mixed-float-literals.cpp2"
 auto literals_cpp2() -> void{
   // integers
   123;

regression-tests/test-results/mixed-forwarding.cpp

@@ -12,37 +12,41 @@ struct X {
 
 #include "cpp2util.h"
 
-
 #line 11 "mixed-forwarding.cpp2"
 auto copy_from(auto x) -> void;
-#line 13 "mixed-forwarding.cpp2"
+
 auto use(auto const& x) -> void;
+
 #line 16 "mixed-forwarding.cpp2"
 auto apply_implicit_forward(auto&& t) -> void;
+
 #line 20 "mixed-forwarding.cpp2"
 auto apply_explicit_forward(auto&& t) -> void;
+
 #line 25 "mixed-forwarding.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 10 "mixed-forwarding.cpp2"
 
+#line 11 "mixed-forwarding.cpp2"
 auto copy_from(auto x) -> void{}
 
 auto use(auto const& x) -> void{}
 
 // invoking each of these with an rvalue std::pair argument ...
 auto apply_implicit_forward(auto&& t) -> void
 requires std::is_same_v<CPP2_TYPEOF(t), std::pair<X,X>>
-#line 17 "mixed-forwarding.cpp2"
-{   copy_from(t.first);             // copies
+#line 16 "mixed-forwarding.cpp2"
+                                                     {
+    copy_from(t.first);             // copies
     copy_from(CPP2_FORWARD(t).second);// moves
 }
 auto apply_explicit_forward(auto&& t) -> void
 requires std::is_same_v<CPP2_TYPEOF(t), std::pair<X,X>>
-#line 21 "mixed-forwarding.cpp2"
-{   copy_from(        CPP2_FORWARD(t).first);// moves
+#line 20 "mixed-forwarding.cpp2"
+                                                     {
+    copy_from(        CPP2_FORWARD(t).first);// moves
     copy_from(        CPP2_FORWARD(t).second);// moves
 }
 

regression-tests/test-results/mixed-function-expression-and-std-for-each.cpp

@@ -8,14 +8,13 @@
 
 #include "cpp2util.h"
 
-
 #line 7 "mixed-function-expression-and-std-for-each.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 6 "mixed-function-expression-and-std-for-each.cpp2"
 
+#line 7 "mixed-function-expression-and-std-for-each.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector<std::string> vec {
                "hello", "2022"}; 

regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each-with-capture.cpp

@@ -9,14 +9,13 @@
 
 #include "cpp2util.h"
 
-
 #line 8 "mixed-function-expression-and-std-ranges-for-each-with-capture.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 7 "mixed-function-expression-and-std-ranges-for-each-with-capture.cpp2"
 
+#line 8 "mixed-function-expression-and-std-ranges-for-each-with-capture.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector<std::string> vec {
                "hello", "2022"}; 

regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each.cpp

@@ -9,14 +9,13 @@
 
 #include "cpp2util.h"
 
-
 #line 8 "mixed-function-expression-and-std-ranges-for-each.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 7 "mixed-function-expression-and-std-ranges-for-each.cpp2"
 
+#line 8 "mixed-function-expression-and-std-ranges-for-each.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector<std::string> vec {
                "hello", "2022"}; 

regression-tests/test-results/mixed-function-expression-with-pointer-capture.cpp

@@ -9,14 +9,13 @@
 
 #include "cpp2util.h"
 
-
 #line 8 "mixed-function-expression-with-pointer-capture.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 7 "mixed-function-expression-with-pointer-capture.cpp2"
 
+#line 8 "mixed-function-expression-with-pointer-capture.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector<std::string> vec {
                "hello", "2023"}; 

regression-tests/test-results/mixed-function-expression-with-repeated-capture.cpp

@@ -9,14 +9,13 @@
 
 #include "cpp2util.h"
 
-
 #line 8 "mixed-function-expression-with-repeated-capture.cpp2"
 [[nodiscard]] auto main() -> int;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 7 "mixed-function-expression-with-repeated-capture.cpp2"
 
+#line 8 "mixed-function-expression-with-repeated-capture.cpp2"
 [[nodiscard]] auto main() -> int{
     std::vector<std::string> vec {
                "hello", "2022"}; 

regression-tests/test-results/mixed-hello.cpp

@@ -6,9 +6,9 @@
 
 #include "cpp2util.h"
 
-
 #line 5 "mixed-hello.cpp2"
 [[nodiscard]] auto name() -> std::string;
+
 #line 11 "mixed-hello.cpp2"
 auto decorate(std::string& s) -> void;
 #line 14 "mixed-hello.cpp2"
@@ -20,8 +20,8 @@ auto main() -> int {
 
 //=== Cpp2 definitions ==========================================================
 
-#line 4 "mixed-hello.cpp2"
 
+#line 5 "mixed-hello.cpp2"
 [[nodiscard]] auto name() -> std::string{
     std::string s {"world"}; 
     decorate(s);

regression-tests/test-results/mixed-initialization-safety-3-contract-violation.cpp

@@ -6,15 +6,16 @@
 
 #include "cpp2util.h"
 
-
 #line 5 "mixed-initialization-safety-3-contract-violation.cpp2"
 [[nodiscard]] auto main() -> int;
+
 #line 16 "mixed-initialization-safety-3-contract-violation.cpp2"
 auto fill(
     cpp2::out<std::string> x, 
     cpp2::in<std::string> value, 
     cpp2::in<int> count
     ) -> void;
+
 #line 26 "mixed-initialization-safety-3-contract-violation.cpp2"
 auto print_decorated(auto const& x) -> void;
 
@@ -27,8 +28,8 @@ bool flip_a_coin() {
 
 //=== Cpp2 definitions ==========================================================
 
-#line 4 "mixed-initialization-safety-3-contract-violation.cpp2"
 
+#line 5 "mixed-initialization-safety-3-contract-violation.cpp2"
 [[nodiscard]] auto main() -> int{
     cpp2::deferred_init<std::string> x; // note: uninitialized!
 
@@ -45,10 +46,10 @@ auto fill(
     cpp2::in<std::string> value, 
     cpp2::in<int> count
     ) -> void
-{   
-    cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS_0(ssize, value),count), "fill: value must contain at least count elements");
-#line 22 "mixed-initialization-safety-3-contract-violation.cpp2"
 
+{
+    cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS_0(ssize, value),count), "fill: value must contain at least count elements");
+#line 23 "mixed-initialization-safety-3-contract-violation.cpp2"
     x.construct(CPP2_UFCS(substr, value, 0, count));
 }
 

regression-tests/test-results/mixed-initialization-safety-3.cpp

@@ -6,24 +6,26 @@
 
 #include "cpp2util.h"
 
-
 #line 5 "mixed-initialization-safety-3.cpp2"
 [[nodiscard]] auto main() -> int;
+
 #line 16 "mixed-initialization-safety-3.cpp2"
 auto fill(
     cpp2::out<std::string> x, 
     cpp2::in<std::string> value, 
     cpp2::in<int> count
     ) -> void;
+
 #line 26 "mixed-initialization-safety-3.cpp2"
 auto print_decorated(auto const& x) -> void;
+
 #line 30 "mixed-initialization-safety-3.cpp2"
 [[nodiscard]] auto flip_a_coin() -> bool;
 
 //=== Cpp2 definitions ==========================================================
 
-#line 4 "mixed-initialization-safety-3.cpp2"
 
+#line 5 "mixed-initialization-safety-3.cpp2"
 [[nodiscard]] auto main() -> int{
     cpp2::deferred_init<std::string> x; // note: uninitialized!
 
@@ -40,10 +42,10 @@ auto fill(
     cpp2::in<std::string> value, 
     cpp2::in<int> count
     ) -> void
-{   
-    cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS_0(ssize, value),count), "fill: value must contain at least count elements");
-#line 22 "mixed-initialization-safety-3.cpp2"
 
+{
+    cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS_0(ssize, value),count), "fill: value must contain at least count elements");
+#line 23 "mixed-initialization-safety-3.cpp2"
     x.construct(CPP2_UFCS(substr, value, 0, count));
 }