docker/relationship
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复‘老婆的外孙的姥姥’，结果性别不确定的问题

Browse Source
This commit is contained in:
mumuy 2016-03-16 22:39:37 +08:00
parent 963753d8be
commit 71d0d5804f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
script/relationship.js
View File

@ -34,8 +34,8 @@
str:',#,h' str:',#,h'
}, },
{//夫妻的孩子就是自己的孩子 {//夫妻的孩子就是自己的孩子
exp:/,[wh],([ds])/g, exp:/(.+),[wh],([ds])/g,
str:',$1' str:'$1,$2'
}, },
{//夫妻的对方是自己 {//夫妻的对方是自己
exp:/(,w,h)|(,h,w)/g, exp:/(,w,h)|(,h,w)/g,
@ -472,13 +472,13 @@
function relationship(str){ function relationship(str){
var selectors = getSelectors(str); var selectors = getSelectors(str);
// console.log('selectors',selectors); console.log('selectors',selectors);
var result = []; //匹配结果 var result = []; //匹配结果
for(var i = 0;i<selectors.length;i++){ //遍历所有可能性 for(var i = 0;i<selectors.length;i++){ //遍历所有可能性
var ids = selector2id(selectors[i]); var ids = selector2id(selectors[i]);
for(var j=0;j<ids.length;j++){ for(var j=0;j<ids.length;j++){
var id = ids[j]; var id = ids[j];
// console.log('id',id,_data[id]); console.log('id',id,_data[id]);
if(_data[id]){ //直接匹配称呼 if(_data[id]){ //直接匹配称呼
result.push(_data[id][0]); result.push(_data[id][0]);
}else{ //高级查找 }else{ //高级查找
@ -509,4 +509,4 @@
window.relationship = relationship; window.relationship = relationship;
})(window); })(window);
console.log(relationship('弟弟的弟弟')); console.log(relationship('老婆的外孙的姥姥'));