Merge remote-tracking branch 'origin/main' into feature/regular_expression_metafunction

MaxSagebaum · MaxSagebaum · commit 788cf3d1baef · 2024-07-15T08:32:40.000+02:00
diff --git a/include/cpp2util.h b/include/cpp2util.h
@@ -762,20 +762,20 @@ constexpr auto process_type_name(std::string_view name) -> std::string_view {
     constexpr auto types_close_parenthesis = '>';
 #endif
     auto pos = name.find(type_prefix);
-    if (pos != std::string_view::npos) {
+    if (pos != name.npos) {
         name = name.substr(pos);
         name.remove_prefix(type_prefix.size());
     }
 
     pos = name.find_last_of(types_close_parenthesis);
-    if (pos != std::string_view::npos) {
+    if (pos != name.npos) {
         name = name.substr(0, pos);
     }
 
 #if defined(__GNUC__)
     constexpr auto type_separator = ';';
     pos = name.find(type_separator);
-    if (pos != std::string_view::npos) {
+    if (pos != name.npos) {
         name = name.substr(0, pos);
     }
 #endif
diff --git a/regression-tests/test-results/version b/regression-tests/test-results/version
@@ -1,5 +1,5 @@
 
-cppfront compiler v0.7.1   Build 9713:1156
+cppfront compiler v0.7.1   Build 9714:0930
 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 @@
-"9713:1156"
+"9714:0930"
diff --git a/source/io.h b/source/io.h
@@ -175,7 +175,7 @@ auto starts_with_whitespace_slash_star_and_no_star_slash(std::string const& line
         && line[i + 1] == '*'
         )
     {
-        return line.find("*/", i) == std::string::npos;
+        return line.find("*/", i) == line.npos;
     }
     else {
         return false;
@@ -604,7 +604,7 @@ auto process_cpp_line(
         }
         else if (in_raw_string_literal) {
             auto end_pos = line.find(raw_string_closing_seq, i);
-            if (end_pos == std::string::npos) {
+            if (end_pos == line.npos) {
                 return r;
             }
             in_raw_string_literal = false;
@@ -626,7 +626,7 @@ auto process_cpp_line(
                         if (i < ssize(line) - 1)
                         {
                             if (auto paren_pos = line.find("(", i);
-                                paren_pos != std::string::npos
+                                paren_pos != line.npos
                                 )
                             {
                                 raw_string_closing_seq = ")"+line.substr(i, paren_pos-i)+"\"";
diff --git a/source/lex.h b/source/lex.h
@@ -1267,7 +1267,7 @@ auto lex_line(
             // raw string was not expanded
 
             raw_string_multiline.value().text += part;
-            if (end_pos == std::string::npos) {
+            if (end_pos == line.npos) {
                 raw_string_multiline.value().text += '\n';
                 break;
             }
@@ -1328,7 +1328,7 @@ auto lex_line(
                         comment::comment_kind::line_comment,
                         {lineno, i},
                         {lineno, _as<colno_t>(std::ssize(line))},
-                        std::string(&line[i], std::ssize(line) - i)
+                        line.substr(i)
                         });
                     in_comment = false;
                     goto END;
@@ -1484,7 +1484,7 @@ auto lex_line(
                     auto R_pos = i + 1;
                     auto seq_pos = i + 3;
 
-                    if (auto paren_pos = line.find("(", seq_pos); paren_pos != std::string::npos) {
+                    if (auto paren_pos = line.find("(", seq_pos); paren_pos != line.npos) {
                         auto opening_seq = line.substr(i, paren_pos - i + 1);
                         auto closing_seq = ")"+line.substr(seq_pos, paren_pos-seq_pos)+"\"";
 
@@ -1532,7 +1532,7 @@ auto lex_line(
                     else {
                         errors.emplace_back(
                             source_position(lineno, i + 1),
-                            "invalid new-line in raw string delimiter \"" + std::string(&line[i],3)
+                            "invalid new-line in raw string delimiter \"" + line.substr(i, 3)
                                 + "\" - stray 'R' in program \""
                         );
                     }
@@ -1579,7 +1579,6 @@ auto lex_line(
                             source_position(lineno, i),
                             "binary literal cannot be empty (0B must be followed by binary digits)"
                         );
-                        ++i;
                     }
                 }
                 else if (peek1 == 'x' || peek1 == 'X') {
@@ -1593,7 +1592,6 @@ auto lex_line(
                             source_position(lineno, i),
                             "hexadecimal literal cannot be empty (0X must be followed by hexadecimal digits)"
                         );
-                        ++i;
                     }
                 }
             }
@@ -1703,7 +1701,7 @@ auto lex_line(
                     if (peek(j-2) == 'R') {
                         auto seq_pos = i + j;
 
-                        if (auto paren_pos = line.find("(", seq_pos); paren_pos != std::string::npos) {
+                        if (auto paren_pos = line.find("(", seq_pos); paren_pos != line.npos) {
                             auto opening_seq = line.substr(i, paren_pos - i + 1);
                             auto closing_seq = ")"+line.substr(seq_pos, paren_pos-seq_pos)+"\"";
 
@@ -1724,7 +1722,7 @@ auto lex_line(
                         else {
                             errors.emplace_back(
                                 source_position(lineno, i + j - 2),
-                                "invalid new-line in raw string delimiter \"" + std::string(&line[i],j)
+                                "invalid new-line in raw string delimiter \"" + line.substr(i, j)
                                     + "\" - stray 'R' in program \""
                             );
                         }
@@ -1734,7 +1732,7 @@ auto lex_line(
                         if (peek(j) != '\"') {
                             errors.emplace_back(
                                 source_position(lineno, i),
-                                "string literal \"" + std::string(&line[i+1],j)
+                                "string literal \"" + line.substr(i+1, j)
                                     + "\" is missing its closing \""
                             );
                         }
@@ -1781,7 +1779,7 @@ auto lex_line(
                             assert (j > 1);
                             errors.emplace_back(
                                 source_position(lineno, i),
-                                "character literal '" + std::string(&line[i+1],j-1)
+                                "character literal '" + line.substr(i+1, j-1)
                                     + "' is missing its closing '"
                             );
                         }
diff --git a/source/reflect.h b/source/reflect.h
@@ -881,7 +881,7 @@ auto newline_pos{CPP2_UFCS(find)(source, '\n')};
         if ( cpp2::impl::cmp_greater(CPP2_UFCS(ssize)(source),1) 
             && newline_pos != source.npos) 
         {
-            while( newline_pos != std::string_view::npos ) 
+            while( newline_pos != source.npos ) 
             {
                 add_line(CPP2_UFCS(substr)(source, 0, newline_pos));
                 CPP2_UFCS(remove_prefix)(source, newline_pos + 1);
diff --git a/source/reflect.h2 b/source/reflect.h2
@@ -102,7 +102,7 @@ compiler_services: @polymorphic_base @copyable type =
         if  source.ssize() > 1
             && newline_pos != source.npos
         {
-            while newline_pos != std::string_view::npos
+            while newline_pos != source.npos
             {
                 add_line( source.substr(0, newline_pos) );
                 source.remove_prefix( newline_pos+1 );
diff --git a/source/to_cpp1.h b/source/to_cpp1.h
@@ -343,9 +343,9 @@ class positional_printer
         //  and where the last one was which determines our current colno
         if (track_curr_pos)
         {
-            auto last_newline = std::string::npos;  // the last newline we found in the string
+            auto last_newline = s.npos;             // the last newline we found in the string
             auto newline_pos  = std::size_t(0);     // the current newline we found in the string
-            while ((newline_pos = s.find('\n', newline_pos)) != std::string::npos)
+            while ((newline_pos = s.find('\n', newline_pos)) != s.npos)
             {
                 //  For each line break we find, reset pad and inc current lineno
                 pad_for_this_line = 0;
@@ -355,7 +355,7 @@ class positional_printer
             }
 
             //  Now also adjust the colno
-            if (last_newline != std::string::npos) {
+            if (last_newline != s.npos) {
                 //  If we found a newline, it's the distance from the last newline to EOL
                 curr_pos.colno = unsafe_narrow<colno_t>(s.length() - last_newline);
             }
@@ -415,7 +415,7 @@ class positional_printer
         if (c.kind == comment::comment_kind::line_comment) {
             print( pad( c.start.colno - curr_pos.colno + 1 ) );
             print( c.text );
-            assert( c.text.find("\n") == std::string::npos );  // we shouldn't have newlines
+            assert( c.text.find("\n") == c.text.npos ); // we shouldn't have newlines
             print("\n");
         }
 
@@ -792,7 +792,7 @@ class positional_printer
             && newline_pos != s.npos
             )
         {
-            while (newline_pos != std::string_view::npos)
+            while (newline_pos != s.npos)
             {
                 //  Print the text before the next newline
                 if (newline_pos > 0) {
@@ -4424,8 +4424,8 @@ class cppfront
                         tparam->declaration->is_type()
                         && (
                             name == tparam_name
-                            || name.find("<"+tparam_name) != std::string_view::npos
-                            || name.find(","+tparam_name) != std::string_view::npos
+                            || name.find("<"+tparam_name) != name.npos
+                            || name.find(","+tparam_name) != name.npos
                         )
                         )
                     {

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ auto starts_with_whitespace_slash_star_and_no_star_slash(std::string const& line`
`175`	`175`	`&& line[i + 1] == '*'`
`176`	`176`	`)`
`177`	`177`	`{`
`178`		`- return line.find("*/", i) == std::string::npos;`
	`178`	`+ return line.find("*/", i) == line.npos;`
`179`	`179`	`}`
`180`	`180`	`else {`
`181`	`181`	`return false;`
`@@ -604,7 +604,7 @@ auto process_cpp_line(`
`604`	`604`	`}`
`605`	`605`	`else if (in_raw_string_literal) {`
`606`	`606`	`auto end_pos = line.find(raw_string_closing_seq, i);`
`607`		`- if (end_pos == std::string::npos) {`
	`607`	`+ if (end_pos == line.npos) {`
`608`	`608`	`return r;`
`609`	`609`	`}`
`610`	`610`	`in_raw_string_literal = false;`
`@@ -626,7 +626,7 @@ auto process_cpp_line(`
`626`	`626`	`if (i < ssize(line) - 1)`
`627`	`627`	`{`
`628`	`628`	`if (auto paren_pos = line.find("(", i);`
`629`		`- paren_pos != std::string::npos`
	`629`	`+ paren_pos != line.npos`
`630`	`630`	`)`
`631`	`631`	`{`
`632`	`632`	`raw_string_closing_seq = ")"+line.substr(i, paren_pos-i)+"\"";`
Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ auto newline_pos{CPP2_UFCS(find)(source, '\n')};`
`881`	`881`	`if ( cpp2::impl::cmp_greater(CPP2_UFCS(ssize)(source),1)`
`882`	`882`	`&& newline_pos != source.npos)`
`883`	`883`	`{`
`884`		`- while( newline_pos != std::string_view::npos )`
	`884`	`+ while( newline_pos != source.npos )`
`885`	`885`	`{`
`886`	`886`	`add_line(CPP2_UFCS(substr)(source, 0, newline_pos));`
`887`	`887`	`CPP2_UFCS(remove_prefix)(source, newline_pos + 1);`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ compiler_services: @polymorphic_base @copyable type =`
`102`	`102`	`if source.ssize() > 1`
`103`	`103`	`&& newline_pos != source.npos`
`104`	`104`	`{`
`105`		`- while newline_pos != std::string_view::npos`
	`105`	`+ while newline_pos != source.npos`
`106`	`106`	`{`
`107`	`107`	`add_line( source.substr(0, newline_pos) );`
`108`	`108`	`source.remove_prefix( newline_pos+1 );`
Original file line number	Diff line number	Diff line change
`@@ -343,9 +343,9 @@ class positional_printer`
`343`	`343`	`// and where the last one was which determines our current colno`
`344`	`344`	`if (track_curr_pos)`
`345`	`345`	`{`
`346`		`- auto last_newline = std::string::npos; // the last newline we found in the string`
	`346`	`+ auto last_newline = s.npos; // the last newline we found in the string`
`347`	`347`	`auto newline_pos = std::size_t(0); // the current newline we found in the string`
`348`		`- while ((newline_pos = s.find('\n', newline_pos)) != std::string::npos)`
	`348`	`+ while ((newline_pos = s.find('\n', newline_pos)) != s.npos)`
`349`	`349`	`{`
`350`	`350`	`// For each line break we find, reset pad and inc current lineno`
`351`	`351`	`pad_for_this_line = 0;`
`@@ -355,7 +355,7 @@ class positional_printer`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`// Now also adjust the colno`
`358`		`- if (last_newline != std::string::npos) {`
	`358`	`+ if (last_newline != s.npos) {`
`359`	`359`	`// If we found a newline, it's the distance from the last newline to EOL`
`360`	`360`	`curr_pos.colno = unsafe_narrow<colno_t>(s.length() - last_newline);`
`361`	`361`	`}`
`@@ -415,7 +415,7 @@ class positional_printer`
`415`	`415`	`if (c.kind == comment::comment_kind::line_comment) {`
`416`	`416`	`print( pad( c.start.colno - curr_pos.colno + 1 ) );`
`417`	`417`	`print( c.text );`
`418`		`- assert( c.text.find("\n") == std::string::npos ); // we shouldn't have newlines`
	`418`	`+ assert( c.text.find("\n") == c.text.npos ); // we shouldn't have newlines`
`419`	`419`	`print("\n");`
`420`	`420`	`}`
`421`	`421`
`@@ -792,7 +792,7 @@ class positional_printer`
`792`	`792`	`&& newline_pos != s.npos`
`793`	`793`	`)`
`794`	`794`	`{`
`795`		`- while (newline_pos != std::string_view::npos)`
	`795`	`+ while (newline_pos != s.npos)`
`796`	`796`	`{`
`797`	`797`	`// Print the text before the next newline`
`798`	`798`	`if (newline_pos > 0) {`
`@@ -4424,8 +4424,8 @@ class cppfront`
`4424`	`4424`	`tparam->declaration->is_type()`
`4425`	`4425`	`&& (`
`4426`	`4426`	`name == tparam_name`
`4427`		`- \|\| name.find("<"+tparam_name) != std::string_view::npos`
`4428`		`- \|\| name.find(","+tparam_name) != std::string_view::npos`
	`4427`	`+ \|\| name.find("<"+tparam_name) != name.npos`
	`4428`	`+ \|\| name.find(","+tparam_name) != name.npos`
`4429`	`4429`	`)`
`4430`	`4430`	`)`
`4431`	`4431`	`{`