Change string_view& to string_view by value (#44)

zproksi · web-flow · commit 244baf8098f3 · 2024-09-28T17:27:16.000+02:00
* changed sv usage from by reference to by value

* changed sv usage from by reference to by value

* changed sv usage from by reference to by value

* changed sv usage from by reference to by value

* changed sv usage from by reference to by value

* changed sv usage from by reference to by value

* changed sv usage from by reference to by value
diff --git a/srcbpatch/actionscollection.cpp b/srcbpatch/actionscollection.cpp
@@ -314,15 +314,15 @@ void ActionsCollection::ReportError(const char* const message)
     throw std::runtime_error(message);
 }
 
-void ActionsCollection::ReportDuplicateNameError(const std::string_view& aname)
+void ActionsCollection::ReportDuplicateNameError(const std::string_view aname)
 {
     std::stringstream ss;
     ss << "Duplicate name '" << aname << "' has been met in Actions file";
     ReportError(ss.str().c_str());
 }
 
 
-void ActionsCollection::ReportMissedNameError(const std::string_view& aname)
+void ActionsCollection::ReportMissedNameError(const std::string_view aname)
 {
     std::stringstream ss;
     ss << "Cannot find lexeme name '" << aname << "' in Actions file";
diff --git a/srcbpatch/actionscollection.h b/srcbpatch/actionscollection.h
@@ -75,13 +75,13 @@ class ActionsCollection final: public TJsonCallBack, public StreamReplacer
     ///   throws error if we meet duplicate name of lexeme
     /// </summary>
     /// <param name="aname">duplicate name of lexeme</param>
-    static void ReportDuplicateNameError(const std::string_view& aname);
+    static void ReportDuplicateNameError(const std::string_view aname);
 
     /// <summary>
     ///   throws error if we cannot find lexeme for composite lexeme
     /// </summary>
     /// <param name="aname">nonexistent name of lexeme</param>
-    static void ReportMissedNameError(const std::string_view& aname);
+    static void ReportMissedNameError(const std::string_view aname);
 
     /// <summary>
     ///   parse array of either 10 based integers or array of hex based strings
diff --git a/srcbpatch/coloredconsole.cpp b/srcbpatch/coloredconsole.cpp
@@ -46,7 +46,7 @@ namespace coloredconsole
     };
 #endif
 
-    void ColorizeWords(std::ostream& os, const std::string_view& sv)
+    void ColorizeWords(std::ostream& os, const std::string_view sv)
     {
         static const std::string_view errorSV = "ERROR";
         static const std::string_view warningSV = "Warning";
@@ -90,7 +90,7 @@ namespace coloredconsole
             pos = sv.size();
         } // while (pos < sv.size())
 
-    }// void ColorizeWords(std::ostream& os, const std::string_view& sv)
+    }// void ColorizeWords(std::ostream& os, const std::string_view sv)
 
 } // namespace coloredconsole
 
diff --git a/srcbpatch/coloredconsole.h b/srcbpatch/coloredconsole.h
@@ -11,7 +11,7 @@ namespace coloredconsole
     /// </summary>
     /// <param name="os"> std::cout actually</param>
     /// <param name="sv">string view to search ERROR and Warning words for colorization</param>
-    void ColorizeWords(std::ostream& os, const std::string_view& sv);
+    void ColorizeWords(std::ostream& os, const std::string_view sv);
 
     template<typename T>
     struct is_char_array : std::false_type {}; // by default the type is not char array
