GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-08-20 03:06:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

_Rb_tree doesn't exist on Windows and macOS. Go back to using map

Browse Source
This commit is contained in:
Krasimir Angelov
2023-03-14 09:40:38 +01:00
parent 92c2840b2b
commit 9a0a730820
3 changed files with 43 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runtime/c/pgf/generator.h
+12 -50
View File
@@ -91,45 +91,25 @@ class PGF_INTERNAL_DECL PgfExhaustiveGenerator : public PgfUnmarshaller, public
void complete(PgfExhaustiveGenerator *gen, PgfUnmarshaller *u);
};
struct Goal {
ref<PgfText> cat;
typedef std::pair<ref<PgfText>,Scope*> Goal;
struct Result {
size_t ref_count;
Scope *scope;
size_t scope_len;
std::vector<State1*> states;
std::vector<std::pair<PgfExpr,prob_t>> exprs;
Goal(ref<PgfText> cat) {
this->cat = cat;
Result() {
this->ref_count = 0;
this->scope = NULL;
this->scope_len = 0;
}
Goal(ref<PgfText> cat, Goal &g) {
this->cat = cat;
this->scope = g.scope;
this->scope_len = g.scope_len;
}
Goal(Goal &g) {
this->cat = g.cat;
this->scope = g.scope;
this->scope_len = g.scope_len;
}
};
struct Result : Goal {
size_t ref_count;
std::vector<State1*> states;
std::vector<std::pair<PgfExpr,prob_t>> exprs;
Result(ref<PgfText> cat) : Goal(cat) {
this->ref_count = 0;
}
Result(ref<PgfText> cat, Goal &g) : Goal(cat,g) {
this->ref_count = 0;
}
Result(Goal &g) : Goal(g) {
Result(Scope *scope, size_t scope_len) {
this->ref_count = 0;
this->scope = scope;
this->scope_len = scope_len;
}
};
@@ -140,25 +120,7 @@ class PGF_INTERNAL_DECL PgfExhaustiveGenerator : public PgfUnmarshaller, public
}
};
struct CompareGoal : public std::less<Goal> {
bool operator() (const Goal &g1, const Goal &g2) const {
int cmp = textcmp(g1.cat, g2.cat);
if (cmp < 0)
return true;
else if (cmp > 0)
return false;
else
return (g1.scope < g2.scope);
}
};
struct Result2Goal {
Goal &operator()(Result *res) {
return *res;
}
};
std::_Rb_tree<Goal&, Result*, Result2Goal, CompareGoal> results;
std::map<Goal, Result*> results;
std::priority_queue<State*, std::vector<State*>, CompareState> queue;
std::vector<Scope*> scopes;