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

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

commit:     31ee5e693a535e3c16d7e7bfca9d57fc3bca2d53
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 12:54:07 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun May 22 16:16:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=31ee5e69

Walker: first support for keyword test

Keyword test that doesn't involve "-x" operators are supported now.
Pattern matching inside the keyword test is not supported for now.

---
 bashast/libbashWalker.g       |   38 +++++++++++++++++++++++++++++++-------
 scripts/test_expr.bash        |   11 +++++++++++
 scripts/test_expr.bash.result |    9 +++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index bd87ee8..a341109 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -503,20 +503,44 @@ compound_command
 	| case_expr;
 
 cond_expr
-	:^(BUILTIN_TEST status=builtin_condition) { walker->set_status(!status); };
+	:^(BUILTIN_TEST status=builtin_condition) { walker->set_status(!status); }
+	|^(KEYWORD_TEST status=keyword_condition) { walker->set_status(!status); };
+
+common_condition returns[bool status]
+	// -eq, -ne, -lt, -le, -gt, or -ge for arithmetic. -nt -ot -ef for files
+	:^(NAME left_str=string_expr right_str=string_expr)
+	// -o for shell option,  -z -n for string, -abcdefghkprstuwxOGLSN for files
+	|^(LETTER string_expr)
+	// We do not trigger pattern matching for now
+	|^((EQUALS|MATCH_PATTERN) 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) {
+		$status = left_str.libbash_value != right_str.libbash_value;
+	}
+	|^(LESS_THAN left_str=string_expr right_str=string_expr) {
+		$status = left_str.libbash_value < right_str.libbash_value;
+	}
+	|^(GREATER_THAN left_str=string_expr right_str=string_expr) {
+		$status = left_str.libbash_value > right_str.libbash_value;
+	}
+	|string_expr { $status = (!$string_expr.libbash_value.empty()); };
+
+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; }
+	|s=common_condition { $status = s; };
 
 builtin_condition returns[bool status]
 	:^(NEGATION l=builtin_condition) { $status = !l; }
 	|s=builtin_condition_primary { $status = s; };
 
 builtin_condition_primary returns[bool status]
-	:^(NAME string_expr string_expr) { throw interpreter_exception(walker->get_string($NAME) + "(NAME) is not supported for now");}
-	|^(EQUALS l=string_expr r=string_expr) { $status = (l.libbash_value == r.libbash_value); }
-	|^(NOT_EQUALS l=string_expr r=string_expr) { $status = (l.libbash_value != r.libbash_value); }
-	|^(ESC_LT l=string_expr r=string_expr) { $status = (l.libbash_value < r.libbash_value); }
+	:^(ESC_LT l=string_expr r=string_expr) { $status = (l.libbash_value < r.libbash_value); }
 	|^(ESC_GT l=string_expr r=string_expr) { $status = (l.libbash_value > r.libbash_value); }
-	|^(LETTER l=string_expr) { throw interpreter_exception(walker->get_string($LETTER) + "(LETTER) is not supported for now");}
-	|string_expr { $status = ($string_expr.libbash_value.size() != 0); };
+	|s=common_condition { $status = s; };
 
 for_expr
 @declarations {

diff --git a/scripts/test_expr.bash b/scripts/test_expr.bash
index 95acd36..1c63998 100644
--- a/scripts/test_expr.bash
+++ b/scripts/test_expr.bash
@@ -24,3 +24,14 @@ echo $? # 1
 echo $? # 1
 [ abc \< bcd ]
 echo $? # 0
+[[ abc ]] && echo true1
+[[ abc < bcd ]] && echo true2
+[[ abc > bcd ]] || echo true3
+[[ abc != bcd ]] && echo true4
+[[ abc = bcd ]] || echo true5
+[[ abc == abc ]] && echo true6
+[[ ! abc = bcd ]] && echo true7
+[[ abc = bcd || abc == abc ]] && echo true8
+[[ abc = bcd && abc == abc ]] || echo true9
+# abc=bcd is treated as a simple string
+[[ abc=bcd && abc == abc ]] || echo wrong

diff --git a/scripts/test_expr.bash.result b/scripts/test_expr.bash.result
index ff52ae4..63aaa92 100644
--- a/scripts/test_expr.bash.result
+++ b/scripts/test_expr.bash.result
@@ -7,3 +7,12 @@
 1
 1
 0
+true1
+true2
+true3
+true4
+true5
+true6
+true7
+true8
+true9