Correct the range-for implementation to just declare const& instead of using as_const, closes hsutter#234

hsutter · zaucy · commit 7e635c20cf72 · 2023-12-04T20:37:41.000-08:00
diff --git a/regression-tests/test-results/mixed-bounds-safety-with-assert-2.cpp b/regression-tests/test-results/mixed-bounds-safety-with-assert-2.cpp
@@ -20,7 +20,7 @@ auto add_42_to_subrange(auto& rng, cpp2::in<int> start, cpp2::in<int> end) -> vo
     std::vector<int> v {1, 2, 3, 4, 5}; 
     add_42_to_subrange(v, 1, 3);
 
-    for ( auto&& cpp2_range = std::as_const(v);  auto const& i : cpp2_range ) 
+    for ( auto const& cpp2_range = v;  auto const& i : cpp2_range ) 
         std::cout << i << "\n";
 }
 
diff --git a/regression-tests/test-results/mixed-bounds-safety-with-assert.cpp b/regression-tests/test-results/mixed-bounds-safety-with-assert.cpp
@@ -26,7 +26,7 @@ auto print_subrange(auto const& rng, cpp2::in<int> start, cpp2::in<int> end) ->
     cpp2::Bounds.expects(cpp2::cmp_less_eq(end,CPP2_UFCS_0(ssize, rng)), "");
 
     auto count {0}; 
-    for ( auto&& cpp2_range = std::as_const(rng);  
+    for ( auto const& cpp2_range = rng;  
 
           auto const& i : cpp2_range )  { do 
         if (cpp2::cmp_less_eq(start,count) && cpp2::cmp_less_eq(count,end)) {
diff --git a/regression-tests/test-results/mixed-function-expression-and-std-for-each.cpp b/regression-tests/test-results/mixed-function-expression-and-std-for-each.cpp
@@ -34,7 +34,7 @@
         std::move(callback)
     );
 
-    for ( auto&& cpp2_range = std::as_const(view);  auto const& str : cpp2_range ) {
+    for ( auto const& cpp2_range = view;  auto const& str : cpp2_range ) {
         std::cout << str << "\n";
     }
 }
diff --git a/regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each-with-capture.cpp b/regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each-with-capture.cpp
@@ -27,7 +27,7 @@
     auto callback {[](auto& x) { return x += "-ish"; }}; 
     std::ranges::for_each( view, std::move(callback));
 
-    for ( auto&& cpp2_range = std::as_const(view);  auto const& str : cpp2_range ) 
+    for ( auto const& cpp2_range = view;  auto const& str : cpp2_range ) 
         std::cout << str << "\n";
 }
 
diff --git a/regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each.cpp b/regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each.cpp
@@ -26,7 +26,7 @@
     auto callback {[](auto& x) { return x += "-ish"; }}; 
     std::ranges::for_each( view, std::move(callback));
 
-    for ( auto&& cpp2_range = std::as_const(view);  auto const& str : cpp2_range ) 
+    for ( auto const& cpp2_range = view;  auto const& str : cpp2_range ) 
         std::cout << str << "\n";
 }
 
diff --git a/regression-tests/test-results/mixed-function-expression-with-pointer-capture.cpp b/regression-tests/test-results/mixed-function-expression-with-pointer-capture.cpp
@@ -28,7 +28,7 @@
     auto callback {[](auto& x) { return x += "-ish"; }}; 
     std::ranges::for_each( view, std::move(callback));
 
-    for ( auto&& cpp2_range = std::as_const(view);  auto const& str : cpp2_range ) 
+    for ( auto const& cpp2_range = view;  auto const& str : cpp2_range ) 
         std::cout << str << "\n";
 }
 
diff --git a/regression-tests/test-results/mixed-function-expression-with-repeated-capture.cpp b/regression-tests/test-results/mixed-function-expression-with-repeated-capture.cpp
@@ -27,7 +27,7 @@
     auto callback {[](auto& x) { return x += "-ish"; }}; 
     std::ranges::for_each( view, std::move(callback));
 
-    for ( auto&& cpp2_range = std::as_const(view);  auto const& str : cpp2_range ) 
+    for ( auto const& cpp2_range = view;  auto const& str : cpp2_range ) 
         std::cout << str << "\n";
 }
 
