msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Replace uses of PyUnicode_FromString with PyUnicode_FromStringAndSize

Browse Source 
See https://github.com/GrammaticalFramework/gf-core/issues/130#issuecomment-908979886
This commit is contained in:
John J. Camilleri
2021-08-31 10:12:27 +02:00
parent 901c3f9086
commit 8061a9e82a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/runtime/python/pypgf.c
View File

@@ -23,7 +23,6 @@
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
#define PyString_Check PyUnicode_Check #define PyString_Check PyUnicode_Check
#define PyString_FromString PyUnicode_FromString
#define PyString_FromStringAndSize PyUnicode_FromStringAndSize #define PyString_FromStringAndSize PyUnicode_FromStringAndSize
#define PyString_FromFormat PyUnicode_FromFormat #define PyString_FromFormat PyUnicode_FromFormat
#define PyString_Concat(ps,s) {PyObject* tmp = *(ps); *(ps) = PyUnicode_Concat(tmp,s); Py_DECREF(tmp);} #define PyString_Concat(ps,s) {PyObject* tmp = *(ps); *(ps) = PyUnicode_Concat(tmp,s); Py_DECREF(tmp);}
@@ -2867,7 +2866,7 @@ static PyObject*
PGF_getAbstractName(PGFObject *self, void *closure) PGF_getAbstractName(PGFObject *self, void *closure)
{ {
PgfText* txt = pgf_abstract_name(self->pgf); PgfText* txt = pgf_abstract_name(self->pgf);
return PyString_FromString(txt->text); return PyString_FromStringAndSize(txt->text, txt->size);
} }
// static void // static void
@@ -2965,7 +2964,7 @@ pgf_collect_cats(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
PyObject* py_name = NULL; PyObject* py_name = NULL;
py_name = PyString_FromString(name->text); py_name = PyString_FromStringAndSize(name->text, name->size);
if (py_name == NULL) { if (py_name == NULL) {
err->type = PGF_EXN_OTHER_ERROR; err->type = PGF_EXN_OTHER_ERROR;
goto end; goto end;
@@ -3026,7 +3025,7 @@ pgf_collect_funs(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
PyObject* py_name = NULL; PyObject* py_name = NULL;
py_name = PyString_FromString(name->text); py_name = PyString_FromStringAndSize(name->text, name->size);
if (py_name == NULL) { if (py_name == NULL) {
err->type = PGF_EXN_OTHER_ERROR; err->type = PGF_EXN_OTHER_ERROR;
goto end; goto end;
@@ -3720,7 +3719,7 @@ MOD_INIT(pgf)
Py_INCREF(PGFError); Py_INCREF(PGFError);
PyObject *dict = PyDict_New(); PyObject *dict = PyDict_New();
PyDict_SetItemString(dict, "token", PyString_FromString("")); PyDict_SetItemString(dict, "token", PyString_FromStringAndSize("", 0));
ParseError = PyErr_NewException("pgf.ParseError", NULL, dict); ParseError = PyErr_NewException("pgf.ParseError", NULL, dict);
PyModule_AddObject(m, "ParseError", ParseError); PyModule_AddObject(m, "ParseError", ParseError);
Py_INCREF(ParseError); Py_INCREF(ParseError);