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-0007BM-Ur for garchives@archives.gentoo.org; Tue, 12 Apr 2011 18:29:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D8081C06B; Tue, 12 Apr 2011 18:29:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E152C1C06A 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 9A54F1BC0D6 for ; Tue, 12 Apr 2011 18:29:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 003AE80019 for ; Tue, 12 Apr 2011 18:29:23 +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: Subject: [gentoo-commits] proj/libbash:master commit in: / X-VCS-Repository: proj/libbash X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: a8babcd50d15ceb52af075e2689b435102e76162 Date: Tue, 12 Apr 2011 18:29:23 +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: 919ca26505f4b958b2d1dd82cc500e3b commit: a8babcd50d15ceb52af075e2689b435102e76162 Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Tue Apr 12 18:26:12 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Apr 12 18:26:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Da8babcd5 Merge remote-tracking branch 'gentoo/master' into review Conflicts: bashast/libbashWalker.g bashast/bashast.g | 86 +++++++++++++++++++------= ------ bashast/features_script/features.sh.ast | 2 +- bashast/gunit/array.gunit | 15 +++++ bashast/gunit/assoc_array.gunit | 9 ++-- bashast/gunit/param_main.gunit | 7 ++- bashast/gunit/simp_command.gunit | 6 +- bashast/libbashWalker.g | 6 +-- 7 files changed, 82 insertions(+), 49 deletions(-) diff --cc bashast/libbashWalker.g index 1061c3f,bd11744..45034c2 --- a/bashast/libbashWalker.g +++ b/bashast/libbashWalker.g @@@ -67,27 -55,17 +67,28 @@@ options{ k=3D1; } DIGIT { $libbash_value =3D walker->get_string($DIGIT); } |NUMBER { $libbash_value =3D walker->get_string($NUMBER); }; =20 -var_def: - ^(EQUALS libbash_name=3Dname libbash_value=3Dstring_expr){ +var_def +@declarations { + std::map values; + int index =3D 0; +}: - ^(EQUALS libbash_name=3Dname_base libbash_value=3Dword){ ++ ^(EQUALS libbash_name=3Dname_base libbash_value=3Dstring_expr){ walker->define(libbash_name, libbash_value); + } + |^(EQUALS libbash_name=3Dname_base ^(ARRAY ( + (libbash_string=3Dstring_expr + |^(EQUALS value=3Darithmetics { index =3D value; } libbash_st= ring=3Dstring_expr)) + { values[index++] =3D libbash_string; })* + )){ + walker->define(libbash_name, values); }; =20 string_expr returns[std::string libbash_value]: ^(STRING( (DOUBLE_QUOTED_STRING) =3D> ^(DOUBLE_QUOTED_STRING (libbash_string=3D= double_quoted_string { $libbash_value +=3D libbash_string; })*) |(ARITHMETIC_EXPRESSION) =3D> ^(ARITHMETIC_EXPRESSION value=3Darithme= tics { $libbash_value =3D boost::lexical_cast(value); }) + |(var_ref) =3D> libbash_string=3Dvar_ref { $libbash_value =3D libbash= _string; } - |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