From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Johnson Subject: [PATCH] userdiff: update Ada patterns Date: Sun, 02 Feb 2014 21:21:56 +1030 Message-ID: <52EE234C.1060002@redneon.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Feb 02 11:57:53 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W9ukI-0002vj-CR for gcvg-git-2@plane.gmane.org; Sun, 02 Feb 2014 11:57:50 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751060AbaBBK5W (ORCPT ); Sun, 2 Feb 2014 05:57:22 -0500 Received: from redneon.com ([66.221.1.90]:57127 "EHLO redneon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbaBBK5V (ORCPT ); Sun, 2 Feb 2014 05:57:21 -0500 X-Greylist: delayed 321 seconds by postgrey-1.27 at vger.kernel.org; Sun, 02 Feb 2014 05:57:21 EST Received: from bearcat.lan (ppp121-45-65-240.lns20.adl6.internode.on.net [121.45.65.240]) by redneon.com (Postfix) with ESMTPA id 8416D53C0351 for ; Sun, 2 Feb 2014 21:21:59 +1030 (CST) Received: from [192.168.1.1] (bearcat.lan [192.168.1.1]) by bearcat.lan (Postfix) with ESMTP id 9F9394C8C6 for ; Sun, 2 Feb 2014 21:21:56 +1030 (CST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: - Allow extra space in "is new" and "is separate" - Fix bug in word regex for numbers Signed-off-by: Adrian Johnson --- t/t4034/ada/expect | 2 +- userdiff.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t4034/ada/expect b/t/t4034/ada/expect index be2376e..a682d28 100644 --- a/t/t4034/ada/expect +++ b/t/t4034/ada/expect @@ -4,7 +4,7 @@ +++ b/post @@ -1,13 +1,13 @@ Ada.Text_IO.Put_Line("Hello World!?"); -1 1e-10 16#FE12#E2 3.141_592 'xy' +1 1e-101e10 16#FE12#E2 3.141_592 'xy' ax+b ay x-b ay x*b ay x/b diff --git a/userdiff.c b/userdiff.c index ea43a03..e8915bf 100644 --- a/userdiff.c +++ b/userdiff.c @@ -15,13 +15,13 @@ static int drivers_alloc; word_regex "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+" } static struct userdiff_driver builtin_drivers[] = { IPATTERN("ada", - "!^(.*[ \t])?(is new|renames|is separate)([ \t].*)?$\n" + "!^(.*[ \t])?(is[ \t]+new|renames|is[ \t]+separate)([ \t].*)?$\n" "!^[ \t]*with[ \t].*$\n" "^[ \t]*((procedure|function)[ \t]+.*)$\n" "^[ \t]*((package|protected|task)[ \t]+.*)$", /* -- */ "[a-zA-Z][a-zA-Z0-9_]*" - "|[0-9][-+0-9#_.eE]" + "|[-+0-9#_.eE]+" "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"), IPATTERN("fortran", "!^([C*]|[ \t]*!)\n" -- 1.8.3.2