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

[Petteri Räty]

commit:     f3be58e19e78f86ce1006f2ef33875ba4ec14905
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 07:53:35 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 14:58:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=f3be58e1

Walker: implement test expression

Only a limited set of operation is supported for now: =, ==, !=,
\>, \<.

---
 Makefile.am                   |    2 ++
 bashast/libbashWalker.g       |   18 +++++++++++++++++-
 scripts/test_expr.bash        |   26 ++++++++++++++++++++++++++
 scripts/test_expr.bash.result |    9 +++++++++
 4 files changed, 54 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0d21393..a21b3ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,7 @@ BASH_TESTS = scripts/var_def.bash \
 			 scripts/function_def.bash \
 			 scripts/arithmetic_assignment.bash \
 			 scripts/compound_command.bash \
+			 scripts/test_expr.bash \
 			 scripts/binary_arithmetic.bash
 BASH_RESULT = scripts/var_def.bash.result \
 			  scripts/var_expansion.bash.result \
@@ -60,6 +61,7 @@ BASH_RESULT = scripts/var_def.bash.result \
 			  scripts/function_def.bash.result \
 			  scripts/arithmetic_assignment.bash.result \
 			  scripts/compound_command.bash.result \
+			  scripts/test_expr.bash.result \
 			  scripts/binary_arithmetic.bash.result
 
 TESTS = $(GUNIT_TESTS) $(BASH_TESTS)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 11b4c19..c616c88 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -86,7 +86,6 @@ options
 		SEEK(INDEX() + index - 3);
 		CONSUME();
 	}
-
 }
 
 start: list|EOF;
@@ -321,8 +320,25 @@ command_list: ^(LIST logic_command_list+);
 
 compound_command
 	: ^(CURRENT_SHELL command_list)
+	| ^(COMPOUND_COND cond_expr)
 	| for_expr;
 
+cond_expr
+	:^(BUILTIN_TEST status=builtin_condition) { walker->set_status(!status); };
+
+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_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); };
+
 for_expr
 @declarations {
 	ANTLR3_MARKER commands_index;

diff --git a/scripts/test_expr.bash b/scripts/test_expr.bash
new file mode 100644
index 0000000..95acd36
--- /dev/null
+++ b/scripts/test_expr.bash
@@ -0,0 +1,26 @@
+[ a = b ]
+echo $? # 1
+test a = a
+echo $? # 0
+#[ ]
+#echo $? # 1
+[ abc ]
+echo $? # 0
+[ ! abc ]
+echo $? # 1
+#[ ! ]
+#echo $?
+#[ abc -a bcd ]
+#echo $?
+#[ abc -o bcd ]
+#echo $?
+test abc == abd
+echo $? # 1
+[ abc != bcd ]
+echo $? # 0
+[ abc != abc ]
+echo $? # 1
+[ abc \> bcd ]
+echo $? # 1
+[ abc \< bcd ]
+echo $? # 0

diff --git a/scripts/test_expr.bash.result b/scripts/test_expr.bash.result
new file mode 100644
index 0000000..ff52ae4
--- /dev/null
+++ b/scripts/test_expr.bash.result
@@ -0,0 +1,9 @@
+1
+0
+0
+1
+1
+0
+1
+1
+0