1 |
commit: a8ab9f3adb10b3bed1c4ad22175d51faecad7979 |
2 |
Author: Mu Qiao <qiaomuf <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 6 11:38:06 2011 +0000 |
4 |
Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 8 14:08:27 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=a8ab9f3a |
7 |
|
8 |
Parser: support literal '$' in double quoted string |
9 |
|
10 |
--- |
11 |
bashast/bashast.g | 2 +- |
12 |
bashast/gunit/fname.gunit | 1 + |
13 |
2 files changed, 2 insertions(+), 1 deletions(-) |
14 |
|
15 |
diff --git a/bashast/bashast.g b/bashast/bashast.g |
16 |
index b24ba88..9681cb1 100644 |
17 |
--- a/bashast/bashast.g |
18 |
+++ b/bashast/bashast.g |
19 |
@@ -546,7 +546,7 @@ dqstr_part |
20 |
| ESC DQUOTE -> DQUOTE |
21 |
| ESC TICK -> TICK |
22 |
| ESC DOLLAR -> DOLLAR |
23 |
- | ~(DOLLAR|TICK|DQUOTE); |
24 |
+ | ~(TICK|DQUOTE); |
25 |
//certain tokens that trigger pattern matching |
26 |
pattern_match_trigger |
27 |
: LSQUARE |
28 |
|
29 |
diff --git a/bashast/gunit/fname.gunit b/bashast/gunit/fname.gunit |
30 |
index 5bacdb3..eb13235 100644 |
31 |
--- a/bashast/gunit/fname.gunit |
32 |
+++ b/bashast/gunit/fname.gunit |
33 |
@@ -69,6 +69,7 @@ fname: |
34 |
"\"'foo'\"" -> (STRING (DOUBLE_QUOTED_STRING ' foo ')) |
35 |
"--preserve=timestamps,mode" -> (STRING - - preserve = timestamps , mode) |
36 |
"$'asdf'" -> (STRING (ANSI_C_QUOTING 'asdf')) |
37 |
+"\"abc#$/\"" -> (STRING (DOUBLE_QUOTED_STRING abc # $ /)) |
38 |
|
39 |
dqstr: |
40 |
"\"\\\\\"\$\`\"" -> (DOUBLE_QUOTED_STRING \ " $ `) |