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

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

commit:     4006e69739fa88f24ab9e79797217e5648413b3e
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 10:05:18 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 10:05:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=4006e697

Walker: support regular expression in keyword test

---
 bashast/libbashWalker.g       |    4 ++++
 scripts/test_expr.bash        |    2 ++
 scripts/test_expr.bash.result |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 5469f84..9d297d2 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -649,6 +649,10 @@ keyword_condition returns[bool status]
 	:^(LOGICOR l=keyword_condition r=keyword_condition) { $status= l || r; }
 	|^(LOGICAND l=keyword_condition r=keyword_condition) { $status= l && r; }
 	|^(NEGATION l=keyword_condition) { $status = !l; }
+	|^(MATCH_REGULAR_EXPRESSION left_str=string_expr right_str=string_expr) {
+		boost::xpressive::sregex re = boost::xpressive::sregex::compile(right_str.libbash_value);
+		$status = boost::xpressive::regex_match(left_str.libbash_value, re);
+	}
 	|s=common_condition { $status = s; };
 
 builtin_condition returns[bool status]

diff --git a/scripts/test_expr.bash b/scripts/test_expr.bash
index 1fa00b4..f1f3093 100644
--- a/scripts/test_expr.bash
+++ b/scripts/test_expr.bash
@@ -48,3 +48,5 @@ i=2
 [[ i++ -gt 2 ]] && echo wrong
 [[ i++ -gt 2 ]] && echo true16
 unset i
+[[ "setup.py" =~ ^(setup\.py|nosetests|py\.test|trial(\ .*)?)$ ]] && echo true17
+[[ "setup.py" =~ ^(setup\.p|nosetests|py\.test|trial(\ .*)?)$ ]] && echo false

diff --git a/scripts/test_expr.bash.result b/scripts/test_expr.bash.result
index e883295..2082757 100644
--- a/scripts/test_expr.bash.result
+++ b/scripts/test_expr.bash.result
@@ -23,3 +23,4 @@ true13
 true14
 true15
 true16
+true17