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 1QoyQL-0006nu-9X for garchives@archives.gentoo.org; Thu, 04 Aug 2011 13:57:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AD2721C1EE; Thu, 4 Aug 2011 13:53:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0D62E21C1EE for ; Thu, 4 Aug 2011 13:53:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C299B2AC010 for ; Thu, 4 Aug 2011 13:53:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2CFB28004F for ; Thu, 4 Aug 2011 13:53:43 +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: bashast/, bashast/gunit/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g bashast/gunit/command_sub.gunit X-VCS-Directories: bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: bad292ded893e93c6d598d85fb111c05ffd599e5 Date: Thu, 4 Aug 2011 13:53:43 +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: af8a7b80be8a13b681c227b4d57fe6e7 commit: bad292ded893e93c6d598d85fb111c05ffd599e5 Author: Mu Qiao gentoo org> AuthorDate: Fri Jul 22 13:51:34 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Aug 2 07:52:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Dbad292de Parser: fix single quoted string in command sub --- bashast/bashast.g | 1 + bashast/gunit/command_sub.gunit | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 39e6d54..c987375 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -1076,6 +1076,7 @@ COMMAND_SUBSTITUTION_PAREN return; } } + | SINGLE_QUOTED_STRING_TOKEN | . )+ )); diff --git a/bashast/gunit/command_sub.gunit b/bashast/gunit/command_sub.= gunit index 9998893..4b7b776 100644 --- a/bashast/gunit/command_sub.gunit +++ b/bashast/gunit/command_sub.gunit @@ -24,3 +24,4 @@ command_substitution: "$(CONTROL=3D command arg )" -> (COMMAND_SUB $(CONTROL=3D command arg )) "`cat output.log |grep error|cut`" -> (COMMAND_SUB `cat output.log |grep= error|cut`) "$(function foo() { echo 'hello'; }; foo)" -> (COMMAND_SUB $(function fo= o() { echo 'hello'; }; foo)) +"$(sed -n 's/^OUTPUT_FORMAT(\"\([^\"]*\)\",.*/\1/p')" OK