refactor(string): make StrType::asUCS4 a static method

Author: Xmader

include/StrType.hh

@@ -50,7 +50,7 @@ public:
    * @return PyObject* - the UCS4-encoding of the pyObject string
    *
    */
-  PyObject *asUCS4();
+  static PyObject *asUCS4(PyObject *pyObject);
 };
 
 #endif

src/StrType.cc

@@ -103,7 +103,7 @@ StrType::StrType(JSContext *cx, JSString *str) {
 
     if (containsSurrogatePair(chars, length)) {
       // We must convert to UCS4 here because Python does not support decoding string containing surrogate pairs to bytes
-      PyObject *ucs4Obj = this->asUCS4(); // convert `pyObject` to a new PyUnicodeObject with UCS4 data
+      PyObject *ucs4Obj = asUCS4(pyObject); // convert to a new PyUnicodeObject with UCS4 data
       if (!ucs4Obj) {
         // conversion fails, keep the original `pyObject`
         return;
@@ -118,7 +118,8 @@ const char *StrType::getValue() const {
   return PyUnicode_AsUTF8(pyObject);
 }
 
-PyObject *StrType::asUCS4() {
+/* static */
+PyObject *StrType::asUCS4(PyObject *pyObject) {
   if (PyUnicode_KIND(pyObject) != PyUnicode_2BYTE_KIND) {
     return Py_NewRef(pyObject);
   }

src/modules/pythonmonkey/pythonmonkey.cc

@@ -143,13 +143,13 @@ static PyObject *collect(PyObject *self, PyObject *args) {
 }
 
 static PyObject *asUCS4(PyObject *self, PyObject *args) {
-  StrType *str = new StrType(PyTuple_GetItem(args, 0));
-  if (!PyUnicode_Check(str->getPyObject())) {
+  PyObject *str = PyTuple_GetItem(args, 0);
+  if (!PyUnicode_Check(str)) {
     PyErr_SetString(PyExc_TypeError, "pythonmonkey.asUCS4 expects a string as its first argument");
     return NULL;
   }
 
-  PyObject *ucs4Str = str->asUCS4();
+  PyObject *ucs4Str = StrType::asUCS4(str);
   if (!ucs4Str) {
     PyErr_SetString(PyExc_UnicodeTranslateError, "string contains an unpaired surrogates");
     return NULL;