diff --git a/regression-tests/test-results/mixed-intro-for-with-counter-include-last.cpp b/regression-tests/test-results/mixed-intro-for-with-counter-include-last.cpp
@@ -18,7 +18,7 @@
 {
     std::vector<int> v {1, 2, 3, 4, 5}; 
     auto counter {42}; 
-    for ( auto&& cpp2_range = std::as_const(v);  auto const& i : cpp2_range )  { do {
+    for ( auto const& cpp2_range = v;  auto const& i : cpp2_range )  { do {
         std::cout << i << " " << counter << "\n";
     } while (false); counter *= 2; }
 }
diff --git a/regression-tests/test-results/pure2-break-continue.cpp b/regression-tests/test-results/pure2-break-continue.cpp
@@ -196,9 +196,9 @@ auto for_continue_inner() -> void
 {
     std::vector vi {0, 1, 2}; 
     auto counter {0}; 
-    for ( auto&& cpp2_range = std::as_const(vi);  auto const& i : cpp2_range )  { do {
+    for ( auto const& cpp2_range = vi;  auto const& i : cpp2_range )  { do {
         std::vector vj {0, 1, 2}; 
-        for ( auto&& cpp2_range = std::as_const(vj);  auto const& j : cpp2_range ) {{
+        for ( auto const& cpp2_range = vj;  auto const& j : cpp2_range ) {{
             std::cout << i << j << " ";
             if (j == 1) {
                 goto CONTINUE_166_9;
@@ -214,9 +214,9 @@ auto for_continue_outer() -> void
 {
     std::vector vi {0, 1, 2}; 
     auto counter {0}; 
-    for ( auto&& cpp2_range = std::as_const(vi);  auto const& i : cpp2_range ) { { do {
+    for ( auto const& cpp2_range = vi;  auto const& i : cpp2_range ) { { do {
         std::vector vj {0, 1, 2}; 
-        for ( auto&& cpp2_range = std::as_const(vj);  auto const& j : cpp2_range ) {
+        for ( auto const& cpp2_range = vj;  auto const& j : cpp2_range ) {
             std::cout << i << j << " ";
             if (j == 1) {
                 goto CONTINUE_182_5;
@@ -232,9 +232,9 @@ auto for_break_inner() -> void
 {
     std::vector vi {0, 1, 2}; 
     auto counter {0}; 
-    for ( auto&& cpp2_range = std::as_const(vi);  auto const& i : cpp2_range )  { do {
+    for ( auto const& cpp2_range = vi;  auto const& i : cpp2_range )  { do {
         std::vector vj {0, 1, 2}; 
-        for ( auto&& cpp2_range = std::as_const(vj);  auto const& j : cpp2_range ) {{
+        for ( auto const& cpp2_range = vj;  auto const& j : cpp2_range ) {{
             std::cout << i << j << " ";
             if (j == 1) {
                 goto BREAK_202_9;
@@ -250,9 +250,9 @@ auto for_break_outer() -> void
 {
     std::vector vi {0, 1, 2}; 
     auto counter {0}; 
-    for ( auto&& cpp2_range = std::as_const(vi);  auto const& i : cpp2_range ) { { do {
+    for ( auto const& cpp2_range = vi;  auto const& i : cpp2_range ) { { do {
         std::vector vj {0, 1, 2}; 
-        for ( auto&& cpp2_range = std::as_const(vj);  auto const& j : cpp2_range ) {
+        for ( auto const& cpp2_range = vj;  auto const& j : cpp2_range ) {
             std::cout << i << j << " ";
             if (j == 1) {
                 goto BREAK_218_5;
diff --git a/source/cppfront.cpp b/source/cppfront.cpp
@@ -1544,14 +1544,13 @@ class cppfront
         else if (*n.identifier == "for") {
             assert(!n.condition && !n.statement && n.range && n.body);
 
-            printer.print_cpp2("for ( auto&& cpp2_range = ", n.position());
             if (n.for_with_in) {
-                printer.print_cpp2("std::as_const(", n.position());
+                printer.print_cpp2("for ( auto const& cpp2_range = ", n.position());
             }
-            emit(*n.range);
-            if (n.for_with_in) {
-                printer.print_cpp2(")", n.position());
+            else {
+                printer.print_cpp2("for ( auto&& cpp2_range = ", n.position());
             }
+            emit(*n.range);
             printer.print_cpp2(";  ", n.position());
             emit(*n.get_for_parameter());
             printer.print_cpp2(" : cpp2_range ) ", n.position());

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ auto add_42_to_subrange(auto& rng, cpp2::in<int> start, cpp2::in<int> end) -> vo`
`20`	`20`	`std::vector<int> v {1, 2, 3, 4, 5};`
`21`	`21`	`add_42_to_subrange(v, 1, 3);`
`22`	`22`
`23`		`- for ( auto&& cpp2_range = std::as_const(v); auto const& i : cpp2_range )`
	`23`	`+ for ( auto const& cpp2_range = v; auto const& i : cpp2_range )`
`24`	`24`	`std::cout << i << "\n";`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`std::move(callback)`
`35`	`35`	`);`
`36`	`36`
`37`		`- for ( auto&& cpp2_range = std::as_const(view); auto const& str : cpp2_range ) {`
	`37`	`+ for ( auto const& cpp2_range = view; auto const& str : cpp2_range ) {`
`38`	`38`	`std::cout << str << "\n";`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`auto callback {[](auto& x) { return x += "-ish"; }};`
`28`	`28`	`std::ranges::for_each( view, std::move(callback));`
`29`	`29`
`30`		`- for ( auto&& cpp2_range = std::as_const(view); auto const& str : cpp2_range )`
	`30`	`+ for ( auto const& cpp2_range = view; auto const& str : cpp2_range )`
`31`	`31`	`std::cout << str << "\n";`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`auto callback {[](auto& x) { return x += "-ish"; }};`
`27`	`27`	`std::ranges::for_each( view, std::move(callback));`
`28`	`28`
`29`		`- for ( auto&& cpp2_range = std::as_const(view); auto const& str : cpp2_range )`
	`29`	`+ for ( auto const& cpp2_range = view; auto const& str : cpp2_range )`
`30`	`30`	`std::cout << str << "\n";`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`auto callback {[](auto& x) { return x += "-ish"; }};`
`29`	`29`	`std::ranges::for_each( view, std::move(callback));`
`30`	`30`
`31`		`- for ( auto&& cpp2_range = std::as_const(view); auto const& str : cpp2_range )`
	`31`	`+ for ( auto const& cpp2_range = view; auto const& str : cpp2_range )`
`32`	`32`	`std::cout << str << "\n";`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`{`
`19`	`19`	`std::vector<int> v {1, 2, 3, 4, 5};`
`20`	`20`	`auto counter {42};`
`21`		`- for ( auto&& cpp2_range = std::as_const(v); auto const& i : cpp2_range ) { do {`
	`21`	`+ for ( auto const& cpp2_range = v; auto const& i : cpp2_range ) { do {`
`22`	`22`	`std::cout << i << " " << counter << "\n";`
`23`	`23`	`} while (false); counter *= 2; }`
`24`	`24`	`}`