1 files changed, 20 insertions, 20 deletions
diff --git a/include/inja/utils.hpp b/include/inja/utils.hpp
index fb1736c..4de05fd 100644
--- a/include/inja/utils.hpp
+++ b/include/inja/utils.hpp
@@ -1,53 +1,42 @@
-// Copyright (c) 2020 Pantor. All rights reserved.
-
 #ifndef INCLUDE_INJA_UTILS_HPP_
 #define INCLUDE_INJA_UTILS_HPP_
 
 #include <algorithm>
 #include <fstream>
 #include <string>
+#include <string_view>
 #include <utility>
 
 #include "exceptions.hpp"
-#include "string_view.hpp"
 
 namespace inja {
 
-inline void open_file_or_throw(const std::string &path, std::ifstream &file) {
-  file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
-  try {
-    file.open(path);
-  } catch (const std::ios_base::failure & /*e*/) {
-    INJA_THROW(FileError("failed accessing file at '" + path + "'"));
-  }
-}
-
 namespace string_view {
-inline nonstd::string_view slice(nonstd::string_view view, size_t start, size_t end) {
+inline std::string_view slice(std::string_view view, size_t start, size_t end) {
   start = std::min(start, view.size());
   end = std::min(std::max(start, end), view.size());
   return view.substr(start, end - start);
 }
 
-inline std::pair<nonstd::string_view, nonstd::string_view> split(nonstd::string_view view, char Separator) {
+inline std::pair<std::string_view, std::string_view> split(std::string_view view, char Separator) {
   size_t idx = view.find(Separator);
-  if (idx == nonstd::string_view::npos) {
-    return std::make_pair(view, nonstd::string_view());
+  if (idx == std::string_view::npos) {
+    return std::make_pair(view, std::string_view());
   }
-  return std::make_pair(slice(view, 0, idx), slice(view, idx + 1, nonstd::string_view::npos));
+  return std::make_pair(slice(view, 0, idx), slice(view, idx + 1, std::string_view::npos));
 }
 
-inline bool starts_with(nonstd::string_view view, nonstd::string_view prefix) {
+inline bool starts_with(std::string_view view, std::string_view prefix) {
   return (view.size() >= prefix.size() && view.compare(0, prefix.size(), prefix) == 0);
 }
 } // namespace string_view
 
-inline SourceLocation get_source_location(nonstd::string_view content, size_t pos) {
+inline SourceLocation get_source_location(std::string_view content, size_t pos) {
   // Get line and offset position (starts at 1:1)
   auto sliced = string_view::slice(content, 0, pos);
   std::size_t last_newline = sliced.rfind("\n");
 
-  if (last_newline == nonstd::string_view::npos) {
+  if (last_newline == std::string_view::npos) {
     return {1, sliced.length() + 1};
   }
 
@@ -65,6 +54,17 @@ inline SourceLocation get_source_location(nonstd::string_view content, size_t po
   return {count_lines + 1, sliced.length() - last_newline};
 }
 
+inline void replace_substring(std::string& s, const std::string& f, const std::string& t) {
+  if (f.empty()) {
+    return;
+  }
+  for (auto pos = s.find(f);            // find first occurrence of f
+       pos != std::string::npos;        // make sure f was found
+       s.replace(pos, f.size(), t),     // replace with t, and
+       pos = s.find(f, pos + t.size())) // find next occurrence of f
+  {}
+}
+
 } // namespace inja
 
 #endif // INCLUDE_INJA_UTILS_HPP_