diff options
author | Patrick Simianer <p@simianer.de> | 2014-01-13 12:37:45 +0100 |
---|---|---|
committer | Patrick Simianer <p@simianer.de> | 2014-01-13 12:37:45 +0100 |
commit | 6ec8836c01223994816be6b7bdbb9abf136a1343 (patch) | |
tree | 3ded58a7f26854fdeb89451059618e7116b3b6ca /decoder/grammar.cc | |
parent | 70b5d1ddbce169426f7cbdfcfe9186346bea3012 (diff) | |
parent | a1cf0d10fe44ede32d29be37107884b734d459ae (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'decoder/grammar.cc')
-rw-r--r-- | decoder/grammar.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/decoder/grammar.cc b/decoder/grammar.cc index 160d00e6..439e448d 100644 --- a/decoder/grammar.cc +++ b/decoder/grammar.cc @@ -121,11 +121,11 @@ static void AddRuleHelper(const TRulePtr& new_rule, const unsigned int ctf_level void TextGrammar::ReadFromFile(const string& filename) { ReadFile in(filename); - ReadFromStream(in.stream()); + RuleLexer::ReadRules(in.stream(), &AddRuleHelper, filename, this); } void TextGrammar::ReadFromStream(istream* in) { - RuleLexer::ReadRules(in, &AddRuleHelper, this); + RuleLexer::ReadRules(in, &AddRuleHelper, "UNKNOWN", this); } bool TextGrammar::HasRuleForSpan(int /* i */, int /* j */, int distance) const { |