修复‘老婆的外孙的姥姥’,结果性别不确定的问题
This commit is contained in:
parent
963753d8be
commit
71d0d5804f
@ -34,8 +34,8 @@
|
||||
str:',#,h'
|
||||
},
|
||||
{//夫妻的孩子就是自己的孩子
|
||||
exp:/,[wh],([ds])/g,
|
||||
str:',$1'
|
||||
exp:/(.+),[wh],([ds])/g,
|
||||
str:'$1,$2'
|
||||
},
|
||||
{//夫妻的对方是自己
|
||||
exp:/(,w,h)|(,h,w)/g,
|
||||
@ -472,13 +472,13 @@
|
||||
|
||||
function relationship(str){
|
||||
var selectors = getSelectors(str);
|
||||
// console.log('selectors',selectors);
|
||||
console.log('selectors',selectors);
|
||||
var result = []; //匹配结果
|
||||
for(var i = 0;i<selectors.length;i++){ //遍历所有可能性
|
||||
var ids = selector2id(selectors[i]);
|
||||
for(var j=0;j<ids.length;j++){
|
||||
var id = ids[j];
|
||||
// console.log('id',id,_data[id]);
|
||||
console.log('id',id,_data[id]);
|
||||
if(_data[id]){ //直接匹配称呼
|
||||
result.push(_data[id][0]);
|
||||
}else{ //高级查找
|
||||
@ -509,4 +509,4 @@
|
||||
window.relationship = relationship;
|
||||
})(window);
|
||||
|
||||
console.log(relationship('弟弟的弟弟'));
|
||||
console.log(relationship('老婆的外孙的姥姥'));
|
Loading…
x
Reference in New Issue
Block a user