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

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

commit:     4fe9d8a7e2655c54dccc651664eda0f22b761707
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 12:11:15 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 15:08:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=4fe9d8a7

Parser: add rules to perform bash expansions

The rule will be called in the walker grammar to perform bash expansions
on raw strings.

---
 bashast/bashast.g              |    7 +++++++
 bashast/gunit/expansions.gunit |    3 +++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index f712f2e..c54adae 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -619,6 +619,13 @@ double_quoted_string_part
 	|	(ESC DOLLAR) => ESC DOLLAR -> DOLLAR
 	|	~(TICK|DQUOTE);
 
+// Perform all kinds of expansions
+all_expansions
+	:	expansion_atom+ -> ^(STRING expansion_atom+);
+expansion_atom
+	:	(DQUOTE) => double_quoted_string
+	|	double_quoted_string_part;
+
 string_part
 	:	ns_string_part
 	|	SLASH;

diff --git a/bashast/gunit/expansions.gunit b/bashast/gunit/expansions.gunit
index 24c3702..4608994 100644
--- a/bashast/gunit/expansions.gunit
+++ b/bashast/gunit/expansions.gunit
@@ -30,3 +30,6 @@ echo $each
 done" -> (LIST (COMMAND (for each (STRING (COMMAND_SUB `ls |grep output`)) (LIST (COMMAND (STRING echo) (STRING (VAR_REF each)))))))
 "wc <(cat /usr/share/dict/linux.words)" -> (LIST (COMMAND (STRING wc) (PROCESS_SUBSTITUTION < (LIST (COMMAND (STRING cat) (STRING / usr / share / dict / linux . words))))))
 */
+
+all_expansions:
+"abc $(ab) ${ab} $((ab)) `ab` \"ab\" 'ab'" -> (STRING abc   (COMMAND_SUB $(ab))   (VAR_REF ab)   (ARITHMETIC_EXPRESSION (VAR_REF ab))   (COMMAND_SUB `ab`)   (DOUBLE_QUOTED_STRING ab)   'ab')