GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-16 06:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

switch to using FILE * in the reader

Browse Source
This commit is contained in:
krangelov
2021-09-15 08:06:18 +02:00
parent 9fe6ee3cce
commit c6d6914688
4 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/runtime/c/pgf/pgf.cxx
View File

@@ -36,18 +36,19 @@ PgfDB *pgf_read_pgf(const char* fpath,
PgfExn* err)
{
PgfDB *db = NULL;
FILE *in = NULL;
PGF_API_BEGIN {
db = new PgfDB(NULL, 0, 0);
std::ifstream in(fpath, std::ios::binary);
if (in.fail()) {
in = fopen(fpath, "rb");
if (!in) {
throw pgf_systemerror(errno, fpath);
}
{
DB_scope scope(db, WRITER_SCOPE);
PgfReader rdr(&in, fpath);
PgfReader rdr(in, fpath);
ref<PgfPGF> pgf = rdr.read_pgf();
PgfDB::set_revision(pgf);
@@ -58,6 +59,9 @@ PgfDB *pgf_read_pgf(const char* fpath,
} PGF_API_END
end:
if (in != NULL)
fclose(in);
if (db != NULL)
delete db;
@@ -70,19 +74,20 @@ PgfDB *pgf_boot_ngf(const char* pgf_path, const char* ngf_path,
PgfExn* err)
{
PgfDB *db = NULL;
FILE *in = NULL;
PGF_API_BEGIN {
db = new PgfDB(ngf_path, O_CREAT | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR);
std::ifstream in(pgf_path, std::ios::binary);
if (in.fail()) {
in = fopen(pgf_path, "rb");
if (!in) {
throw pgf_systemerror(errno, pgf_path);
}
{
DB_scope scope(db, WRITER_SCOPE);
PgfReader rdr(&in, pgf_path);
PgfReader rdr(in, pgf_path);
ref<PgfPGF> pgf = rdr.read_pgf();
PgfDB::set_revision(pgf);
@@ -92,6 +97,9 @@ PgfDB *pgf_boot_ngf(const char* pgf_path, const char* ngf_path,
return db;
} PGF_API_END
if (in != NULL)
fclose(in);
if (db != NULL) {
delete db;
remove(ngf_path);