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 1Q6mLq-0006es-Lx for garchives@archives.gentoo.org; Mon, 04 Apr 2011 16:10:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD6E61C0B8; Mon, 4 Apr 2011 16:09:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7E3881C0B8 for ; Mon, 4 Apr 2011 16:09:45 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07C951B40AB for ; Mon, 4 Apr 2011 16:09:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 368ED80074 for ; Mon, 4 Apr 2011 16:09:44 +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: <1406a7f53e34f78f29b14a0af85872a37d37b341.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/libbashWalker.g scripts/var_expansion.ebuild scripts/var_expansion.ebuild.result X-VCS-Directories: scripts/ bashast/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 1406a7f53e34f78f29b14a0af85872a37d37b341 Date: Mon, 4 Apr 2011 16:09:44 +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: 8150e21fd54454e64a4e46e7d1626dad commit: 1406a7f53e34f78f29b14a0af85872a37d37b341 Author: Mu Qiao gentoo org> AuthorDate: Mon Apr 4 13:29:45 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Mon Apr 4 16:01:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D1406a7f5 Support non-quoted string and expansions in variable definition Non-quoted variable reference, number, string and arithmetic expansion are allowed in variable definition. --- bashast/libbashWalker.g | 3 ++- scripts/var_expansion.ebuild | 3 +++ scripts/var_expansion.ebuild.result | 3 +++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g index ac8a040..a25c58c 100644 --- a/bashast/libbashWalker.g +++ b/bashast/libbashWalker.g @@ -56,13 +56,14 @@ options{ k=3D1; }: |NUMBER { $libbash_value =3D walker->get_string($NUMBER); }; =20 var_def: - ^(EQUALS libbash_name=3Dname libbash_value=3Dstring_expr){ + ^(EQUALS libbash_name=3Dname libbash_value=3Dword){ walker->define(libbash_name, libbash_value); }; =20 string_expr returns[std::string libbash_value]: ^(STRING( (DOUBLE_QUOTED_STRING) =3D> ^(DOUBLE_QUOTED_STRING (libbash_string=3Dd= ouble_quoted_string { $libbash_value +=3D libbash_string; })*) + |(ARITHMETIC_EXPRESSION) =3D> ^(ARITHMETIC_EXPRESSION value=3Darithmet= ics { $libbash_value =3D boost::lexical_cast(value); }) |libbash_string=3Dany_string { $libbash_value =3D libbash_string; } )); =20 diff --git a/scripts/var_expansion.ebuild b/scripts/var_expansion.ebuild index 62e95c3..533e7a7 100644 --- a/scripts/var_expansion.ebuild +++ b/scripts/var_expansion.ebuild @@ -2,3 +2,6 @@ EAPI=3D"3" EAPI4=3D"$(($EAPI+1))" FOO=3D"${EAPI:-hello}" FOO2=3D"${EAPI3:-hello}" +FOO3=3D123 +FOO4=3D$EAPI +FOO5=3D$(( 1+1 )) diff --git a/scripts/var_expansion.ebuild.result b/scripts/var_expansion.= ebuild.result index f92abe4..bad2cf3 100644 --- a/scripts/var_expansion.ebuild.result +++ b/scripts/var_expansion.ebuild.result @@ -2,3 +2,6 @@ EAPI=3D3 EAPI4=3D4 FOO=3D3 FOO2=3Dhello +FOO3=3D123 +FOO4=3D3 +FOO5=3D2