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 1Q28Yq-0001Sm-FO for garchives@archives.gentoo.org; Tue, 22 Mar 2011 20:52:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A770D1C146; Tue, 22 Mar 2011 20:52:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 781571C146 for ; Tue, 22 Mar 2011 20:52:09 +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 E8FB61B4175 for ; Tue, 22 Mar 2011 20:52:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5FD298006A for ; Tue, 22 Mar 2011 20:52:08 +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/ 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: e1eb514901068fe62bf51b3cdbb14dc4bace747a Date: Tue, 22 Mar 2011 20:52:08 +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: d37fd23b78738fd6073ab7f725c9f6f1 commit: e1eb514901068fe62bf51b3cdbb14dc4bace747a Author: Mu Qiao gentoo org> AuthorDate: Tue Mar 15 02:13:40 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Sun Mar 20 03:22:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3De1eb5149 Rename token TEST to avoid conflict TEST conflicts with gtest (redefine TEST). --- bashast/bashast.g | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 06f5320..98638bf 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -275,7 +275,7 @@ arr_var_ref cond_expr : LSQUARE LSQUARE wspace keyword_cond wspace RSQUARE RSQUARE -> ^(KEYWO= RD_TEST keyword_cond) | LSQUARE wspace builtin_cond wspace RSQUARE -> ^(BUILTIN_TEST builtin_= cond) - | TEST wspace builtin_cond-> ^(BUILTIN_TEST builtin_cond); + | TEST_EXPR wspace builtin_cond-> ^(BUILTIN_TEST builtin_cond); cond_primary : LPAREN! BLANK!* keyword_cond BLANK!* RPAREN! | keyword_cond_binary @@ -361,7 +361,7 @@ ns_str_part //Parts of strings, no slashes, no reserved words ns_str_part_no_res : num - | name|OTHER|EQUALS|PCT|PCTPCT|MINUS|DOT|DOTDOT|COLON|BOP|UOP|TEST|'_'|= TILDE|INC|DEC|ARITH_ASSIGN|ESC_CHAR|CARET; + | name|OTHER|EQUALS|PCT|PCTPCT|MINUS|DOT|DOTDOT|COLON|BOP|UOP|TEST_EXPR= |'_'|TILDE|INC|DEC|ARITH_ASSIGN|ESC_CHAR|CARET; //strings with no slashes, used in certain variable expansions ns_str : ns_str_part* -> ^(STRING ns_str_part*); //Allowable parts of double quoted strings @@ -592,7 +592,7 @@ WORDOP : (':-'|':=3D'|':?'|':+'); COLON : ':'; QMARK : '?'; //Operators for conditional statements -TEST : 'test'; +TEST_EXPR : 'test'; LOGICAND : '&&'; LOGICOR : '||';