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

[Petteri Räty]

commit:     5619617d2f23057f07fee8766998d8e01bc1a644
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 14:55:14 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 12:53:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=5619617d

Walker: support output redirection

We only support redirections for bash built-ins for now.

---
 bashast/libbashWalker.g               |   49 +++++++++++++++++++++++++++------
 scripts/command_execution.bash        |    2 +-
 scripts/command_execution.bash.result |    1 -
 src/core/interpreter.h                |   14 +++++++--
 4 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 58de4b7..1e6f94b 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -40,6 +40,7 @@ options
 
 @postinclude{
 
+	#include <fstream>
 	#include <iostream>
 	#include <sstream>
 
@@ -466,10 +467,16 @@ simple_command
 execute_command[const std::string& name, std::vector<std::string>& libbash_args]
 @declarations {
 	interpreter::local_scope current_scope(*walker);
+	std::unique_ptr<std::ostream> out;
+	std::unique_ptr<std::ostream> err;
+	std::unique_ptr<std::istream> in;
+	bool redirection = false;
 }
-	:var_def[true]* redirect* {
+	:var_def[true]* (redirect[out, err, in]{ redirection = true; })* {
 		if(walker->has_function(name))
 		{
+			if(redirection)
+				std::cerr << "We do not support redirection for function calls." << std::endl;
 			ANTLR3_MARKER command_index = INDEX();
 			try
 			{
@@ -485,7 +492,7 @@ execute_command[const std::string& name, std::vector<std::string>& libbash_args]
 		}
 		else if(cppbash_builtin::is_builtin(name))
 		{
-			walker->set_status(walker->execute_builtin(name, libbash_args));
+			walker->set_status(walker->execute_builtin(name, libbash_args, out.get(), err.get(), in.get()));
 		}
 		else if(name == "export")
 		{
@@ -500,21 +507,45 @@ execute_command[const std::string& name, std::vector<std::string>& libbash_args]
 	}
 	(BANG { walker->set_status(!walker->get_status()); })?;
 
-redirect
-	:^(REDIR redirect_operator redirect_destination) {
+redirect[std::unique_ptr<std::ostream>& out, std::unique_ptr<std::ostream>& err, std::unique_ptr<std::istream>& in]
+	:^(REDIR LESS_THAN redirect_destination_input[in]) {
+		std::cerr << "Redirection is not supported yet" << std::endl;
+	}
+	|^(REDIR GREATER_THAN redirect_destination_output[out])
+	|^(REDIR DIGIT LESS_THAN redirect_destination_input[in]) {
+		std::cerr << "Redirection is not supported yet" << std::endl;
+	}
+	|^(REDIR DIGIT GREATER_THAN redirect_destination_output[out]) {
 		std::cerr << "Redirection is not supported yet" << std::endl;
 	};
 
-redirect_destination
-	:string_expr //path to a file
-	|FILE_DESCRIPTOR DIGIT
-	|FILE_DESCRIPTOR_MOVE DIGIT;
-
 redirect_operator
 	:LESS_THAN
 	|GREATER_THAN
 	|FILE_DESCRIPTOR DIGIT redirect_operator;
 
+redirect_destination_output[std::unique_ptr<std::ostream>& out]
+	:string_expr {
+		out.reset(new std::ofstream($string_expr.libbash_value, std::ofstream::trunc));
+	}
+	|FILE_DESCRIPTOR DIGIT {
+		std::cerr << "FILE_DESCRIPTOR redirection is not supported yet" << std::endl;
+	}
+	|FILE_DESCRIPTOR_MOVE DIGIT {
+		std::cerr << "FILE_DESCRIPTOR_MOVE redirection is not supported yet" << std::endl;
+	};
+
+redirect_destination_input[std::unique_ptr<std::istream>& in]
+	:string_expr {
+		std::cerr << "Input redirection for file is not supported yet" << std::endl;
+	}
+	|FILE_DESCRIPTOR DIGIT {
+		std::cerr << "FILE_DESCRIPTOR redirection is not supported yet" << std::endl;
+	}
+	|FILE_DESCRIPTOR_MOVE DIGIT {
+		std::cerr << "FILE_DESCRIPTOR_MOVE redirection is not supported yet" << std::endl;
+	};
+
 argument[std::vector<std::string>& args]
 	: string_expr {
 		if($string_expr.quoted)

diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash
index 8005a23..a500b63 100644
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@ -19,7 +19,7 @@ FOO="abc" echo "command environment"
 export FOO003=1 FOO004=abc FOO005=(1 2 3) FOO002
 export foo
 abc=1 export foo
-true > /dev/null
+echo "hi" > /dev/null
 
 function unset_inner()
 {

diff --git a/scripts/command_execution.bash.result b/scripts/command_execution.bash.result
index d47650d..e0bf724 100644
--- a/scripts/command_execution.bash.result
+++ b/scripts/command_execution.bash.result
@@ -5,7 +5,6 @@ right
 end
 command environment
 We do not support command env before the export builtin.
-Redirection is not supported yet
 FOO006=1 in unset_outer
 FOO007= in unset_outer
 FOO006= in unset_outer

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index 3420ee4..2c5f383 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -574,9 +574,17 @@ public:
   /// \param builtin arguments
   /// \return the return value of the builtin
   int execute_builtin(const std::string& name,
-                      const std::vector<std::string>& args)
-  {
-    return cppbash_builtin::exec(name, args, *out, *err, *in, *this);
+                      const std::vector<std::string>& args,
+                      std::ostream* output=0,
+                      std::ostream* error=0,
+                      std::istream* input=0)
+  {
+    return cppbash_builtin::exec(name,
+                                 args,
+                                 output == 0 ? *out : *output,
+                                 error == 0 ? *err : *error,
+                                 input == 0 ? *in : *input,
+                                 *this);
   }
 
   /// \brief perform ${parameter:−word} expansion