Subversion Repositories navi

Compare Revisions

This comparison shows the changes necessary to convert path

→ / @ 104

→ / @ 105

↔ Reverse comparison
Compare Path: Rev

With Path: Rev

Ignore whitespace Rev 104 → Rev 105

 /tsimapiak/parsenum.py
 ,7 → 35,7
       u"(?:(" + "|".join(base) + u")zam??)?" + \
       u"(?:(" + "|".join(base) + u")vo(?:l(?=a|))?)?" + \
       u"((?:" + "|".join(rem) + u")|" + \
-      u"(?:" + "|".join(num) + u"))?(ve?)(a?)$"
+      u"(?:" + "|".join(num) + u"))?((?:ve)?)(a?)$"
 numre = re.compile(numre)
 def parse(numin):

 /tsimapiak/parse2.py
 ,7 → 111,7
     ret = []
     left = len(sent)
     while left:
-        word = parsenum.parse(sent[0])
+        word = parsenum.parse(sent[-left:-left])
         if word == None:
             word = parseword(sent[-left:])
         left -= len(word["word"]["navi"].split(" "))