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 1QoyPQ-0006VQ-JD for garchives@archives.gentoo.org; Thu, 04 Aug 2011 13:56:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D700D21C20C; Thu, 4 Aug 2011 13:53:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A8E1921C1FB for ; Thu, 4 Aug 2011 13:53:46 +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 35A6F2AC014 for ; Thu, 4 Aug 2011 13:53:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8EFB68004F for ; Thu, 4 Aug 2011 13:53:45 +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: scripts/, bashast/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g scripts/test_expr.bash X-VCS-Directories: scripts/ bashast/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: b04f9d064a8aec90812df91be179f6bddb7f8174 Date: Thu, 4 Aug 2011 13:53:45 +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: 3ef0f29b4732e02c33f823a2fc704518 commit: b04f9d064a8aec90812df91be179f6bddb7f8174 Author: Mu Qiao gentoo org> AuthorDate: Thu Jul 28 09:04:34 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Aug 2 07:52:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Db04f9d06 Parser: split token compositions '<=3D' will generate one token so that some expressions cannot be fully parsed. Now '>=3D' and '<=3D' are split to parse these expressions. --- bashast/bashast.g | 8 ++++---- scripts/test_expr.bash | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 8486619..7dc9ad5 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -121,6 +121,8 @@ tokens{ AND_ASSIGN; XOR_ASSIGN; OR_ASSIGN; + LEQ; + GEQ; =20 NOT_EQUALS; EQUALS_TO; @@ -991,8 +993,8 @@ shifts compare : shifts (compare_operator^ BLANK!? shifts)?; compare_operator - : LEQ - | GEQ + : LESS_THAN EQUALS -> LEQ + | GREATER_THAN EQUALS -> GEQ | LESS_THAN | GREATER_THAN | EQUALS EQUALS -> EQUALS_TO @@ -1048,8 +1050,6 @@ MINUS : '-'; PLUS : '+'; EXP : '**'; AMP : '&'; -LEQ : '<=3D'; -GEQ : '>=3D'; CARET : '^'; LESS_THAN : '<'; GREATER_THAN : '>'; diff --git a/scripts/test_expr.bash b/scripts/test_expr.bash index 04b5a62..66ab24a 100644 --- a/scripts/test_expr.bash +++ b/scripts/test_expr.bash @@ -52,3 +52,5 @@ unset i [[ "setup.py" =3D~ ^(setup\.p|nosetests|py\.test|trial(\ .*)?)$ ]] && ec= ho false [ abc =3D bcd -o abc =3D abc ] && echo true18 [ abc =3D bcd -a abc =3D abc ] || echo true19 +[[ =3Da <=3Db ]] +[[ =3Da >=3Db ]]