| 51,8 → 51,8 |
|---|
| u"(?:(" + "|".join(base) + u")voza(?=m)(?:ve(?=$))?)?" + \ |
| u"(?:(" + "|".join(base) + u")za(?=m)(?:ve(?=$))?)?" + \ |
| u"(?:(" + "|".join(base) + u")(?:vol|vo(?=a|$))(?:ve(?=$))?)?" + \ |
| u"(?:" + "|".join(remord + rem) + u"))|" + \ |
| u"(?:" + "|".join(numord + num) + u")?(a?)$" |
| u"(?:(" + "|".join(remord + rem) + u")))|" + \ |
| u"(?:(" + "|".join(numord + num) + u"))?(a?)$" |
| numre = re.compile(numre) |
| |
| def parse(numin): |
| 69,8 → 69,8 |
|---|
| numoct += rem.index(mat[5]) + 1 |
| except: |
| try: |
| numout += num.index(mat[5]) |
| numoct += num.index(mat[5]) |
| numout += num.index(mat[6]) |
| numoct += num.index(mat[6]) |
| except: pass |
| try: |
| numout += (base.index(mat[4]) + 1) * 8 |
| 95,10 → 95,10 |
|---|
| posts = [] |
| if mat[0] != u"": |
| prefs.append(mat[0]) |
| if mat[6] != u"": |
| posts.append(mat[6]) |
| if mat[7] != u"": |
| posts.append(mat[7]) |
| if "ve" in numin: |
| posts.append("ve") |
| return {"word": {"id": 0, "navi": retnum, "infix": u"", "type": u""}, "pref": [prefs], "post": [posts], "inf": [u"", u"", u""], "len": False, "dec": numout, "oct": numoct} |
| #return numout, numoct |
| |