tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[transliteration] Distinguishing between variables with numbers and backreferences in transliteration rules

Browse Source
This commit is contained in:
Al
2015-12-23 13:04:39 -05:00
parent aaa1fc0387
commit e9e05bb929
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/geodata/i18n/transliteration_rules.py
View File

@@ -183,7 +183,7 @@ char_class_regex_str = '\[(?:[^\[\]]*\[[^\[\]]*\][^\[\]]*)*[^\[\]]*\]'
nested_char_class_regex = re.compile('\[(?:[^\[\]]*\[[^\[\]]*\][^\[\]]*)+[^\[\]]*\]', re.UNICODE)
range_regex = re.compile(r'[\\]?([^\\])\-[\\]?([^\\])', re.UNICODE)
var_regex = re.compile('[\s]*\$([A-Za-z_\-]+)[\s]*')
var_regex = re.compile('[\s]*\$([A-Za-z_\-]+[A-Za-z_0-9\-]*)[\s]*')
context_regex = re.compile(u'(?:[\s]*(?!=[\s])(.*?)(?<![\s])[\s]*{)?(?:[\s]*([^}{]*)[\s]*)(?:}[\s]*(?!=[\s])(.*)(?<![\s])[\s]*)?', re.UNICODE)

6
src/transliteration_data.c
View File

@@ -3696,8 +3696,8 @@ transliteration_rule_source_t rules_source[] = {
{"\xd0\xa5",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"H",1,NULL,0,NULL,0},
{"\xd1\x86",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"c",1,NULL,0,NULL,0},
{"\xd0\xa6",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"C",1,NULL,0,NULL,0},
{"\xd0\xaa",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"\xca\xb9""2\xcc\xb1",5,NULL,0,NULL,0},
{"\xd1\x8a",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"\xca\xb9""2",3,NULL,0,NULL,0},
{"\xd0\xaa",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"\xca\xba\xcc\xb1",4,NULL,0,NULL,0},
{"\xd1\x8a",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"\xca\xba",2,NULL,0,NULL,0},
{"\xd0\xac",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"\xca\xb9\xcc\xb1",4,NULL,0,NULL,0},
{"\xd1\x8c",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"\xca\xb9",2,NULL,0,NULL,0},
{"\xd1\x8b",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"y",1,NULL,0,NULL,0},
@@ -72572,7 +72572,7 @@ transliteration_rule_source_t rules_source[] = {
{"\xda\x98",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"zh\xcc\xb1",4,NULL,0,NULL,0},
{"\xda\xad",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"n\xcc\xb1g",4,NULL,0,NULL,0},
{"\xdb\x8b",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"v\xcc\xb1",3,NULL,0,NULL,0},
{"\xdb\x8c",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"y\xcc\xb1""2",4,NULL,0,NULL,0},
{"\xdb\x8c",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"y\xcc\xb0",3,NULL,0,NULL,0},
{"\xda\x9a",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"s\xcb\x8c",3,NULL,0,NULL,0},
{"\xd8\xa1",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"\xca\xbe",2,NULL,0,NULL,0},
{"\xd8\xa7",2,CONTEXT_TYPE_NONE,0,NULL,0,CONTEXT_TYPE_NONE,0,NULL,0,"a\xcc\xa3",3,NULL,0,NULL,0},