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

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

commit:     cd818e41fb54894c6716edf2a14c5ee907a02528
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Apr 16 16:51:48 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:57:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=cd818e41

Parser: escaped double quotes in dqstr

The parser now handles escaped double quotes inside double quoted
strings.

---
 bashast/bashast.g         |    9 +++++----
 bashast/gunit/fname.gunit |    3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 7b900cc..d82e7cf 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -409,10 +409,11 @@ nqstr_part
 //double quoted string rule, allows expansions
 dqstr	:	DQUOTE dqstr_part* DQUOTE -> ^(DOUBLE_QUOTED_STRING dqstr_part*);
 dqstr_part
-	: var_ref
-	| command_sub
-	| arithmetic_expansion
-	| ~(DOLLAR|TICK|DQUOTE);
+	:	var_ref
+	|	command_sub
+	|	arithmetic_expansion
+	| 	ESC DQUOTE
+	|	~(DOLLAR|TICK|DQUOTE);
 //single quoted string rule, no expansions
 sqstr_part
 	: ~SQUOTE*;

diff --git a/bashast/gunit/fname.gunit b/bashast/gunit/fname.gunit
index a5b1f7f..f048755 100644
--- a/bashast/gunit/fname.gunit
+++ b/bashast/gunit/fname.gunit
@@ -67,3 +67,6 @@ fname:
 "ab[12[:alpha:]]" -> (STRING ab (MATCH_PATTERN 12 (CHARACTER_CLASS alpha)))
 "\"'foo'\"" -> (STRING (DOUBLE_QUOTED_STRING ' foo '))
 "--preserve=timestamps,mode" -> (STRING - -p reserve = timestamps , mode)
+
+dqstr:
+"\"\\\"\"" -> (DOUBLE_QUOTED_STRING \ ")