GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 19:22:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

.ngf files should have priority when importing a grammar module

Browse Source
This commit is contained in:
Krasimir Angelov
2023-03-24 12:43:05 +01:00
parent 5d205a06e8
commit beef722f2c
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1256,22 +1256,6 @@ GrammarImporter_find_spec(PyTypeObject *class, PyObject *args)
if (dir == NULL) if (dir == NULL)
break; break;
{
PyObject *py_fpath =
(PyUnicode_GET_LENGTH(dir) == 0) ? PyUnicode_FromFormat("%U.pgf", name)
: PyUnicode_FromFormat("%U/%U.pgf", dir, name);
const char *fpath = PyUnicode_AsUTF8(py_fpath);
if (access(fpath, F_OK) == 0) {
py_importer = (GrammarImporterObject *)class->tp_alloc(class, 0);
py_importer->package_path = get_package_path(dir,name);
py_importer->grammar_path = py_fpath;
py_importer->is_pgf = 1;
Py_DECREF(dir);
break;
}
Py_DECREF(py_fpath);
}
{ {
PyObject *py_fpath = PyObject *py_fpath =
(PyUnicode_GET_LENGTH(dir) == 0) ? PyUnicode_FromFormat("%U.ngf", name) (PyUnicode_GET_LENGTH(dir) == 0) ? PyUnicode_FromFormat("%U.ngf", name)
@@ -1288,6 +1272,22 @@ GrammarImporter_find_spec(PyTypeObject *class, PyObject *args)
Py_DECREF(py_fpath); Py_DECREF(py_fpath);
} }
{
PyObject *py_fpath =
(PyUnicode_GET_LENGTH(dir) == 0) ? PyUnicode_FromFormat("%U.pgf", name)
: PyUnicode_FromFormat("%U/%U.pgf", dir, name);
const char *fpath = PyUnicode_AsUTF8(py_fpath);
if (access(fpath, F_OK) == 0) {
py_importer = (GrammarImporterObject *)class->tp_alloc(class, 0);
py_importer->package_path = get_package_path(dir,name);
py_importer->grammar_path = py_fpath;
py_importer->is_pgf = 1;
Py_DECREF(dir);
break;
}
Py_DECREF(py_fpath);
}
Py_DECREF(dir); Py_DECREF(dir);
} }