From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QoyPV-0006Xx-KQ for garchives@archives.gentoo.org; Thu, 04 Aug 2011 13:56:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9480221C20E; Thu, 4 Aug 2011 13:53:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 65D1721C1E7 for ; Thu, 4 Aug 2011 13:53:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2712B1B4016 for ; Thu, 4 Aug 2011 13:53:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7E79980038 for ; Thu, 4 Aug 2011 13:53:41 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: <81df82652238ccaff47b48f0c914a57fefb3b45c.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: bashast/, bashast/gunit/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g bashast/gunit/cond_main.gunit X-VCS-Directories: bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 81df82652238ccaff47b48f0c914a57fefb3b45c Date: Thu, 4 Aug 2011 13:53:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7a9ec087144430fde34b5119fc2a3b69 commit: 81df82652238ccaff47b48f0c914a57fefb3b45c Author: Mu Qiao gentoo org> AuthorDate: Fri Jul 22 03:50:01 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Aug 2 07:46:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D81df8265 Parser: fix brace handling in regex --- bashast/bashast.g | 3 +-- bashast/gunit/cond_main.gunit | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 3b9b5bd..610b495 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -563,10 +563,9 @@ scope { } :( (ESC BLANK) =3D> ESC BLANK - | (ESC RSQUARE) =3D> ESC RSQUARE | LPAREN { if(LA(-2) !=3D ESC) $bash_pattern_part::parens++; } | {$bash_pattern_part::parens !=3D 0}? =3D> RPAREN { if(LA(-2) !=3D ES= C) $bash_pattern_part::parens--; } - | ~(BLANK|RSQUARE|EOL|LOGICAND|LOGICOR|LPAREN|RPAREN) + | ~(BLANK|EOL|LOGICAND|LOGICOR|LPAREN|RPAREN) )+; keyword_binary_string_operator : binary_operator diff --git a/bashast/gunit/cond_main.gunit b/bashast/gunit/cond_main.guni= t index 4068c51..e4810a9 100644 --- a/bashast/gunit/cond_main.gunit +++ b/bashast/gunit/cond_main.gunit @@ -33,3 +33,4 @@ condition_expr: "[[ \"${DISTUTILS_SRC_TEST}\" =3D~ ^(setup\.py|nosetests|py\.test|trial(= \ .*)?)$ ]]" -> (KEYWORD_TEST (MATCH_REGULAR_EXPRESSION (STRING (DOUBLE_Q= UOTED_STRING (VAR_REF DISTUTILS_SRC_TEST))) (STRING ^ ( setup \ . py | no= setests | py \ . test | trial ( \ . * ) ? ) $))) "[ -n "$FROM_LANG" -a -n "$TO_LANG" ]" -> (BUILTIN_TEST (BUILTIN_LOGIC a= (n (STRING (DOUBLE_QUOTED_STRING (VAR_REF FROM_LANG)))) (n (STRING (DOUB= LE_QUOTED_STRING (VAR_REF TO_LANG)))))) "[ -n "$FROM_LANG" -o -n "$TO_LANG" ]" -> (BUILTIN_TEST (BUILTIN_LOGIC o= (n (STRING (DOUBLE_QUOTED_STRING (VAR_REF FROM_LANG)))) (n (STRING (DOUB= LE_QUOTED_STRING (VAR_REF TO_LANG)))))) +"[[ "${element}" =3D~ (^[^[:space:]]+\ .) ]]" -> (KEYWORD_TEST (MATCH_RE= GULAR_EXPRESSION (STRING (DOUBLE_QUOTED_STRING (VAR_REF element))) (STRIN= G ( ^ [ ^ [ : space : ] ] + \ . ))))