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

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

commit:     752ef90a75d20aa62b34bd4efa04db5a75c581cf
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 12:02:07 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 06:12:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=752ef90a

Walker: support pattern matching in keyword test

---
 bashast/libbashWalker.g       |   17 +++++++++++++----
 scripts/test_expr.bash        |    6 ++++++
 scripts/test_expr.bash.result |    3 +++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index f53a2be..a55e0b2 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -551,6 +551,9 @@ cond_expr
 	|^(KEYWORD_TEST status=keyword_condition) { walker->set_status(!status); };
 
 common_condition returns[bool status]
+@declarations {
+	boost::xpressive::sregex pattern;
+}
 	// -eq, -ne, -lt, -le, -gt, or -ge for arithmetic. -nt -ot -ef for files
 	:^(NAME left_str=string_expr right_str=string_expr) {
 		$status = internal::test_binary(walker->get_string($NAME), left_str.libbash_value, right_str.libbash_value);
@@ -560,14 +563,20 @@ common_condition returns[bool status]
 		$status = internal::test_unary(*reinterpret_cast<const char *>(op->getToken(op)->start),
 		                               $string_expr.libbash_value);
 	}
-	// We do not trigger pattern matching for now
-	|^((EQUALS|MATCH_PATTERN) left_str=string_expr right_str=string_expr) {
+	|^(EQUALS left_str=string_expr right_str=string_expr) {
 		$status = left_str.libbash_value == right_str.libbash_value;
 	}
-	// We do not trigger pattern matching for now
-	|^((NOT_EQUALS|NOT_MATCH_PATTERN) left_str=string_expr right_str=string_expr) {
+	// Greedy is meaningless as we need to match the whole string
+	|^(MATCH_PATTERN left_str=string_expr bash_pattern[pattern, false]) {
+		$status = match(left_str.libbash_value, pattern);
+	}
+	|^(NOT_EQUALS left_str=string_expr right_str=string_expr) {
 		$status = left_str.libbash_value != right_str.libbash_value;
 	}
+	// Greedy is meaningless as we need to match the whole string
+	|^(NOT_MATCH_PATTERN left_str=string_expr bash_pattern[pattern, false]) {
+		$status = !match(left_str.libbash_value, pattern);
+	}
 	|^(LESS_THAN left_str=string_expr right_str=string_expr) {
 		$status = left_str.libbash_value < right_str.libbash_value;
 	}

diff --git a/scripts/test_expr.bash b/scripts/test_expr.bash
index f89287b..79398dd 100644
--- a/scripts/test_expr.bash
+++ b/scripts/test_expr.bash
@@ -38,3 +38,9 @@ echo $? # 0
 [[ -a "/" ]] && echo "true10"
 [[ . -ef . ]] && echo "true11"
 [[ 2 -ge 2 ]] && echo "true12"
+[[ "abc def xyz" == *"def"* ]] && echo "true13"
+[[ "abc def xyz" == *"defg"* ]] && echo "wrong"
+[[ "abc def xyz" != *"def"* ]] && echo "wrong"
+[[ "abc def xyz" != *"defg"* ]] && echo "true14"
+shopt -s extglob
+[[ "123" == *([[:digit:]]) ]] && echo "true15"

diff --git a/scripts/test_expr.bash.result b/scripts/test_expr.bash.result
index d045597..653200b 100644
--- a/scripts/test_expr.bash.result
+++ b/scripts/test_expr.bash.result
@@ -19,3 +19,6 @@ true9
 true10
 true11
 true12
+true13
+true14
+true15