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 1QoyPE-0006Rt-DT for garchives@archives.gentoo.org; Thu, 04 Aug 2011 13:56:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 622FD21C1FD; Thu, 4 Aug 2011 13:53:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 36B6421C1FD for ; Thu, 4 Aug 2011 13:53:47 +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 E56C12AC011 for ; Thu, 4 Aug 2011 13:53:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4DFF98004B for ; Thu, 4 Aug 2011 13:53:46 +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: <1e51015b4e2e76a912e077faf772e6470090b130.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g scripts/var_expansion.bash X-VCS-Directories: scripts/ bashast/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 1e51015b4e2e76a912e077faf772e6470090b130 Date: Thu, 4 Aug 2011 13:53:46 +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: a52df724f404d306b87a1a5b3a85c90a commit: 1e51015b4e2e76a912e077faf772e6470090b130 Author: Mu Qiao gentoo org> AuthorDate: Fri Jul 29 12:54:12 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Aug 2 07:52:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D1e51015b Parser: improve the rule for regular expression --- bashast/bashast.g | 14 +++++++++++--- scripts/var_expansion.bash | 7 +++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index ea8185f..5549439 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -620,19 +620,27 @@ keyword_condition_binary -> ^(MATCH_PATTERN condition_part ^(STRING extended_pattern_match+)= ) | -> condition_part ); -//TODO improve this rule bash_pattern_part scope { int parens; +#ifdef OUTPUT_C + bool quoted; +#else + boolean quoted; +#endif } @init { $bash_pattern_part::parens =3D 0; + $bash_pattern_part::quoted =3D false; } :( - (ESC BLANK) =3D> ESC BLANK + DQUOTE! { $bash_pattern_part::quoted =3D !$bash_pattern_part::quoted; = } + | {$bash_pattern_part::quoted}? =3D> ~DQUOTE + | (ESC BLANK) =3D> ESC BLANK | LPAREN { if(LA(-2) !=3D ESC) $bash_pattern_part::parens++; } + | LLPAREN { if(LA(-2) !=3D ESC) $bash_pattern_part::parens +=3D 2; } | {$bash_pattern_part::parens !=3D 0}? =3D> RPAREN { if(LA(-2) !=3D ES= C) $bash_pattern_part::parens--; } - | ~(BLANK|EOL|LOGICAND|LOGICOR|LPAREN|RPAREN) + | ~(BLANK|EOL|LOGICAND|LOGICOR|LPAREN|RPAREN|DQUOTE|LLPAREN) )+; keyword_binary_string_operator : BLANK! binary_operator BLANK! diff --git a/scripts/var_expansion.bash b/scripts/var_expansion.bash index 2d9a28e..9f442b1 100644 --- a/scripts/var_expansion.bash +++ b/scripts/var_expansion.bash @@ -127,3 +127,10 @@ echo ${bar+abc} foo=3D unset bar echo ${bar=3Dabc} + +# This regular expression will cause boost::exception_detail::clone_impl= +#[[ "${version_components_groups}" =3D~ ("*".*" "|" *"|^2.*\ (2|\*)|^3.*= \ (3|\*)) ]] +[[ " ${FUNCNAME[@]:2} " =3D~ " "(_python_final_sanity_checks|python_exec= ute_function|python_mod_optimize|python_mod_cleanup)" " ]] +[[ "$(declare -p PYTHON_SANITY_CHECKS_EXECUTED)" !=3D "declare -- PYTHON= _SANITY_CHECKS_EXECUTED=3D"* || " ${FUNCNAME[@]:1} " =3D~ " "(python_set_= active_version|python_pkg_setup)" " && -z "${PYTHON_SKIP_SANITY_CHECKS}" = ]] +[[ " ${FUNCNAME[@]:1} " =3D~ " "(python_set_active_version|python_pkg_se= tup)" " ]] +[[ "$(echo "2p" "${file}")" =3D~ ^"# Gentoo '".*"' wrapper script genera= ted by python_generate_wrapper_scripts()"$ ]]