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 1Sb6pM-0001Pt-Qp for garchives@archives.gentoo.org; Sun, 03 Jun 2012 09:10:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5B06E07F0; Sun, 3 Jun 2012 09:08:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 96DD5E07F0 for ; Sun, 3 Jun 2012 09:08:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 120121B4021 for ; Sun, 3 Jun 2012 09:08:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 91767E543E for ; Sun, 3 Jun 2012 09:08:39 +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: <1330588318.62f2e7c112601d5bc7e7f5d042d4fce1e354865e.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/, bashast/gunit/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g bashast/gunit/param_main.gunit scripts/var_expansion.bash X-VCS-Directories: scripts/ bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 62f2e7c112601d5bc7e7f5d042d4fce1e354865e X-VCS-Branch: master Date: Sun, 3 Jun 2012 09:08:39 +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: a096d4b5-6f3a-420c-bc2f-2bd30be7371e X-Archives-Hash: fd1bba69360cca5f4523ce745479cd18 commit: 62f2e7c112601d5bc7e7f5d042d4fce1e354865e Author: Mu Qiao gentoo org> AuthorDate: Thu Mar 1 07:51:58 2012 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Thu Mar 1 07:51:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D62f2e7c1 Parser: allow empty replacement pattern --- bashast/bashast.g | 3 ++- bashast/gunit/param_main.gunit | 3 +++ scripts/var_expansion.bash | 5 +++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 8d627c4..73249ef 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -879,7 +879,8 @@ parameter_value_operator | QMARK -> DISPLAY_ERROR_WHEN_UNSET | PLUS -> USE_ALTERNATE_WHEN_UNSET; parameter_replace_pattern - : ((~SLASH) =3D> parameter_pattern_part)+ -> ^(STRING parameter_pattern= _part+); + : (SLASH) =3D> -> ^(STRING NAME) // Create an empty string + | ((~SLASH) =3D> parameter_pattern_part)+ -> ^(STRING parameter_pattern= _part+); parameter_delete_pattern : parameter_pattern_part+ -> ^(STRING parameter_pattern_part+); parameter_pattern_part diff --git a/bashast/gunit/param_main.gunit b/bashast/gunit/param_main.gu= nit index 01ec853..2168d54 100644 --- a/bashast/gunit/param_main.gunit +++ b/bashast/gunit/param_main.gunit @@ -90,6 +90,9 @@ variable_reference: "${!#/a/bc}" -> (VAR_REF (REPLACE_FIRST (VAR_REF #) (STRING a) (STRING b= c))) "${!abc/a/bc}" -> (VAR_REF (REPLACE_FIRST (VAR_REF abc) (STRING a) (STRI= NG bc))) "${!123/a/bc}" -> (VAR_REF (REPLACE_FIRST (VAR_REF 123) (STRING a) (STRI= NG bc))) +"${search_paths/%/${root}}" -> (VAR_REF (REPLACE_AT_END search_paths (ST= RING NAME) (STRING $ { root }))) +"${search_paths/#/${root}}" -> (VAR_REF (REPLACE_AT_START search_paths (= STRING NAME) (STRING $ { root }))) +"${search_paths//${root}}" -> (VAR_REF (REPLACE_ALL search_paths (STRING= (VAR_REF root)))) =20 variable_definition_atom: "MY_PN=3D${PN/asterisk-}" -> (=3D MY_PN (STRING (VAR_REF (REPLACE_FIRST = PN (STRING asterisk -))))) diff --git a/scripts/var_expansion.bash b/scripts/var_expansion.bash index 5f0bfca..e78ac8f 100644 --- a/scripts/var_expansion.bash +++ b/scripts/var_expansion.bash @@ -130,6 +130,11 @@ foo=3D unset bar echo ${bar=3Dabc} =20 +search_paths=3D"a%#b" +root=3D123 +echo "${search_paths/%/${root}}" +echo "${search_paths/#/${root}}" + # 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)" " ]]