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 1Q8ReN-0004oL-WB for garchives@archives.gentoo.org; Sat, 09 Apr 2011 06:28:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19D011C004; Sat, 9 Apr 2011 06:27:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CC0DA1C004 for ; Sat, 9 Apr 2011 06:27:36 +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 593B81B404B for ; Sat, 9 Apr 2011 06:27:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B48D38006D for ; Sat, 9 Apr 2011 06:27:35 +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/arith_main.gunit X-VCS-Directories: bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: b398a6957cf171ba7f599e07d90379a29e727b3a Date: Sat, 9 Apr 2011 06:27:35 +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: 663a25e931ced7158bf752557be12a29 commit: b398a6957cf171ba7f599e07d90379a29e727b3a Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Fri Apr 8 14:34:18 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Fri Apr 8 14:34:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Db398a695 Rename tdm to times_division_modulus --- bashast/bashast.g | 5 +++-- bashast/gunit/arith_main.gunit | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index fde875d..c20cef4 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -466,8 +466,9 @@ negation : (BANG^BLANK!?|TILDE^BLANK!?)?unary; exponential : negation (BLANK!* EXP^ BLANK!* negation)* ; -tdm : exponential (BLANK!*(TIMES^|SLASH^|PCT^)BLANK!* exponential)*; -addsub : tdm (BLANK!* (PLUS^|MINUS^)BLANK!* tdm)*; +times_division_modulus + : exponential (BLANK!*(TIMES^|SLASH^|PCT^)BLANK!* exponential)*; +addsub : times_division_modulus (BLANK!* (PLUS^|MINUS^)BLANK!* times_div= ision_modulus)*; shifts : addsub (BLANK!* (LSHIFT^|RSHIFT^) BLANK!* addsub)*; compare : shifts (BLANK!* (LEQ^|GEQ^|LESS_THAN^|GREATER_THAN^)BLANK!* sh= ifts)?; bitwiseand diff --git a/bashast/gunit/arith_main.gunit b/bashast/gunit/arith_main.gu= nit index 1444203..be91c42 100644 --- a/bashast/gunit/arith_main.gunit +++ b/bashast/gunit/arith_main.gunit @@ -49,7 +49,7 @@ exponential: "6**2" -> (** 6 2) "-5**+4" -> (** (MINUS_SIGN 5) (PLUS_SIGN 4)) =20 -tdm: +times_division_modulus: "9" -> "9" "7 * 9" -> (* 7 9) "7 / 9" -> (/ 7 9)