[gentoo-commits] proj/libbash:master commit in: bashast/, bashast/gunit/

["Petteri Räty" <betelgeuse@gentoo.org>]

commit:     a8ab9f3adb10b3bed1c4ad22175d51faecad7979
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 11:38:06 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 14:08:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=a8ab9f3a

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=timestamps,mode" -> (STRING - - preserve = timestamps , mode)
 "$'asdf'" -> (STRING (ANSI_C_QUOTING 'asdf'))
+"\"abc#$/\"" -> (STRING (DOUBLE_QUOTED_STRING abc # $ /))
 
 dqstr:
 "\"\\\\\"\$\`\"" -> (DOUBLE_QUOTED_STRING \ " $ `)