summaryrefslogtreecommitdiff
path: root/src/grammar.hh
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2015-01-14 19:14:06 +0100
committerPatrick Simianer <p@simianer.de>2015-01-14 19:14:06 +0100
commit02f4420f4d63708ca912e0e095dcfa528bf848dc (patch)
treee72b923b910594f3e0071b2603c6aa8b013f7202 /src/grammar.hh
parenta1eea9655deea9a563a2ee13c82cd4545e182c7d (diff)
small changes
Diffstat (limited to 'src/grammar.hh')
-rw-r--r--src/grammar.hh10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/grammar.hh b/src/grammar.hh
index c489ec5..51a72fa 100644
--- a/src/grammar.hh
+++ b/src/grammar.hh
@@ -52,7 +52,6 @@ struct NT : public Item {
istringstream ss(t);
if (ss >> index_) { // [i]
symbol_ = "";
- index_ = stoi(s);
return;
} else {
ss.clear();
@@ -111,7 +110,7 @@ struct T : public Item {
virtual ostream&
escaped(ostream& os) const
{
- os << util::json_escape(symbol_);
+ return os << util::json_escape(symbol_);
}
};
@@ -156,6 +155,7 @@ struct Rule {
Sv::SparseVector<string, score_t>* f;
map<size_t, size_t> order;
string as_str_;
+ bool is_glue;
Rule() {}
@@ -201,6 +201,7 @@ Sv::SparseVector<string, score_t>* f;
}
if (j == 4) break;
}
+ r->is_glue = false;
}
ostream&
@@ -303,14 +304,13 @@ struct Grammar {
for (auto nt: nts) {
ostringstream oss_1;
oss_1 << "[S] ||| [" << nt << ",1] ||| [" << nt << ",1] ||| ";
- cout << oss_1.str() << endl;
Rule* r1 = new Rule(oss_1.str(), vocab);
+ r1->is_glue = true;
rules.push_back(r1); start_non_terminal.push_back(r1);
ostringstream oss_2;
oss_2 << "[S] ||| [S,1] [" << nt << ",2] ||| [S,1] [" << nt << ",2] ||| ";
- cout << oss_2.str() << endl;
Rule* r2 = new Rule(oss_2.str(), vocab);
- cout << *r2 << endl;
+ r2->is_glue = true;
rules.push_back(r2); start_non_terminal.push_back(r2);
}
}