OMSString (#981)

Author: lochel

src/OMSimulatorLib/CMakeLists.txt

@@ -53,6 +53,7 @@ list(APPEND OMSIMULATORLIB_SOURCES MATWriter.cpp)
 list(APPEND OMSIMULATORLIB_SOURCES Model.cpp)
 list(APPEND OMSIMULATORLIB_SOURCES OMSFileSystem.cpp)
 list(APPEND OMSIMULATORLIB_SOURCES OMSimulator.cpp)
+list(APPEND OMSIMULATORLIB_SOURCES OMSString.cpp)
 list(APPEND OMSIMULATORLIB_SOURCES ResultReader.cpp)
 list(APPEND OMSIMULATORLIB_SOURCES ResultWriter.cpp)
 list(APPEND OMSIMULATORLIB_SOURCES Scope.cpp)

src/OMSimulatorLib/ComRef.cpp

@@ -30,28 +30,28 @@
  */
 
 #include "ComRef.h"
+
+#include "OMSString.h"
+
 #include <assert.h>
 #include <RegEx.h>
 
 const oms_regex re_ident("^[a-zA-Z][a-zA-Z0-9_]*$");
 
 oms::ComRef::ComRef()
 {
-  cref = new char[1];
-  cref[0] = '\0';
+  cref = allocateAndCopyString(NULL);
 }
 
 oms::ComRef::ComRef(const std::string& path)
 {
-  cref = new char[path.size() + 1];
-  strcpy(cref, path.c_str());
+  cref = allocateAndCopyString(path);
 }
 
 oms::ComRef::ComRef(const char* path)
 {
   assert(path);
-  cref = new char[strlen(path) + 1];
-  strcpy(cref, path);
+  cref = allocateAndCopyString(path);
 }
 
 oms::ComRef::~ComRef()
@@ -61,8 +61,7 @@ oms::ComRef::~ComRef()
 
 oms::ComRef::ComRef(const oms::ComRef& copy)
 {
-  cref = new char[strlen(copy.cref) + 1];
-  strcpy(cref, copy.cref);
+  cref = allocateAndCopyString(copy.cref);
 }
 
 oms::ComRef& oms::ComRef::operator=(const oms::ComRef& copy)
@@ -72,8 +71,7 @@ oms::ComRef& oms::ComRef::operator=(const oms::ComRef& copy)
     return *this;
 
   delete[] cref;
-  cref = new char[strlen(copy.cref) + 1];
-  strcpy(cref, copy.cref);
+  cref = allocateAndCopyString(copy.cref);
 
   return *this;
 }
@@ -204,6 +202,11 @@ oms::ComRef oms::ComRef::pop_front()
   return front;
 }
 
