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 1QK3iA-0003sg-4U for garchives@archives.gentoo.org; Wed, 11 May 2011 07:19:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F2DD1C0C6; Wed, 11 May 2011 07:19:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0F4E31C0C7 for ; Wed, 11 May 2011 07:19:35 +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 6DED21B40A6 for ; Wed, 11 May 2011 07:19:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8530080508 for ; Wed, 11 May 2011 07:19:34 +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: <8624fcd7eb47f5c78d7f2dc577f6aac61786eb8f.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: bashast/, bashast/gunit/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g bashast/gunit/fname.gunit X-VCS-Directories: bashast/ bashast/gunit/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 8624fcd7eb47f5c78d7f2dc577f6aac61786eb8f Date: Wed, 11 May 2011 07:19:34 +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: b1e19429eae8ed91ef2646b914480325 commit: 8624fcd7eb47f5c78d7f2dc577f6aac61786eb8f Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Tue May 10 15:48:02 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue May 10 15:48:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D8624fcd7 Parser: rename extended pattern matching tokens Prefix tokens used in extended pattern matching with EXTENDED_ so it's clear what tokens are related to extended pattern matching and normal matching. --- bashast/bashast.g | 20 ++++++++++---------- bashast/gunit/fname.gunit | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 682d81b..977e8c8 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -63,11 +63,11 @@ tokens{ KEYWORD_TEST; BUILTIN_TEST; MATCH_ANY_EXCEPT; - MATCH_EXACTLY_ONE; - MATCH_AT_MOST_ONE; - MATCH_NONE; - MATCH_ANY; - MATCH_AT_LEAST_ONE; + EXTENDED_MATCH_EXACTLY_ONE; + EXTENDED_MATCH_AT_MOST_ONE; + EXTENDED_MATCH_NONE; + EXTENDED_MATCH_ANY; + EXTENDED_MATCH_AT_LEAST_ONE; MATCH_PATTERN; MATCH_ANY_EXCEPT; CHARACTER_CLASS; @@ -473,11 +473,11 @@ pattern_char : LETTER|DIGIT|OTHER|QMARK|COLON|AT|SEMIC|POUND|SLASH|BANG|TIMES|COMMA|= PIPE|AMP|MINUS|PLUS|PCT|EQUALS|LSQUARE|RSQUARE|RPAREN|LPAREN|RBRACE|LBRAC= E|DOLLAR|TICK|DOT|LESS_THAN|GREATER_THAN|SQUOTE|DQUOTE; //extended pattern matching extended_pattern_match - : QMARK LPAREN fname (PIPE fname)* RPAREN -> ^(MATCH_AT_MOST_ONE fname+= ) - | TIMES LPAREN fname (PIPE fname)* RPAREN -> ^(MATCH_ANY fname+) - | PLUS LPAREN fname (PIPE fname)* RPAREN -> ^(MATCH_AT_LEAST_ONE fname+= ) - | AT LPAREN fname (PIPE fname)* RPAREN -> ^(MATCH_EXACTLY_ONE fname+) - | BANG LPAREN fname (PIPE fname)* RPAREN -> ^(MATCH_NONE fname+); + : QMARK LPAREN fname (PIPE fname)* RPAREN -> ^(EXTENDED_MATCH_AT_MOST_O= NE fname+) + | TIMES LPAREN fname (PIPE fname)* RPAREN -> ^(EXTENDED_MATCH_ANY fname= +) + | PLUS LPAREN fname (PIPE fname)* RPAREN -> ^(EXTENDED_MATCH_AT_LEAST_O= NE fname+) + | AT LPAREN fname (PIPE fname)* RPAREN -> ^(EXTENDED_MATCH_EXACTLY_ONE = fname+) + | BANG LPAREN fname (PIPE fname)* RPAREN -> ^(EXTENDED_MATCH_NONE fname= +); //The base of the arithmetic operator. Used for order of operations arithmetic_var_ref: var_ref -> ^(VAR_REF var_ref); diff --git a/bashast/gunit/fname.gunit b/bashast/gunit/fname.gunit index 467bd43..cfde61b 100644 --- a/bashast/gunit/fname.gunit +++ b/bashast/gunit/fname.gunit @@ -36,11 +36,11 @@ fname: "'asdf\"asdf'" -> (STRING (SINGLE_QUOTED_STRING asdf " asdf)) "\"asdf'asdf\"" -> (STRING (DOUBLE_QUOTED_STRING asdf ' asdf)) "!/bin/bash" -> (STRING ! / bin / bash) -"ab?(g|h)"-> (STRING ab (MATCH_AT_MOST_ONE (STRING g) (STRING h))) -"ab*(gh|i)" -> (STRING ab (MATCH_ANY (STRING gh) (STRING i))) -"ab+(gh|i)" -> (STRING ab (MATCH_AT_LEAST_ONE (STRING gh) (STRING i))) -"ab@(gh|i)" -> (STRING ab (MATCH_EXACTLY_ONE (STRING gh) (STRING i))) -"ab!(gh|i)" -> (STRING ab (MATCH_NONE (STRING gh) (STRING i))) +"ab?(g|h)"-> (STRING ab (EXTENDED_MATCH_AT_MOST_ONE (STRING g) (STRING h= ))) +"ab*(gh|i)" -> (STRING ab (EXTENDED_MATCH_ANY (STRING gh) (STRING i))) +"ab+(gh|i)" -> (STRING ab (EXTENDED_MATCH_AT_LEAST_ONE (STRING gh) (STRI= NG i))) +"ab@(gh|i)" -> (STRING ab (EXTENDED_MATCH_EXACTLY_ONE (STRING gh) (STRIN= G i))) +"ab!(gh|i)" -> (STRING ab (EXTENDED_MATCH_NONE (STRING gh) (STRING i))) "\"abc\"\'\"\'\"def\"" -> (STRING (DOUBLE_QUOTED_STRING abc) (SINGLE_QUO= TED_STRING ") (DOUBLE_QUOTED_STRING def)) "my\ name\ is" -> (STRING my \ name \ is) "octal\007" -> (STRING octal \ 007)