| 12,15 → 12,6 |
|---|
| u"pukap", |
| u"kinä"] |
| |
| numord = [u"kewve", |
| u"'awve", |
| u"muve", |
| u"pxeyve", |
| u"tsìve", |
| u"mrrve", |
| u"puve", |
| u"kive"] |
| |
| rem = [u"aw", |
| u"mun", |
| u"pey", |
| 29,14 → 20,6 |
|---|
| u"fu", |
| u"hin"] |
| |
| remord = [u"awve", |
| u"muve", |
| u"peyve", |
| u"sìve", |
| u"mrrve", |
| u"fuve", |
| u"hive"] |
| |
| base = [u"", |
| u"me", |
| u"pxe", |
| 47,12 → 30,12 |
|---|
| |
| |
| numre = \ |
| u"^(a?)(?:(?:(" + "|".join(base) + u")zaza(?=m)(?:ve(?=$))?)?" + \ |
| 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"^(a?)(?:(" + "|".join(base) + u")zazam??)?" + \ |
| u"(?:(" + "|".join(base) + u")vozam??)?" + \ |
| u"(?:(" + "|".join(base) + u")zam??)?" + \ |
| u"(?:(" + "|".join(base) + u")vo(?:l(?=a|))?)?" + \ |
| u"((?:" + "|".join(rem) + u")|" + \ |
| u"(?:" + "|".join(num) + u"))?((?:ve)?)(a?)$" |
| numre = re.compile(numre) |
| |
| def parse(numin): |
| 69,8 → 52,8 |
|---|
| numoct += rem.index(mat[5]) + 1 |
| except: |
| try: |
| numout += num.index(mat[6]) |
| numoct += num.index(mat[6]) |
| numout += num.index(mat[5]) |
| numoct += num.index(mat[5]) |
| except: pass |
| try: |
| numout += (base.index(mat[4]) + 1) * 8 |
| 95,10 → 78,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 |
| |