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 <gentoo-commits+bounces-360987-garchives=archives.gentoo.org@lists.gentoo.org>) id 1QfBnG-0000x6-6c for garchives@archives.gentoo.org; Fri, 08 Jul 2011 14:12:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6EA121C1E6; Fri, 8 Jul 2011 14:12:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 88D3E21C17D for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2011 14:12:26 +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 179402AC0EE for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2011 14:12:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 719828003F for <gentoo-commits@lists.gentoo.org>; Fri, 8 Jul 2011 14:12:25 +0000 (UTC) From: "Petteri Räty" <betelgeuse@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" <betelgeuse@gentoo.org> Message-ID: <a8ab9f3adb10b3bed1c4ad22175d51faecad7979.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: a8ab9f3adb10b3bed1c4ad22175d51faecad7979 Date: Fri, 8 Jul 2011 14:12:25 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 16cbf794f9736cb95b5fc56fb8aa7785 commit: a8ab9f3adb10b3bed1c4ad22175d51faecad7979 Author: Mu Qiao <qiaomuf <AT> gentoo <DOT> org> AuthorDate: Wed Jul 6 11:38:06 2011 +0000 Commit: Petteri R=C3=A4ty <betelgeuse <AT> gentoo <DOT> org> CommitDate: Fri Jul 8 14:08:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Da8ab9f3a Parser: support literal '$' in double quoted string --- bashast/bashast.g | 2 +- bashast/gunit/fname.gunit | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index b24ba88..9681cb1 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -546,7 +546,7 @@ dqstr_part | ESC DQUOTE -> DQUOTE | ESC TICK -> TICK | ESC DOLLAR -> DOLLAR - | ~(DOLLAR|TICK|DQUOTE); + | ~(TICK|DQUOTE); //certain tokens that trigger pattern matching pattern_match_trigger : LSQUARE diff --git a/bashast/gunit/fname.gunit b/bashast/gunit/fname.gunit index 5bacdb3..eb13235 100644 --- a/bashast/gunit/fname.gunit +++ b/bashast/gunit/fname.gunit @@ -69,6 +69,7 @@ fname: "\"'foo'\"" -> (STRING (DOUBLE_QUOTED_STRING ' foo ')) "--preserve=3Dtimestamps,mode" -> (STRING - - preserve =3D timestamps , = mode) "$'asdf'" -> (STRING (ANSI_C_QUOTING 'asdf')) +"\"abc#$/\"" -> (STRING (DOUBLE_QUOTED_STRING abc # $ /)) =20 dqstr: "\"\\\\\"\$\`\"" -> (DOUBLE_QUOTED_STRING \ " $ `)