Moved string utilities to opm/common

CMakeLists_files.cmake

@@ -509,6 +509,7 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/common/utility/parameters/ParameterStrings.hpp
       opm/common/utility/parameters/ParameterTools.hpp
       opm/common/utility/numeric/calculateCellVol.hpp
+      opm/common/utility/String.hpp
       opm/common/utility/TimeService.hpp
 )
 if(ENABLE_ECL_INPUT)
@@ -518,7 +519,6 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/Utility/Stringview.hpp
        opm/parser/eclipse/Utility/Functional.hpp
        opm/parser/eclipse/Utility/Typetools.hpp
-       opm/parser/eclipse/Utility/String.hpp
        opm/parser/eclipse/Generator/KeywordGenerator.hpp
        opm/parser/eclipse/Generator/KeywordLoader.hpp
        opm/parser/eclipse/Units/UnitSystem.hpp

src/opm/io/eclipse/rst/group.cpp

@@ -16,7 +16,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 #include <opm/io/eclipse/rst/header.hpp>
 #include <opm/io/eclipse/rst/group.hpp>

src/opm/io/eclipse/rst/well.cpp

@@ -16,7 +16,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 #include <opm/io/eclipse/rst/header.hpp>
 #include <opm/io/eclipse/rst/connection.hpp>

src/opm/parser/eclipse/Deck/DeckItem.cpp

@@ -20,7 +20,7 @@
 #include <opm/parser/eclipse/Deck/DeckOutput.hpp>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Units/Dimension.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 #include <algorithm>
 #include <string>

src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp

@@ -1,6 +1,6 @@
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EndpointScaling.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 namespace Opm {
 

src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp

@@ -18,14 +18,14 @@
 */
 
 #include <opm/parser/eclipse/EclipseState/Grid/PinchMode.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 #include <stdexcept>
 
 namespace Opm {
 
     namespace PinchMode {
-        
+
         const std::string PinchMode2String(const ModeEnum enumValue) {
             std::string stringValue;
             switch (enumValue) {
@@ -56,7 +56,7 @@ namespace Opm {
                 std::string msg = "Unsupported pinchout mode " + s;
                 throw std::invalid_argument(msg);
             }
-            
+
             return mode;
         }
     }

src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp

@@ -25,7 +25,7 @@ namespace py = pybind11;
 #endif
 
 
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 #include <opm/common/utility/FileSystem.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.hpp>
 

src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp

@@ -26,9 +26,9 @@
 
 #include <opm/common/OpmLog/LogUtil.hpp>
 #include <opm/common/utility/numeric/cmp.hpp>
+#include <opm/common/utility/String.hpp>
 
 #include <opm/parser/eclipse/Python/Python.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>

src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp

@@ -32,7 +32,7 @@
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 
 constexpr const std::time_t invalid_time = -1;

src/opm/parser/eclipse/EclipseState/checkDeck.cpp

@@ -21,13 +21,12 @@
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/LogUtil.hpp>
 
-#include <opm/parser/eclipse/Utility/String.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckSection.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 namespace Opm {
 bool checkDeck( const Deck& deck, const Parser& parser, const ParseContext& parseContext, ErrorGuard& errorGuard, size_t enabledChecks) {

src/opm/parser/eclipse/Parser/ParseContext.cpp

@@ -25,7 +25,7 @@
 #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
 #include <opm/parser/eclipse/Parser/InputErrorAction.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 namespace Opm {
 

src/opm/parser/eclipse/Parser/Parser.cpp

@@ -49,7 +49,7 @@
 #include <opm/parser/eclipse/Parser/ParserKeyword.hpp>
 #include <opm/parser/eclipse/Parser/ParserRecord.hpp>
 #include <opm/parser/eclipse/Utility/Stringview.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 #include "raw/RawConsts.hpp"
 #include "raw/RawEnums.hpp"

src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp

@@ -19,7 +19,7 @@
 #include <stdexcept>
 
 #include <opm/parser/eclipse/Parser/ParserKeyword.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 #include "RawConsts.hpp"
 #include "RawKeyword.hpp"

src/opm/parser/eclipse/Units/UnitSystem.cpp

@@ -21,7 +21,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 #include <opm/parser/eclipse/Units/Dimension.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>

tests/parser/StringTests.cpp

@@ -2,7 +2,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 #include <opm/parser/eclipse/Utility/Stringview.hpp>
 
 using namespace Opm;

tests/test_PaddedOutputString.cpp

@@ -3,7 +3,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <opm/io/eclipse/PaddedOutputString.hpp>
-#include <opm/parser/eclipse/Utility/String.hpp>
+#include <opm/common/utility/String.hpp>
 
 // Convenience alias.
 template <std::size_t N>