summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrevor.cohn <trevor.cohn@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-08-04 11:19:47 +0000
committertrevor.cohn <trevor.cohn@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-08-04 11:19:47 +0000
commitc668bd808b2123486bd64bdcaa992f7a8fa2da52 (patch)
tree4a7e7da1f9d02e7b14fa63b1a5d0cd302825f0b9
parenta4615c8a584a3606483fe02cc3b7f3f18b80a967 (diff)
allow for wider set of NT strings
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@477 ec762483-ff6d-05da-a07a-a48fb63a330f
-rw-r--r--decoder/rule_lexer.l2
-rw-r--r--extools/sg_lexer.l4
2 files changed, 4 insertions, 2 deletions
diff --git a/decoder/rule_lexer.l b/decoder/rule_lexer.l
index 0216b119..63eb7562 100644
--- a/decoder/rule_lexer.l
+++ b/decoder/rule_lexer.l
@@ -110,7 +110,7 @@ void check_and_update_ctf_stack(const TRulePtr& rp) {
%}
REAL [\-+]?[0-9]+(\.[0-9]*([eE][-+]*[0-9]+)?)?|inf|[\-+]inf
-NT [\-#$A-Z_:=.",\\][\-#$".A-Z+/=_0-9!:@\\]*
+NT [^\t \[\],]+
%x LHS_END SRC TRG FEATS FEATVAL ALIGNS
%%
diff --git a/extools/sg_lexer.l b/extools/sg_lexer.l
index 9051ba51..168b835a 100644
--- a/extools/sg_lexer.l
+++ b/extools/sg_lexer.l
@@ -79,7 +79,7 @@ static void sglex_reset() {
%}
REAL [\-+]?[0-9]+(\.[0-9]*([eE][-+]*[0-9]+)?)?|inf|[\-+]inf
-NT [\-#$A-Z_:=.",\\][\-#$".A-Z+/=_0-9!:@\\]*
+NT [^\t \[\],]+
ALIGN [0-9]+-[0-9]+
%x LHS_END SRC TRG FEATS FEATVAL ALIGNS
@@ -191,6 +191,8 @@ ALIGN [0-9]+-[0-9]+
}
<TRG>\|\|\| {
+ //std::cerr << " trg_size: " << sglex_trg_rhs_size << std::endl;
+ //std::cerr << " trg_arity: " << sglex_trg_arity << std::endl;
assert(sglex_trg_rhs_size > 0);
cur_trg_rhs.resize(sglex_trg_rhs_size);
for (int i = 0; i < sglex_trg_rhs_size; ++i)