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 1Q8XvD-0001hj-DP for garchives@archives.gentoo.org; Sat, 09 Apr 2011 13:09:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA3FD1C01F; Sat, 9 Apr 2011 13:08:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 74A001C01F for ; Sat, 9 Apr 2011 13:08:59 +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 F35331B4083 for ; Sat, 9 Apr 2011 13:08:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 687B18006D for ; Sat, 9 Apr 2011 13:08:58 +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: <2e6b1e607f86161704fa11c3b951770faf2eb327.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: bashast/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g X-VCS-Directories: bashast/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 2e6b1e607f86161704fa11c3b951770faf2eb327 Date: Sat, 9 Apr 2011 13:08:58 +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: 32fd11cade182037b3d3c841547ff0f9 commit: 2e6b1e607f86161704fa11c3b951770faf2eb327 Author: Mu Qiao gentoo org> AuthorDate: Fri Apr 8 14:32:19 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Sat Apr 9 13:02:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D2e6b1e60 Change string literals to tokens in parser rules. String literals in parser rules will create unnecessary tokens which have already been defined. So we use tokens instead. --- bashast/bashast.g | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 356142a..7e653df 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -89,7 +89,7 @@ clist options{greedy=3Dfalse;} : list_level_2 -> ^(LIST list_level_2); list_level_1 - : (function|pipeline) (BLANK!*('&&'^|'||'^)BLANK!* (function|pipeline))= *; + : (function|pipeline) (BLANK!*(LOGICAND^|LOGICOR^)BLANK!* (function|pip= eline))*; list_level_2 : list_level_1 ((BLANK!?';'!|BLANK!?'&'^|(BLANK!? EOL!)+)BLANK!? list_l= evel_1)*; pipeline