From 71d0d5804f5e72704184deae41143655a52235fa Mon Sep 17 00:00:00 2001
From: mumuy <zhenghaole1990@126.com>
Date: Wed, 16 Mar 2016 22:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E2=80=98=E8=80=81=E5=A9=86?=
 =?UTF-8?q?=E7=9A=84=E5=A4=96=E5=AD=99=E7=9A=84=E5=A7=A5=E5=A7=A5=E2=80=99?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=93=E6=9E=9C=E6=80=A7=E5=88=AB=E4=B8=8D=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/relationship.js b/script/relationship.js
index 95828bf..9ef3281 100644
--- a/script/relationship.js
+++ b/script/relationship.js
@@ -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('弟弟的弟弟'));
\ No newline at end of file
+console.log(relationship('老婆的外孙的姥姥'));
\ No newline at end of file