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 1QRk9J-000099-Pv for garchives@archives.gentoo.org; Wed, 01 Jun 2011 12:03:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46DAE1C04C; Wed, 1 Jun 2011 12:03:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0EA8F1C04C for ; Wed, 1 Jun 2011 12:03:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FD0C1B4032 for ; Wed, 1 Jun 2011 12:03:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 045248001D for ; Wed, 1 Jun 2011 12:03:12 +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/compound.gunit X-VCS-Directories: bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: c3154deab71045fbcd6643c03d8de5b95f8e5379 Date: Wed, 1 Jun 2011 12:03:12 +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: 8257fb8178ed604f1a41ff628099ccef commit: c3154deab71045fbcd6643c03d8de5b95f8e5379 Author: Mu Qiao gentoo org> AuthorDate: Mon May 30 09:54:47 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Wed Jun 1 06:12:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Dc3154dea Parser: fix line break for compound expression Semicolon and EOL are allowed to appear simultaneously as line break. --- bashast/bashast.g | 2 +- bashast/gunit/compound.gunit | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 104dd36..de8158a 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -387,7 +387,7 @@ cond_part: brace_expansion | fname; //Rules for whitespace/line endings wspace : BLANK+|EOL+; -semiel : BLANK* (SEMIC|EOL) BLANK*; +semiel : BLANK* (SEMIC EOL?|EOL) BLANK*; =20 //definition of word. this is just going to grow... word : (brace_expansion) =3D> brace_expansion diff --git a/bashast/gunit/compound.gunit b/bashast/gunit/compound.gunit index a7ce999..6651be2 100644 --- a/bashast/gunit/compound.gunit +++ b/bashast/gunit/compound.gunit @@ -109,7 +109,8 @@ fi" -> (IF_STATEMENT (if (LIST (COMMAND (STRING echo)= (STRING yay2))) (LIST (COM "if echo yay2; then echo yay ;fi" -> (IF_STATEMENT (if (LIST (COMMAND (S= TRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay))))) "if echo yay2 then echo yay; fi" FAIL =20 -"if echo yay2; then +"if echo yay2; +then echo yay elif echo yay3; then echo boo