Cleanup

Remove unused code from Filesystem.(h|c)pp Unify replace_all and replace_all_nonrecursively in StringManip.hpp
openPMD · Nov 22, 2018 · 757a9e0 · 757a9e0
1 parent 9b63e5f
commit 757a9e0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1,590 deletions.
diff --git a/include/openPMD/auxiliary/Filesystem.hpp b/include/openPMD/auxiliary/Filesystem.hpp
@@ -87,27 +87,5 @@ remove_directory(std::string const& path);
  */
 bool
 remove_file(std::string const& path);
-
-// /** Opens the file identified by the given path.
-//  * 
-//  * @param   path    Absolute or relative path to the file to create.
-//  * @param   accessType  The access type. 
-//  *              If it is `CREATE` a new file is created and opened in write mode. 
-//  *              If it is `READ_WRITE`, an existing file is opened in read-write mode.
-//  *              If it is `READ_ONLY`, an existing file is opened in read-only mode.
-//  * @return  A file handle if the file was successfully opened or created,
-//  *       a nullpointer otherwise.
-//  */
-// FILEHANDLE
-// open_file(std::string const& path, AccessType);
-
-// /** Closes the file identified by the file handle.
-//  * 
-//  * @param   fileHandle  The filehandle of the file to close.
-//  * @return  True if closing was successful, false otherwise.
-//  */
-// bool
-// close_file(FILEHANDLE);
-
 } // auxiliary
 } // openPMD
diff --git a/include/openPMD/auxiliary/StringManip.hpp b/include/openPMD/auxiliary/StringManip.hpp
@@ -105,7 +105,7 @@ replace_last(std::string s,
 }
 
 inline std::string
-replace_all_nonrecursively(std::string s,
+replace_all(std::string s,
             std::string const& target,
             std::string const& replacement)
 {
@@ -124,19 +124,6 @@ replace_all_nonrecursively(std::string s,
     return s;
 }
 
-inline std::string
-replace_all(std::string s,
-            std::string const& target,
-            std::string const& replacement)
-{
-    std::string::size_type pos;
-    while( (pos = s.find(target)) != std::string::npos )
-        s.replace(pos, target.size(), replacement);
-    s.shrink_to_fit();
-
-    return s;
-}
-
 inline std::vector< std::string >
 split(std::string const &s,
       std::string const &delimiter,

diff --git a/src/IO/JSON/JSONIOHandlerImpl.cpp b/src/IO/JSON/JSONIOHandlerImpl.cpp
@@ -148,7 +148,7 @@ namespace openPMD
                 ""
             );
         }
-        auto expandedPath = auxiliary::replace_all_nonrecursively(
+        auto expandedPath = auxiliary::replace_all(
             path,
             "/",
             "/subgroups/"
@@ -310,7 +310,7 @@ namespace openPMD
 
         nlohmann::json * j = &obtainJsonContents( writable->parent );
         std::string path;
-        auto extended = "/subgroups/" + auxiliary::replace_all_nonrecursively(
+        auto extended = "/subgroups/" + auxiliary::replace_all(
             removeSlashes( parameters.path ),
             "/",
             "/subgroups/"
@@ -710,9 +710,8 @@ namespace openPMD
         Parameter< Operation::READ_ATT > & parameters
     )
     {
-        //        VERIFY_ALWAYS( writable->written,
-        //            "Attributes have to be written before reading." )
-        // TODO ???
+        VERIFY_ALWAYS( writable->written,
+            "Attributes have to be written before reading." )
         refreshFileFromParent( writable );
         auto name = removeSlashes( parameters.name );
         auto & jsonLoc = obtainJsonContents( writable )["attributes"];
@@ -746,9 +745,8 @@ namespace openPMD
         Parameter< Operation::LIST_PATHS > & parameters
     )
     {
-        //        VERIFY_ALWAYS( writable->written,
-        //            "Values have to be written before reading a directory" );
-        // TODO ???
+        VERIFY_ALWAYS( writable->written,
+            "Values have to be written before reading a directory" );
         auto & j = obtainJsonContents( writable )["subgroups"];
         setAndGetFilePosition( writable );
         refreshFileFromParent( writable );
@@ -767,9 +765,8 @@ namespace openPMD
         Parameter< Operation::LIST_DATASETS > & parameters
     )
     {
-        //        VERIFY_ALWAYS( writable->written,
-        //            "Datasets have to be written before reading." )
-        // TODO ???
+        VERIFY_ALWAYS( writable->written,
+            "Datasets have to be written before reading." )
         refreshFileFromParent( writable );
         auto filePosition = setAndGetFilePosition( writable );
         auto & j = obtainJsonContents( writable )["datasets"];
@@ -786,9 +783,8 @@ namespace openPMD
         Parameter< Operation::LIST_ATTS > & parameters
     )
     {
-        //        VERIFY_ALWAYS( writable->written,
-        //            "Attributes have to be written before reading." )
-        // TODO ???
+        VERIFY_ALWAYS( writable->written,
+            "Attributes have to be written before reading." )
         refreshFileFromParent( writable );
         auto filePosition = setAndGetFilePosition( writable );
         auto & j = obtainJsonContents( writable )["attributes"];