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 1QOFlN-0000Bg-Dn for garchives@archives.gentoo.org; Sun, 22 May 2011 21:00:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C84841C090; Sun, 22 May 2011 21:00:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 95C1C1C090 for ; Sun, 22 May 2011 21:00:24 +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 188A41B401D for ; Sun, 22 May 2011 21:00:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6002F80509 for ; Sun, 22 May 2011 21:00:23 +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: <0c2ef440b8432ed9f56f9ccd416b3a242beac5ae.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: 0c2ef440b8432ed9f56f9ccd416b3a242beac5ae Date: Sun, 22 May 2011 21:00:23 +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: c94062bdf9302e546b994f1005a5a4f1 commit: 0c2ef440b8432ed9f56f9ccd416b3a242beac5ae Author: Mu Qiao gentoo org> AuthorDate: Thu May 19 08:25:19 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Sun May 22 20:43:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D0c2ef440 Parser: move LOCAL token to ns_str_part "local" is not a reserved word so it shouldn't be put to res_word_str. Now it's moved to ns_str_part. --- bashast/bashast.g | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index 48ae78d..e391a35 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -396,7 +396,7 @@ options{k=3D1;backtrack=3Dfalse;} : DIGIT|NUMBER; //A rule for filenames/strings res_word_str - : CASE|DO|DONE|ELIF|ELSE|ESAC|FI|FOR|FUNCTION|IF|IN|SELECT|THEN|UNTIL|W= HILE|TIME|LOCAL; + : CASE|DO|DONE|ELIF|ELSE|ESAC|FI|FOR|FUNCTION|IF|IN|SELECT|THEN|UNTIL|W= HILE|TIME; //Any allowable part of a string, including slashes, no pounds str_part : ns_str_part @@ -412,7 +412,7 @@ ns_str_part |OTHER|EQUALS|PCT|PCTPCT|MINUS|DOT|DOTDOT|COLON|TEST_EXPR |TILDE|MUL_ASSIGN|DIVIDE_ASSIGN|MOD_ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN |TIME_POSIX|LSHIFT_ASSIGN|RSHIFT_ASSIGN|AND_ASSIGN|XOR_ASSIGN - |OR_ASSIGN|CARET|POUND|POUNDPOUND|COMMA|EXPORT; + |OR_ASSIGN|CARET|POUND|POUNDPOUND|COMMA|EXPORT|LOCAL; =20 //Generic strings/filenames. fname : (~POUND) =3D> fname_part fname_part* -> ^(STRING fname_part+);