From bd917c386564c063d5ceecf1d6429f01506d9f06 Mon Sep 17 00:00:00 2001 From: mumuy Date: Wed, 16 Mar 2016 20:53:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=86=E5=90=91=E9=80=89=E6=8B=A9=E7=9A=84?= =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/relationship.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/script/relationship.js b/script/relationship.js index 3670845..eb10c77 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -17,11 +17,19 @@ exp:/(,[fhs]|([olx]b)),[ds](&[ol])?,m/g, str:'$1,w' }, - {//不知道性别，女儿或儿子的妈妈是自己或妻子 - exp:/^,[ds],m/g, + {//不知道性别，子女的妈妈是自己或妻子 + exp:/^,[ds],m(.+)$/, + str:',$1#,w$1' + }, + {//不知道性别，子女的妈妈是自己或妻子 + exp:/^,[ds],m$/, str:',#,w' }, - {//不知道性别，女儿或儿子的妈妈是自己或丈夫 + {//不知道性别，子女的爸爸是自己或丈夫 + exp:/^,[ds],f(.+)$/, + str:',$1#,h$1' + }, + {//不知道性别，子女的爸爸是自己或丈夫 exp:/^,[ds],f/g, str:',#,h' }, @@ -481,4 +489,4 @@ window.relationship = relationship; })(window); -console.log(relationship('妈妈的儿子')); \ No newline at end of file +console.log(relationship('儿子的外公')); \ No newline at end of file