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 1Q9iLH-0007BJ-Ox for garchives@archives.gentoo.org; Tue, 12 Apr 2011 18:29:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8335E1C067; Tue, 12 Apr 2011 18:29:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 54A391C065 for ; Tue, 12 Apr 2011 18:29:23 +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 B49BE1BC0D4 for ; Tue, 12 Apr 2011 18:29:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DA7A180074 for ; Tue, 12 Apr 2011 18:29:21 +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: <6db1d40390c7b90925085df91e4888b2b5d5f91e.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_def.ebuild scripts/var_def.ebuild.result X-VCS-Directories: scripts/ bashast/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 6db1d40390c7b90925085df91e4888b2b5d5f91e Date: Tue, 12 Apr 2011 18:29:21 +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: 3c5b728fc893d039b31c2eff1e361d55 commit: 6db1d40390c7b90925085df91e4888b2b5d5f91e Author: Mu Qiao gentoo org> AuthorDate: Tue Apr 12 02:05:28 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Apr 12 07:22:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D6db1d403 Support multiple unquoted string tokens for AST like (STRING ldflags . patch), ". patch" was lost. Now the AST can be handled correctly. --- bashast/libbashWalker.g | 2 +- scripts/var_def.ebuild | 1 + scripts/var_def.ebuild.result | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g index 825987a..06ff2f8 100644 --- a/bashast/libbashWalker.g +++ b/bashast/libbashWalker.g @@ -64,7 +64,7 @@ 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; } + |(libbash_string=3Dany_string { $libbash_value +=3D libbash_string; })= + )); =20 //double quoted string rule, allows expansions diff --git a/scripts/var_def.ebuild b/scripts/var_def.ebuild index 73f94b1..acb132b 100644 --- a/scripts/var_def.ebuild +++ b/scripts/var_def.ebuild @@ -10,3 +10,4 @@ IUSE=3D"" RDEPEND=3D"dev-db/sqlite:3" DEPEND=3D"${RDEPEND} dev-util/pkgconfig" +MY_PATCH=3Dldflags.patch diff --git a/scripts/var_def.ebuild.result b/scripts/var_def.ebuild.resul= t index 671ae4c..71872a4 100644 --- a/scripts/var_def.ebuild.result +++ b/scripts/var_def.ebuild.result @@ -6,6 +6,7 @@ HOMEPAGE=3Dhttp://sunpinyin.googlecode.com IUSE=3D KEYWORDS=3D~amd64 ~x86 LICENSE=3DLGPL-2.1 CDDL +MY_PATCH=3Dldflags.patch RDEPEND=3Ddev-db/sqlite:3 SLOT=3D0 SRC_URI=3Dhttp://open-gram.googlecode.com/files/dict.utf8.tar.bz2