p4lang · vlstill · Dec 17, 2023 · Jan 12, 2024 · Jan 12, 2024 · Apr 11, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 project (P4C)
 
 # set (CMAKE_CXX_EXTENSIONS OFF) # prefer using -std=c++17 rather than -std=gnu++17
-set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD 20)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

diff --git a/lib/cstring.h b/lib/cstring.h
@@ -91,21 +91,21 @@ class cstring {
     // Owner of string is someone else, we do not know size of string.
     // Do not use if possible, this is linear time operation if string
     // not exists in table, because the underlying string must be copied.
-    cstring(const char *string) {  // NOLINT(runtime/explicit)
+    explicit cstring(const char *string) {
         if (string != nullptr) {
             construct_from_shared(string, std::strlen(string));
         }
     }
 
     // construct cstring from std::string. Do not use if possible, this is linear
     // time operation if string not exists in table, because the underlying string must be copied.
-    cstring(const std::string &string) {  // NOLINT(runtime/explicit)
+    explicit cstring(const std::string &string) {
         construct_from_shared(string.data(), string.length());
     }
 
     // construct cstring from std::string_view. Do not use if possible, this is linear
     // time operation if string not exists in table, because the underlying string must be copied.
-    explicit cstring(std::string_view string) {  // NOLINT(runtime/explicit)
+    explicit cstring(std::string_view string) {
         construct_from_shared(string.data(), string.length());
     }
 
@@ -114,9 +114,19 @@ class cstring {
     // Just helper function, for lazies, who do not like to write .str()
     // Do not use it, implicit std::string construction with implicit overhead
     // TODO (DanilLutsenko): Remove it?
-    cstring(const std::stringstream &stream)  // NOLINT(runtime/explicit)
+    explicit cstring(const std::stringstream &stream)
         : cstring(stream.str()) {}
 
+    cstring(const cstring &) = default;
+    cstring(cstring &&) = default;
+
+    cstring &operator=(const cstring &) = default;
+    cstring &operator=(cstring &&) = default;
+    cstring &operator=(const std::string &str) {
+        construct_from_shared(str.data(), str.length());
+        return *this;
+    }
+
     // TODO (DanilLutsenko): Construct from StringRef?
 
     // String was created outside and cstring is unique owner of it.
@@ -163,6 +173,7 @@ class cstring {
 
     char get(unsigned index) const { return (index < size()) ? str[index] : 0; }
     const char *c_str() const { return str; }
+    const char *data() const { return str; }
     operator const char *() const { return str; }
 
     // Size tests. Constant time except for size(), which is linear time.
@@ -209,6 +220,9 @@ class cstring {
     bool operator>(const std::string &a) const { return *this > a.c_str(); }
     bool operator>=(const std::string &a) const { return *this >= a.c_str(); }
 
+    /// implicit cast to std::string_view, similar to what std::string has
+    operator std::string_view() const { return std::string_view(data(), size()); }
+
     bool startsWith(const cstring &prefix) const;
     bool endsWith(const cstring &suffix) const;
 

diff --git a/lib/error_catalog.h b/lib/error_catalog.h
@@ -124,7 +124,7 @@ class ErrorCatalog {
     /// retrieve the name for errorCode
     cstring getName(int errorCode) {
         if (errorCatalog.count(errorCode)) return errorCatalog.at(errorCode);
-        return "--unknown--";
+        return cstring("--unknown--");
     }
 
     /// return true if the given diagnostic can _only_ be an error; false otherwise