fixed conflicts

1 files changed, 9 insertions, 0 deletions

diff --git a/python/src/sa/sym.pxi b/python/src/sa/sym.pxi
index f47599cf..f253aec0 100644
--- a/python/src/sa/sym.pxi
+++ b/python/src/sa/sym.pxi
@@ -104,6 +104,9 @@ cdef int sym_setindex(int sym, int id):
 cdef int sym_fromstring(char* string, bint terminal):
     return ALPHABET.fromstring(string, terminal)
 
+def isvar(sym):
+    return sym_isvar(sym)
+
 def make_lattice(words):
     word_ids = (sym_fromstring(word, True) for word in words)
     return tuple(((word, None, 1), ) for word in word_ids)
@@ -114,3 +117,9 @@ def decode_lattice(lattice):
 
 def decode_sentence(lattice):
     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)
+
+def encode_words(words):
+    return tuple(sym_fromstring(word, True) for word in words)
+
+def decode_words(syms):
+    return tuple(sym_tostring(sym) for sym in syms)
\ No newline at end of file