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 61A23138010 for ; Sun, 19 Aug 2012 14:54:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30F81E064F; Sun, 19 Aug 2012 14:54:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0064EE064A for ; Sun, 19 Aug 2012 14:54:05 +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 0C9C51B40C3 for ; Sun, 19 Aug 2012 14:54:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 73A0FE543D for ; Sun, 19 Aug 2012 14:54:02 +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: <1343963245.5a31b0886ca36364c34ed04011bcdac211bb5bd7.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g scripts/command_execution.bash X-VCS-Directories: scripts/ bashast/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 5a31b0886ca36364c34ed04011bcdac211bb5bd7 X-VCS-Branch: master Date: Sun, 19 Aug 2012 14:54:02 +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: d15be942-498e-41d8-9709-1d5362207c34 X-Archives-Hash: 2d8a0de5c1580bc671d799793dea2901 commit: 5a31b0886ca36364c34ed04011bcdac211bb5bd7 Author: André Aparício gmail com> AuthorDate: Fri Jul 27 03:02:20 2012 +0000 Commit: Petteri Räty gentoo org> CommitDate: Fri Aug 3 03:07:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=5a31b088 Parser: Multiline string declaration Support quoted strings line breaks in builtin variable definitions --- bashast/bashast.g | 9 ++++++++- scripts/command_execution.bash | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 4438b8c..0d59e8c 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -466,15 +466,22 @@ array_atom builtin_variable_definition_item scope { int parens; +#ifdef OUTPUT_C + bool dquotes; +#else + boolean dquotes; +#endif } @init { $builtin_variable_definition_item::parens = 0; + $builtin_variable_definition_item::dquotes = false; } : ( (LPAREN) => LPAREN { ++$builtin_variable_definition_item::parens; } |(RPAREN) => RPAREN { --$builtin_variable_definition_item::parens; } + |(DQUOTE) => DQUOTE { $builtin_variable_definition_item::dquotes = ! $builtin_variable_definition_item::dquotes; } |(~(EOL|SEMIC)) => expansion_base - | {LA(1) == EOL && $builtin_variable_definition_item::parens > 0}? => EOL + | {LA(1) == EOL && $builtin_variable_definition_item::parens > 0 || $builtin_variable_definition_item::dquotes}? => EOL )+; #ifdef OUTPUT_C diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash index c526d75..ca8a4e5 100644 --- a/scripts/command_execution.bash +++ b/scripts/command_execution.bash @@ -82,6 +82,20 @@ echo ${array[@]} ech\ o Hello\ world +function multiline() +{ + declare var1="foo +bar" + export var2="one + two +three" + local var3="foo +bar" + echo $var1 + echo $var2 + echo $var3 +} +multiline echo \`\(\)\$\>\<\` export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" > /dev/null