From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8000E138010 for ; Sun, 19 Aug 2012 14:29:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4925CE0517; Sun, 19 Aug 2012 14:29:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 10BE4E0517 for ; Sun, 19 Aug 2012 14:29:08 +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 555BD1B40BF for ; Sun, 19 Aug 2012 14:29:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E473EE543D for ; Sun, 19 Aug 2012 14:29:06 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: <1344480282.249c86b76e37e6057d27956337d5e84d61563498.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g scripts/var_def.bash X-VCS-Directories: scripts/ bashast/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 249c86b76e37e6057d27956337d5e84d61563498 X-VCS-Branch: master Date: Sun, 19 Aug 2012 14:29: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 X-Archives-Salt: d44d78fe-772f-42bf-9cd5-b1228676e5ee X-Archives-Hash: 132e829165e35f7624ef3509776479a3 commit: 249c86b76e37e6057d27956337d5e84d61563498 Author: André Aparício gmail com> AuthorDate: Tue Aug 7 14:53:36 2012 +0000 Commit: Petteri Räty gentoo org> CommitDate: Thu Aug 9 02:44:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=249c86b7 Parser: Support appending strings with special characters --- bashast/bashast.g | 4 ++-- scripts/var_def.bash | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 4438b8c..9fd3fdb 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -431,8 +431,8 @@ variable_definition_atom -> ^(EQUALS ^(name explicit_arithmetic) string_expr?) | name EQUALS value? -> ^(EQUALS name value?) | name PLUS EQUALS array_value -> ^(PLUS_ASSIGN name array_value) - | name PLUS EQUALS string_expr_part? - -> ^(EQUALS name ^(STRING ^(VAR_REF name) string_expr_part?)); + | name PLUS EQUALS string_expr_part* + -> ^(EQUALS name ^(STRING ^(VAR_REF name) string_expr_part*)); value : string_expr | array_value; diff --git a/scripts/var_def.bash b/scripts/var_def.bash index dc47b6c..b3ffca7 100644 --- a/scripts/var_def.bash +++ b/scripts/var_def.bash @@ -82,6 +82,8 @@ FOO005=abc echo $FOO005 FOO005+=def echo $FOO005 +FOO005+=-foo-bar +echo $FOO005 function foo() { local -i foo=1 local -a bar=(1 2 3)