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 1QUZe8-0007m7-8S for garchives@archives.gentoo.org; Thu, 09 Jun 2011 07:27:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 830E81C05C; Thu, 9 Jun 2011 07:27:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 461AE1C05C for ; Thu, 9 Jun 2011 07:27:08 +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 9C5CA1B401B for ; Thu, 9 Jun 2011 07:27:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 991E48003C for ; Thu, 9 Jun 2011 07:27:06 +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: <78352ef7a33076ff93e734bef200250a03d31c55.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 bashast/libbashWalker.g scripts/var_expansion.bash scripts/var_expansion.bash.result X-VCS-Directories: scripts/ bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 78352ef7a33076ff93e734bef200250a03d31c55 Date: Thu, 9 Jun 2011 07:27:06 +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: 964bac37cbbcbb29f470ad8dd6539b15 commit: 78352ef7a33076ff93e734bef200250a03d31c55 Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Fri Jun 3 15:09:34 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Fri Jun 3 15:09:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D78352ef7 Parser+Walker: empty word for parameter expansion : ${CABAL_EXTRA_CONFIGURE_FLAGS:=3D} found in haskell-cabal.eclass now works properly. --- bashast/bashast.g | 7 +++++-- bashast/gunit/param_main.gunit | 1 + bashast/libbashWalker.g | 2 +- scripts/var_expansion.bash | 1 + scripts/var_expansion.bash.result | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index edbadf5..d63bc09 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -268,8 +268,8 @@ var_ref | DOLLAR BANG -> ^(VAR_REF BANG); //Variable expansions var_exp : var_name ( - parameter_value_operator word - -> ^(parameter_value_operator var_name word) + parameter_value_operator parameter_word + -> ^(parameter_value_operator var_name parameter_word) | COLON wspace* os=3Dexplicit_arithmetic (COLON len=3Dexplicit_arith= metic)? -> ^(OFFSET var_name $os ^($len)?) | parameter_delete_operator parameter_pattern_part+ @@ -299,6 +299,9 @@ parameter_value_operator | EQUALS -> ASSIGN_DEFAULT_WHEN_UNSET | QMARK -> DISPLAY_ERROR_WHEN_UNSET | PLUS -> USE_ALTERNATE_WHEN_UNSET; +parameter_word + : word + | -> ^(STRING); parameter_replace_pattern : ((~SLASH) =3D> 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 cfbd92f..4eb4968 100644 --- a/bashast/gunit/param_main.gunit +++ b/bashast/gunit/param_main.gunit @@ -23,6 +23,7 @@ var_ref: "${asdf}" -> (VAR_REF asdf) "${asdf:-foo}" -> (VAR_REF (USE_DEFAULT_WHEN_UNSET_OR_NULL asdf (STRING = foo))) "${asdf=3D'foo'}" -> (VAR_REF (ASSIGN_DEFAULT_WHEN_UNSET asdf (STRING (S= INGLE_QUOTED_STRING foo)))) +"${asdf:=3D}" -> (VAR_REF (ASSIGN_DEFAULT_WHEN_UNSET_OR_NULL asdf STRING= )) "${bar:7}" -> (VAR_REF (OFFSET bar 7)) "${bar: -10}" -> (VAR_REF (OFFSET bar (MINUS_SIGN 10))) "${bar:(-10 + 5)}" -> (VAR_REF (OFFSET bar (+ (MINUS_SIGN 10) 5))) diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g index de9810e..39b0a16 100644 --- a/bashast/libbashWalker.g +++ b/bashast/libbashWalker.g @@ -182,7 +182,7 @@ string_expr returns[std::string libbash_value, bool q= uoted] $libbash_value +=3D $string_part.libbash_value; $quoted =3D $string_part.quoted; } - )+); + )*); =20 string_part returns[std::string libbash_value, bool quoted] @init { diff --git a/scripts/var_expansion.bash b/scripts/var_expansion.bash index 1419686..80157a9 100644 --- a/scripts/var_expansion.bash +++ b/scripts/var_expansion.bash @@ -96,3 +96,4 @@ target=3D"abc*abc" echo ${target/*} echo ${target/'*'} echo ${target/"*"} +: ${FOO089:=3D} diff --git a/scripts/var_expansion.bash.result b/scripts/var_expansion.ba= sh.result index dac4d8e..94729b3 100644 --- a/scripts/var_expansion.bash.result +++ b/scripts/var_expansion.bash.result @@ -92,4 +92,5 @@ FOO085=3D1 2 FOO086=3D5 FOO087=3D4 5 FOO088=3Dfilename 1 2 3 4 5 +FOO089=3D target=3Dabc*abc