diff --git a/srcbpatch/dictionary.cpp b/srcbpatch/dictionary.cpp
@@ -6,7 +6,7 @@
 namespace bpatch
 {
 
-std::unique_ptr<AbstractBinaryLexeme>& Dictionary::Lexeme(const std::string_view& aname) const
+std::unique_ptr<AbstractBinaryLexeme>& Dictionary::Lexeme(const std::string_view aname) const
 {
     if (auto it = dict.find(aname); it != dict.cend())
     {
@@ -16,13 +16,13 @@ std::unique_ptr<AbstractBinaryLexeme>& Dictionary::Lexeme(const std::string_view
 }
 
 
-AbstractLexemesPair Dictionary::LexemesPair(const std::string_view& anameSrc, const std::string_view& anameTrg) const
+AbstractLexemesPair Dictionary::LexemesPair(const std::string_view anameSrc, const std::string_view anameTrg) const
 {
     return {Lexeme(anameSrc), Lexeme(anameTrg)};
 }
 
 
-bool Dictionary::AddBinaryLexeme(const std::string_view& aname, std::unique_ptr<AbstractBinaryLexeme>&& alexeme)
+bool Dictionary::AddBinaryLexeme(const std::string_view aname, std::unique_ptr<AbstractBinaryLexeme>&& alexeme)
 {
     auto it = lexemes_.emplace(lexemes_.cend(), std::move(alexeme));
 
diff --git a/srcbpatch/dictionary.h b/srcbpatch/dictionary.h
@@ -18,7 +18,7 @@ class Dictionary final
     /// </summary>
     /// <param name="aname"> name of the lexeme from dictionary file</param>
     /// <returns>lexeme from dictionary file, or nullptr</returns>
-    std::unique_ptr<AbstractBinaryLexeme>& Lexeme(const std::string_view& aname) const;
+    std::unique_ptr<AbstractBinaryLexeme>& Lexeme(const std::string_view aname) const;
 
 
     /// <summary>
@@ -27,7 +27,7 @@ class Dictionary final
     /// <param name="anameSrc">name of the lexeme from dictionary file</param>
     /// <param name="anameTrg">name of the lexeme from dictionary file</param>
     /// <returns>lexeme from dictionary file, or nullptr</returns>
-    AbstractLexemesPair LexemesPair(const std::string_view& anameSrc, const std::string_view& anameTrg) const;
+    AbstractLexemesPair LexemesPair(const std::string_view anameSrc, const std::string_view anameTrg) const;
 
 
     /// <summary>
@@ -37,7 +37,7 @@ class Dictionary final
     /// <param name="alexeme">lexeme to store inside</param>
     /// <returns>true - if this lexeme is just added;
     ///  false - if lexeme already was in the dictionary: new lexeme is lost</returns>
-    bool AddBinaryLexeme(const std::string_view& aname, std::unique_ptr<AbstractBinaryLexeme>&& alexeme);
+    bool AddBinaryLexeme(const std::string_view aname, std::unique_ptr<AbstractBinaryLexeme>&& alexeme);
 
 protected:
     using LEXEMES_HOLDER = std::list<std::unique_ptr<AbstractBinaryLexeme>>;
diff --git a/srcbpatch/fileprocessing.cpp b/srcbpatch/fileprocessing.cpp
@@ -103,7 +103,7 @@ size_t WriteFileProcessing::Written() const noexcept
     return writeAt_;
 }
 
-size_t WriteFileProcessing::WriteAndThrowIfFail(const string_view& sv)
+size_t WriteFileProcessing::WriteAndThrowIfFail(const string_view sv)
 {
 #ifdef __linux__
     const size_t written = fwrite_unlocked(sv.data(), sizeof(sv.data()[0]), sv.size(), stream_);
diff --git a/srcbpatch/fileprocessing.h b/srcbpatch/fileprocessing.h
@@ -177,7 +177,12 @@ class WriteFileProcessing : virtual public FileProcessing, public Writer
     size_t Written() const noexcept override; // the only way to get writeAt_
 
 protected:
-    size_t WriteAndThrowIfFail(const std::string_view& sv); // here writeAt_ could grow
+    /// <summary>
+    ///   !unlocked! write file inside. Throws If the written amount do not equal to the requested
+    /// </summary>
+    /// <param name="sv"> data to write</param>
+    /// <returns>written amount</returns>
+    size_t WriteAndThrowIfFail(const std::string_view sv); // here writeAt_ could grow
 
     /// <summary>
     ///   write either full chunks only or everything if aEod was achieved
diff --git a/srcbpatch/flexiblecache.cpp b/srcbpatch/flexiblecache.cpp
@@ -12,7 +12,7 @@ FlexibleCache::FlexibleCache()
 }
 
 
-bool FlexibleCache::Accumulate(const string_view& adata)
+bool FlexibleCache::Accumulate(const string_view adata)
 {
     unique_ptr<Chunk>& activeChunk = *currentChunk;
 
diff --git a/srcbpatch/flexiblecache.h b/srcbpatch/flexiblecache.h
@@ -34,7 +34,7 @@ class FlexibleCache
     /// </summary>
     /// <param name="data"> data to accumulate</param>
     /// <returns>true if root chunk completely filled with data</returns>
-    bool Accumulate(const std::string_view& adata);
+    bool Accumulate(const std::string_view adata);
 
 
     /// <summary>
diff --git a/srcbpatch/jsonparser.cpp b/srcbpatch/jsonparser.cpp
@@ -44,9 +44,8 @@ namespace // for json specific errors
 ///                                  LF    CR    Tab
 constexpr char whitespaces[] = {' ', 0x0A, 0x0D, 0x09};
 
-bool WhiteSpace(const std::string_view& sv, const size_t at)
+bool WhiteSpace(const std::string_view sv, const size_t at)
 {
-
     return (sv.size() > at &&
         std::ranges::any_of(whitespaces,
         [v = sv.at(at)](const char c)->bool
@@ -127,7 +126,7 @@ bool ModifyStringValue(char* ptr, size_t& resultLength, const size_t maxLength)
     return true;
 }
 
-std::pair<bool, size_t> checkJSONPattern(const std::string_view& str, const size_t at, std::regex& patternX)
+std::pair<bool, size_t> checkJSONPattern(const std::string_view str, const size_t at, std::regex& patternX)
 {
     std::cmatch match;
     const char* const p = str.data() + at;
@@ -141,7 +140,7 @@ std::pair<bool, size_t> checkJSONPattern(const std::string_view& str, const size
 }
 
 
-std::pair<bool, size_t> getJSONNumberLength(const std::string_view& str, const size_t at)
+std::pair<bool, size_t> getJSONNumberLength(const std::string_view str, const size_t at)
 {
     std::string_view firstCharSet("-0123456789");
     if (std::ranges::find(firstCharSet, str.at(at)) == std::cend(firstCharSet))
@@ -157,7 +156,7 @@ std::pair<bool, size_t> getJSONNumberLength(const std::string_view& str, const s
 }
 
 
-std::pair<bool, size_t> getJSONTrueFalseNull(const std::string_view& str, const size_t at)
+std::pair<bool, size_t> getJSONTrueFalseNull(const std::string_view str, const size_t at)
 {
     
     if (const char c = str.at(at); c != 't' && c!='f' && c != 'n')
@@ -175,7 +174,7 @@ std::pair<bool, size_t> getJSONTrueFalseNull(const std::string_view& str, const
 ////////////////////////////////////////////////////////////////
 
 // returns true if end of stream reached
-bool ThroughWhiteSpaces(std::string_view& sv, size_t& at)
+bool ThroughWhiteSpaces(std::string_view sv, size_t& at)
 {
     while (at < sv.size() && WhiteSpace(sv, at))
     {
@@ -185,7 +184,7 @@ bool ThroughWhiteSpaces(std::string_view& sv, size_t& at)
 }
 
 
-TJSONObject::PTR_JSON TJSONObject::CreateJSONObject(std::string_view& sv, TJsonCallBack* pCallback)
+TJSONObject::PTR_JSON TJSONObject::CreateJSONObject(std::string_view sv, TJsonCallBack* pCallback)
 {
     size_t at = 0;
     PassWhitespaces(sv, at);
@@ -446,7 +445,7 @@ bool TJSONObject::SetMeAsArray()
 
 
 /// @brief returns {lines count, pos at line}
-auto LinesCount(std::string_view& sv, const size_t till)
+auto LinesCount(std::string_view sv, const size_t till)
 {
     size_t n = 0;
     size_t r = 0;
@@ -470,7 +469,7 @@ auto LinesCount(std::string_view& sv, const size_t till)
 }
 
 
-void TJSONObject::ReportError(std::string_view& sv, const size_t at, const char* const message)
+void TJSONObject::ReportError(std::string_view sv, const size_t at, const char* const message)
 {
     auto [nLine, posAtLine] = LinesCount(sv, at);
     std::stringstream ss;
@@ -480,7 +479,7 @@ void TJSONObject::ReportError(std::string_view& sv, const size_t at, const char*
 }
 
 
-std::string_view TJSONObject::GetStringValue(std::string_view& sv, size_t& at)
+std::string_view TJSONObject::GetStringValue(std::string_view sv, size_t& at)
 {
     if ('\"' != sv.at(at))
     {
@@ -507,7 +506,7 @@ std::string_view TJSONObject::GetStringValue(std::string_view& sv, size_t& at)
 }
 
 
-void TJSONObject::OnJSONObject(std::string_view& sv, size_t& at)
+void TJSONObject::OnJSONObject(std::string_view sv, size_t& at)
 {
     PassWhitespaces(sv, at);
     while (sv.at(at) != '}') // empty object is also ok
@@ -556,7 +555,7 @@ void TJSONObject::OnJSONObject(std::string_view& sv, size_t& at)
 };
 
 
-void TJSONObject::OnJSONValue(std::string_view& sv, size_t& at)
+void TJSONObject::OnJSONValue(std::string_view sv, size_t& at)
 {
     PassWhitespaces(sv, at);
 
@@ -621,7 +620,7 @@ void TJSONObject::OnJSONValue(std::string_view& sv, size_t& at)
 }
 
 
-void TJSONObject::OnJSONArray(std::string_view& sv, size_t& at)
+void TJSONObject::OnJSONArray(std::string_view sv, size_t& at)
 {
     if (callback_)
     {
@@ -729,7 +728,7 @@ void TJSONObject::OnJSONArray(std::string_view& sv, size_t& at)
 }
 
 
-void TJSONObject::PassWhitespaces(std::string_view& sv, size_t& at)
+void TJSONObject::PassWhitespaces(std::string_view sv, size_t& at)
 {
     if (ThroughWhiteSpaces(sv, at)) // end of string view has been reached
     {
diff --git a/srcbpatch/jsonparser.h b/srcbpatch/jsonparser.h
@@ -12,7 +12,7 @@ namespace bpatch
 /// <param name="sv">where to check</param>
 /// <param name="at">pos to check</param>
 /// <returns>true if the character is whitespace</returns>
-bool WhiteSpace(const std::string_view& sv, const size_t at);
+bool WhiteSpace(const std::string_view sv, const size_t at);
 
 
 /// <summary>
@@ -38,7 +38,7 @@ bool ModifyStringValue(char* ptr, size_t& resultLength, const size_t maxLength);
 /// <param name="at">from pos to check</param>
 /// <returns>std::pair<bool, size_t> bool (found / not found) +
 /// size_t (result length / 0)</returns>
-std::pair<bool, size_t> getJSONNumberLength(const std::string_view& str, const size_t at);
+std::pair<bool, size_t> getJSONNumberLength(const std::string_view str, const size_t at);
 
 
 /// <summary>
@@ -53,7 +53,7 @@ std::pair<bool, size_t> getJSONNumberLength(const std::string_view& str, const s
 /// <param name="at">from pos to check</param>
 /// <returns>std::pair<bool, size_t> bool (found / not found) +
 /// size_t (result length / 0)</returns>
-std::pair<bool, size_t> getJSONTrueFalseNull(const std::string_view& str, const size_t at);
+std::pair<bool, size_t> getJSONTrueFalseNull(const std::string_view str, const size_t at);
 
 /// forward declaration
 /// declared in this file below
@@ -120,7 +120,7 @@ class TJSONObject
     /// <note>data in string view will be changed! \n->0x0A  for example;
     /// unicode characters ignored</note>
     /// <returns>root Object. Or throws</returns>
-    static PTR_JSON CreateJSONObject(std::string_view& sv, TJsonCallBack* pCallback = nullptr);
+    static PTR_JSON CreateJSONObject(std::string_view sv, TJsonCallBack* pCallback = nullptr);
 
 
     TJSONObject(TJSONObject* const aparent);
@@ -172,7 +172,7 @@ class TJSONObject
 /// <param name="sv"> data to read</param>
 /// <param name="at"> position where we did not find expected in data</param>
 /// <param name="message">Explanatory text of the error</param>
-static void ReportError(std::string_view& sv, const size_t at, const char* const message);
+static void ReportError(std::string_view sv, const size_t at, const char* const message);
 
 
 /// <summary>
@@ -185,22 +185,22 @@ static void ReportError(std::string_view& sv, const size_t at, const char* const
 /// <param name="at">pos from where to search</param>
 /// <returns>only name as string view. the data inside could be trasformed according
 /// Control Characters replacement </returns>
-static std::string_view GetStringValue(std::string_view& sv, size_t& at);
+static std::string_view GetStringValue(std::string_view sv, size_t& at);
 
 
 /// <summary>
 ///   Need to parse the JSON object
 /// </summary>
 /// <param name="sv">working with this data</param>
 /// <param name="at">pos of first character after '{'</param>
-void OnJSONObject(std::string_view& sv, size_t& at);
+void OnJSONObject(std::string_view sv, size_t& at);
 
 /// <summary>
 ///   Parsing the value for Json object
 /// </summary>
 /// <param name="sv">working with this data</param>
 /// <param name="at">pos of first character after ':'</param>
-void OnJSONValue(std::string_view& sv, size_t& at);
+void OnJSONValue(std::string_view sv, size_t& at);
 
 
 /// <summary>
@@ -209,7 +209,7 @@ void OnJSONValue(std::string_view& sv, size_t& at);
 /// </summary>
 /// <param name="sv">working with this data</param>
 /// <param name="at">pos of first character after '['</param>
-void OnJSONArray(std::string_view& sv, size_t& at);
+void OnJSONArray(std::string_view sv, size_t& at);
 
 
 /// <summary>
@@ -218,7 +218,7 @@ void OnJSONArray(std::string_view& sv, size_t& at);
 /// </summary>
 /// <param name="sv">where to search</param>
 /// <param name="at">moving the position</param>
-static void PassWhitespaces(std::string_view& sv, size_t& at);
+static void PassWhitespaces(std::string_view sv, size_t& at);
 
 }; // class TJSONObject
 
diff --git a/srcbpatch/streamreplacer.cpp b/srcbpatch/streamreplacer.cpp
@@ -248,7 +248,7 @@ class ChoiceReplacer final : public ReplacerWithNext
     ///   Sends target to next replacers, and resets partial match index to zero
     /// </summary>
     /// <param name="target">the array we need to send</param>
-    void SendAndResetPartialMatch(const span<const char>& target) const
+    void SendAndResetPartialMatch(const span<const char> target) const
     {
         for (const char c : target)
         {
@@ -335,7 +335,7 @@ void ChoiceReplacer::DoReplacements(const char toProcess, const bool aEod) const
             return;
         }
         // No any match -> send 1 char from cache
-        SendAndResetPartialMatch(std::span<char> (cachedData_.data(), 1));
+        SendAndResetPartialMatch(std::span<char>(cachedData_.data(), 1));
         CleanTheCache(1);
     }
 }
diff --git a/srcbpatch/timemeasurer.cpp b/srcbpatch/timemeasurer.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include "timemeasurer.h"
 
-TimeMeasurer::TimeMeasurer(const std::string_view& name)
+TimeMeasurer::TimeMeasurer(const std::string_view name)
     :startPoint{name, std::chrono::high_resolution_clock::now()}
 {
 }
@@ -21,7 +21,7 @@ const long long TimeMeasurer::NanosecondsElapsed(const TIME_POINT_TYPE at) const
     return std::chrono::duration_cast<std::chrono::nanoseconds>(at - ExecutionTimePoint()).count();
 }
 
-void TimeMeasurer::RegisterTimePoint(const std::string_view& name)
+void TimeMeasurer::RegisterTimePoint(const std::string_view name)
 {
     timePoints.emplace_back(TimePoint{name, std::chrono::high_resolution_clock::now()});
 }
diff --git a/srcbpatch/timemeasurer.h b/srcbpatch/timemeasurer.h
diff --git a/wildcharacters/wildcharacters.cpp b/wildcharacters/wildcharacters.cpp
diff --git a/wildcharacters/wildcharacters.h b/wildcharacters/wildcharacters.h

Original file line number	Diff line number	Diff line change
`@@ -314,15 +314,15 @@ void ActionsCollection::ReportError(const char* const message)`
`314`	`314`	`throw std::runtime_error(message);`
`315`	`315`	`}`
`316`	`316`
`317`		`-void ActionsCollection::ReportDuplicateNameError(const std::string_view& aname)`
	`317`	`+void ActionsCollection::ReportDuplicateNameError(const std::string_view aname)`
`318`	`318`	`{`
`319`	`319`	`std::stringstream ss;`
`320`	`320`	`ss << "Duplicate name '" << aname << "' has been met in Actions file";`
`321`	`321`	`ReportError(ss.str().c_str());`
`322`	`322`	`}`
`323`	`323`
`324`	`324`
`325`		`-void ActionsCollection::ReportMissedNameError(const std::string_view& aname)`
	`325`	`+void ActionsCollection::ReportMissedNameError(const std::string_view aname)`
`326`	`326`	`{`
`327`	`327`	`std::stringstream ss;`
`328`	`328`	`ss << "Cannot find lexeme name '" << aname << "' in Actions file";`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace bpatch`
`7`	`7`	`{`
`8`	`8`
`9`		`-std::unique_ptr<AbstractBinaryLexeme>& Dictionary::Lexeme(const std::string_view& aname) const`
	`9`	`+std::unique_ptr<AbstractBinaryLexeme>& Dictionary::Lexeme(const std::string_view aname) const`
`10`	`10`	`{`
`11`	`11`	`if (auto it = dict.find(aname); it != dict.cend())`
`12`	`12`	`{`
`@@ -16,13 +16,13 @@ std::unique_ptr<AbstractBinaryLexeme>& Dictionary::Lexeme(const std::string_view`
`16`	`16`	`}`
`17`	`17`
`18`	`18`
`19`		`-AbstractLexemesPair Dictionary::LexemesPair(const std::string_view& anameSrc, const std::string_view& anameTrg) const`
	`19`	`+AbstractLexemesPair Dictionary::LexemesPair(const std::string_view anameSrc, const std::string_view anameTrg) const`
`20`	`20`	`{`
`21`	`21`	`return {Lexeme(anameSrc), Lexeme(anameTrg)};`
`22`	`22`	`}`
`23`	`23`
`24`	`24`
`25`		`-bool Dictionary::AddBinaryLexeme(const std::string_view& aname, std::unique_ptr<AbstractBinaryLexeme>&& alexeme)`
	`25`	`+bool Dictionary::AddBinaryLexeme(const std::string_view aname, std::unique_ptr<AbstractBinaryLexeme>&& alexeme)`
`26`	`26`	`{`
`27`	`27`	`auto it = lexemes_.emplace(lexemes_.cend(), std::move(alexeme));`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ size_t WriteFileProcessing::Written() const noexcept`
`103`	`103`	`return writeAt_;`
`104`	`104`	`}`
`105`	`105`
`106`		`-size_t WriteFileProcessing::WriteAndThrowIfFail(const string_view& sv)`
	`106`	`+size_t WriteFileProcessing::WriteAndThrowIfFail(const string_view sv)`
`107`	`107`	`{`
`108`	`108`	`#ifdef __linux__`
`109`	`109`	`const size_t written = fwrite_unlocked(sv.data(), sizeof(sv.data()[0]), sv.size(), stream_);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ FlexibleCache::FlexibleCache()`
`12`	`12`	`}`
`13`	`13`
`14`	`14`
`15`		`-bool FlexibleCache::Accumulate(const string_view& adata)`
	`15`	`+bool FlexibleCache::Accumulate(const string_view adata)`
`16`	`16`	`{`
`17`	`17`	`unique_ptr<Chunk>& activeChunk = *currentChunk;`
`18`	`18`