You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by GitBox <gi...@apache.org> on 2020/06/15 15:51:31 UTC

[GitHub] [incubator-tvm] tqchen commented on a change in pull request #5806: [RUNTIME][String] Overload string operators

tqchen commented on a change in pull request #5806:
URL: https://github.com/apache/incubator-tvm/pull/5806#discussion_r440275128



##########
File path: include/tvm/runtime/container.h
##########
@@ -1410,10 +1344,114 @@ inline String& String::operator=(std::string other) {
 
 inline String& String::operator=(const char* other) { return operator=(std::string(other)); }
 
-inline String operator+(const std::string lhs, const String& rhs) {
-  return lhs + rhs.operator std::string();
+template <typename T, typename U,
+          typename = typename std::enable_if<std::is_same<T, String>::value ||
+                                             std::is_same<T, std::string>::value>::type,
+          typename = typename std::enable_if<std::is_same<U, String>::value ||
+                                             (std::is_same<U, std::string>::value &&
+                                              !std::is_same<T, U>::value)>::type>
+inline String operator+(const T& lhs, const U& rhs) {
+  size_t lhs_size = lhs.size();
+  size_t rhs_size = rhs.size();
+  char* concat = new char[lhs_size + rhs_size + 1];
+  std::memcpy(concat, lhs.data(), lhs_size);
+  std::memcpy(concat + lhs_size, rhs.data(), rhs_size);
+  auto ptr = make_object<StringObj>();

Review comment:
       We will need to have a customized deleter. Directly allocating will cause the memory not being released. Let us use StringObj::FromStd for now. Alternatively, create another subclass of StringObj that contains the customized deleter(hopefully via inplaceArray)

##########
File path: include/tvm/runtime/container.h
##########
@@ -1410,10 +1344,114 @@ inline String& String::operator=(std::string other) {
 
 inline String& String::operator=(const char* other) { return operator=(std::string(other)); }
 
-inline String operator+(const std::string lhs, const String& rhs) {
-  return lhs + rhs.operator std::string();
+template <typename T, typename U,
+          typename = typename std::enable_if<std::is_same<T, String>::value ||
+                                             std::is_same<T, std::string>::value>::type,
+          typename = typename std::enable_if<std::is_same<U, String>::value ||
+                                             (std::is_same<U, std::string>::value &&
+                                              !std::is_same<T, U>::value)>::type>
+inline String operator+(const T& lhs, const U& rhs) {
+  size_t lhs_size = lhs.size();
+  size_t rhs_size = rhs.size();
+  char* concat = new char[lhs_size + rhs_size + 1];
+  std::memcpy(concat, lhs.data(), lhs_size);
+  std::memcpy(concat + lhs_size, rhs.data(), rhs_size);
+  auto ptr = make_object<StringObj>();
+  ptr->size = lhs_size + rhs_size;
+  ptr->data = concat;
+  return String(ptr);
+}
+
+inline String operator+(const char* lhs, const String& rhs) {
+  size_t lhs_size = std::strlen(lhs);
+  size_t rhs_size = rhs.size();
+  char* concat = new char[lhs_size + rhs_size + 1];
+  std::memcpy(concat, lhs, lhs_size);
+  std::memcpy(concat + lhs_size, rhs.data(), rhs_size);

Review comment:
       Createa common private static function, Concat(lhs, size, rhs, size)




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org