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 1Sb6pi-0001U9-6C for garchives@archives.gentoo.org; Sun, 03 Jun 2012 09:10:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21111E07FA; Sun, 3 Jun 2012 09:08:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E73C8E07F9 for ; Sun, 3 Jun 2012 09:08:43 +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 855981B4021 for ; Sun, 3 Jun 2012 09:08:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0B752E5435 for ; Sun, 3 Jun 2012 09:08:41 +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: <1332750947.39fb7115a568844b3075ff1a6a775c919d428e0e.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_prog.gunit X-VCS-Directories: bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 39fb7115a568844b3075ff1a6a775c919d428e0e X-VCS-Branch: master Date: Sun, 3 Jun 2012 09:08:41 +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: 075a5682-c6be-4aa3-8969-c99ecba56aae X-Archives-Hash: a728c4e5683a515c5e2e730a1dce4bb2 commit: 39fb7115a568844b3075ff1a6a775c919d428e0e Author: Mu Qiao gentoo org> AuthorDate: Mon Mar 26 08:24:07 2012 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Mon Mar 26 08:35:47 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D39fb7115 Parser: allow ';' after local and export --- bashast/bashast.g | 2 +- bashast/gunit/simp_prog.gunit | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index c6d7f34..c836047 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -471,7 +471,7 @@ scope { : ( (LPAREN) =3D> LPAREN { ++$builtin_variable_definition_item::parens; } |(RPAREN) =3D> RPAREN { --$builtin_variable_definition_item::parens; = } - |(~EOL) =3D> expansion_base + |(~(EOL|SEMIC)) =3D> expansion_base | {LA(1) =3D=3D EOL && $builtin_variable_definition_item::parens > 0}= ? =3D> EOL )+; =20 diff --git a/bashast/gunit/simp_prog.gunit b/bashast/gunit/simp_prog.guni= t index e765ab0..e44c1e5 100644 --- a/bashast/gunit/simp_prog.gunit +++ b/bashast/gunit/simp_prog.gunit @@ -36,3 +36,5 @@ hello () { hello quit echo foo" -> (LIST (COMMAND (FUNCTION (STRING quit) (CURRENT_SHELL (LIST= (COMMAND (STRING exit)))))) (COMMAND (FUNCTION (STRING hello) (CURRENT_S= HELL (LIST (COMMAND (STRING echo) (STRING Hello !)))))) (COMMAND (STRING = hello)) (COMMAND (STRING quit)) (COMMAND (STRING echo) (STRING foo))) + +"export abc;echo" -> (LIST (COMMAND (STRING export) (STRING abc)) (COMMA= ND (STRING echo)))