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 1QZ0sh-0000Y8-2S for garchives@archives.gentoo.org; Tue, 21 Jun 2011 13:20:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70F9F1C00C; Tue, 21 Jun 2011 13:20:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 24CCE1C00C for ; Tue, 21 Jun 2011 13:20:31 +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 9E62D2AC017 for ; Tue, 21 Jun 2011 13:20:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 006798003E for ; Tue, 21 Jun 2011 13:20:30 +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: <4eaae90c99ed22efe0b4f8e2e4b3d99a1613261e.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: bashast/, bashast/gunit/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g bashast/gunit/simp_command.gunit X-VCS-Directories: bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 4eaae90c99ed22efe0b4f8e2e4b3d99a1613261e Date: Tue, 21 Jun 2011 13:20:30 +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: ff6b85252a2828ffed101c0c2c20727b commit: 4eaae90c99ed22efe0b4f8e2e4b3d99a1613261e Author: Mu Qiao gentoo org> AuthorDate: Mon Jun 20 07:50:55 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Jun 21 13:08:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D4eaae90c Parser: support braces in command arguments --- bashast/bashast.g | 6 +++++- bashast/gunit/simp_command.gunit | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 5bba0f9..b575027 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -149,7 +149,11 @@ export_item :var_def |name ->; bash_command - : fname_no_res_word (BLANK!+ fname)*; + : fname_no_res_word (BLANK!+ bash_command_arguments)*; +bash_command_arguments + : bash_command_arguments_atom+ -> ^(STRING bash_command_arguments_atom+= ); +bash_command_arguments_atom + : brace_expansion|LBRACE|RBRACE|fname_part; redirect: (BLANK!* redirect_atom)*; redirect_atom: here_string_op^ BLANK!* fname | here_doc_op^ BLANK!* fname EOL! heredoc diff --git a/bashast/gunit/simp_command.gunit b/bashast/gunit/simp_comman= d.gunit index 63c5372..76af49b 100644 --- a/bashast/gunit/simp_command.gunit +++ b/bashast/gunit/simp_command.gunit @@ -28,6 +28,7 @@ simple_command: "cat ~/Documents/todo.txt" -> (STRING cat) (STRING ~ / Documents / todo = . txt) "dodir ${foo}/${bar}" -> (STRING dodir) (STRING (VAR_REF foo) / (VAR_REF= bar)) "local a=3D123 b=3D(1 2 3) c" -> (VARIABLE_DEFINITIONS local (=3D a (STR= ING 123)) (=3D b (ARRAY (STRING 1) (STRING 2) (STRING 3))) (EQUALS c)) +"echo {}{}}{{{}}{{}" -> (STRING echo) (STRING { } { } } { { { } } { { }) =20 command: "asdf=3D5 cat out.log > result" -> (COMMAND (STRING cat) (STRING out . l= og) (=3D asdf (STRING 5)) (REDIR > (STRING result)))