Changeset 1124 for cpp

Timestamp:

04/11/21 02:08:46 (4 years ago)

Author:

Maciej Komosinski

Message:

Added helper utility functions

Location:

cpp/common

Files:

• util-file.cpp (modified) (2 diffs)
• util-file.h (modified) (3 diffs)
• util-stl.h (modified) (3 diffs)

cpp/common/util-file.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -87 +87 @@
         return writeCompleteFile(filename, s, warn_on_fail);
 }
+
+// Just like fgets(), but string length is unlimited and does not store trailing \r \n
+string readUntilEOL(VirtFILE *f)
+{
+        char buf[100];
+        char* line;
+        std::string ret;
+        bool endofline;
+        while ((line = f->Vgets(buf, sizeof(buf))))
+        {
+                char* end = line + strlen(line);
+                endofline = false;
+                while (end > line)
+                        if ((end[-1] == '\n') || (end[-1] == '\r'))
+                        {
+                                endofline = true;
+                                end--;
+                        }
+                        else
+                                break;
+                ret += std::string(line, end - line);
+                if (endofline) break;
+        }
+        return ret;
+}

cpp/common/util-file.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -7 +7 @@
 
 #include "nonstd_stl.h"
+#include "virtfile/virtfile.h"
 
 bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file = true);
@@ -12 +13 @@
 bool writeCompleteFile(const char* filename, const std::string& text, bool warn_on_fail = true);
 bool writeCompleteFile(const char* filename, vector<char>& data, bool warn_on_fail = true);
+string readUntilEOL(VirtFILE *f);
 
 #endif

cpp/common/util-stl.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -7 +7 @@
 
 #include "nonstd_stl.h"
+#include <map>
 
 template<typename T, std::size_t N> void push_back(vector<T>& v, T(&d)[N])
@@ -36 +37 @@
 }
 
+template<typename Key,typename Value> Value mapValueOrDefault(const std::map<Key,Value> &map, const Key& key, const Value& default_value)
+{
+        auto found = map.find(key);
+        if (found != map.end())
+                return found->second;
+        else
+                return default_value;
+}
+
 template<class T> class DeletingVector  // deletes the elements (pointers) in destructor
 {