From aa9db41733f082b1372c2f4cfc8d706343041448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=B5=A9=E4=B9=90?= <89932980@qq.com>
Date: Thu, 17 Mar 2016 15:49:02 +0800
Subject: [PATCH] =?UTF-8?q?updated=20=E8=A1=A8=E5=93=A5=E7=9A=84=E5=A5=B3?=
 =?UTF-8?q?=E5=84=BF=E7=9A=84=E7=88=B8=E7=88=B8=E6=97=A0=E6=B3=95=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/relationship.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/script/relationship.js b/script/relationship.js
index 7ed35d4..3cb06ff 100644
--- a/script/relationship.js
+++ b/script/relationship.js
@@ -140,19 +140,19 @@
 			str:''
 		},
 		{//自己是女性，女儿或儿子的妈妈是自己
-			exp:/(,[mwd]|([olx]s)),[ds](&[ol])?,m/g,
+			exp:/(,[mwd](&[ol])?|([olx]s)),[ds](&[ol])?,m/g,
 			str:'$1'
 		},
 		{//自己是女性，女儿或儿子的爸爸是自己的丈夫
-			exp:/(,[mwd]|([olx]s)),[ds](&[ol])?,f/g,
+			exp:/(,[mwd](&[ol])?|([olx]s)),[ds](&[ol])?,f/g,
 			str:'$1,h'
 		},
 		{//自己是男性，女儿或儿子的爸爸是自己
-			exp:/(,[fhs]|([olx]b)),[ds](&[ol])?,f/g,
+			exp:/(,[fhs](&[ol])?|([olx]b)),[ds](&[ol])?,f/g,
 			str:'$1'
 		},
 		{//自己是男性，女儿或儿子的妈妈是自己的妻子
-			exp:/(,[fhs]|([olx]b)),[ds](&[ol])?,m/g,
+			exp:/(,[fhs](&[ol])?|([olx]b)),[ds](&[ol])?,m/g,
 			str:'$1,w'
 		},
 		{//不知道性别，子女的妈妈是自己或妻子
@@ -526,7 +526,7 @@
 		var result = [];							//匹配结果
 		for(var i = 0;i<selectors.length;i++){		//遍历所有可能性
 			var ids = selector2id(selectors[i]);
-			// console.log('ids#',ids);
+			console.log('ids#',ids);
 			for(var j=0;j<ids.length;j++){
 				var id = ids[j];
 				if(_data[id]){							//直接匹配称呼
@@ -566,4 +566,5 @@
 //大舅的女儿
 //表哥的姐姐
 //爸爸的表姐
-console.log(relationship('爸爸的表姐'));
\ No newline at end of file
+//表嫂的女儿的爸爸
+console.log(relationship('表嫂的女儿的爸爸'));
\ No newline at end of file