+size_t oms::ComRef::size() const
+{
+  return strlen(cref);
+}
+
 bool oms::operator==(const oms::ComRef& lhs, const oms::ComRef& rhs)
 {
   return (0 == strcmp(lhs.c_str(), rhs.c_str()));

src/OMSimulatorLib/ComRef.h

@@ -33,7 +33,6 @@
 #define _OMS_COM_REF_H_
 
 #include <string>
-#include <cstring>
 
 namespace oms
 {
@@ -74,7 +73,7 @@ namespace oms
     bool hasSuffix(const std::string& suffix) const; ///< returns true if the cref has a suffix that matches the argument
 
     const char* c_str() const {return cref;}
-    size_t size() {return strlen(cref);}
+    size_t size() const;
     operator std::string() const {return std::string(cref);}
 
   private:

src/OMSimulatorLib/FMUInfo.cpp

@@ -32,8 +32,8 @@
 #include "FMUInfo.h"
 
 #include "Logging.h"
+#include "OMSString.h"
 
-#include <cstring>
 
 oms::FMUInfo::FMUInfo(const std::string& path)
 {
@@ -47,7 +47,7 @@ oms::FMUInfo::FMUInfo(const std::string& path)
   this->guid = nullptr;
   this->license = nullptr;
   this->modelName = nullptr;
-  this->path = new char[path.size()+1]; strcpy(this->path, path.c_str());
+  this->path = allocateAndCopyString(path);
   this->version = nullptr;
   this->canBeInstantiatedOnlyOncePerProcess = false;
   this->canGetAndSetFMUstate = false;
@@ -75,24 +75,6 @@ oms::FMUInfo::~FMUInfo()
   if (this->version) delete[] this->version;
 }
 
-char* allocateAndCopyString(const char* source)
-{
-  char* target;
-
-  if (source)
-  {
-    target = new char[strlen(source) + 1];
-    strcpy(target, source);
-  }
-  else
-  {
-    target = new char[1];
-    target[0] = '\0';
-  }
-
-  return target;
-}
-
 void oms::FMUInfo::update(fmi_version_enu_t version, fmi2_import_t* fmu)
 {
   fmi2_fmu_kind_enu_t fmuKind = fmi2_import_get_fmu_kind(fmu);

src/OMSimulatorLib/OMSFileSystem.h

@@ -1,4 +1,5 @@
 #ifndef _OMS_FILESYSTEM_H_
+#define _OMS_FILESYSTEM_H_
 
 #if !defined(WITHOUT_FS) && defined(__has_include)
 

src/OMSimulatorLib/OMSString.cpp

@@ -0,0 +1,57 @@
+/*
+ * This file is part of OpenModelica.
+ *
+ * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC),
+ * c/o Linköpings universitet, Department of Computer and Information Science,
+ * SE-58183 Linköping, Sweden.
+ *
+ * All rights reserved.
+ *
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR
+ * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2.
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3,
+ * ACCORDING TO RECIPIENTS CHOICE.
+ *
+ * The OpenModelica software and the Open Source Modelica
+ * Consortium (OSMC) Public License (OSMC-PL) are obtained
+ * from OSMC, either from the above address,
+ * from the URLs: http://www.ida.liu.se/projects/OpenModelica or
+ * http://www.openmodelica.org, and in the OpenModelica distribution.
+ * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
+ * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL.
+ *
+ * See the full OSMC Public License conditions for more details.
+ *
+ */
+
+#include "OMSString.h"
+
+#include <cstring>
+
+char* oms::allocateAndCopyString(const char* source)
+{
+  char* target;
+
+  if (source)
+  {
+    target = new char[strlen(source) + 1];
+    strcpy(target, source);
+  }
+  else
+  {
+    target = new char[1];
+    target[0] = '\0';
+  }
+
+  return target;
+}
+
+char* oms::allocateAndCopyString(const std::string& source)
+{
+  return allocateAndCopyString(source.c_str());
+}

src/OMSimulatorLib/OMSString.h

@@ -0,0 +1,43 @@
+/*
+ * This file is part of OpenModelica.
+ *
+ * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC),
+ * c/o Linköpings universitet, Department of Computer and Information Science,
+ * SE-58183 Linköping, Sweden.
+ *
+ * All rights reserved.
+ *
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR
+ * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2.
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3,
+ * ACCORDING TO RECIPIENTS CHOICE.
+ *
+ * The OpenModelica software and the Open Source Modelica
+ * Consortium (OSMC) Public License (OSMC-PL) are obtained
+ * from OSMC, either from the above address,
+ * from the URLs: http://www.ida.liu.se/projects/OpenModelica or
+ * http://www.openmodelica.org, and in the OpenModelica distribution.
+ * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
+ * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL.
+ *
+ * See the full OSMC Public License conditions for more details.
+ *
+ */
+
+#ifndef _OMS_STRING_H_
+#define _OMS_STRING_H_
+
+#include <string>
+
+namespace oms
+{
+  char* allocateAndCopyString(const char* source);
+  char* allocateAndCopyString(const std::string& source);
+}
+
+#endif