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

[Petteri Räty]

commit:     3b3d66ad8eccbdafc155aa065e96d50fbf7fa050
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 09:10:03 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 13:44:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=3b3d66ad

Walker: first support for command substitution

A simple command substitution is supported. Currently the commands
are executed within the current process.

---
 bashast/libbashWalker.g                 |   12 ++++++++++++
 scripts/command_execution.ebuild        |    2 ++
 scripts/command_execution.ebuild.result |    2 ++
 src/core/interpreter.cpp                |    6 ++++++
 src/core/interpreter.h                  |   13 +++++++++++++
 5 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 72fbf73..b6123d9 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -39,6 +39,7 @@ options
 @postinclude{
 
 	#include <iostream>
+	#include <sstream>
 
 	#include <boost/format.hpp>
 
@@ -144,6 +145,7 @@ string_expr returns[std::string libbash_value, bool quoted]
 				$libbash_value += boost::lexical_cast<std::string>(value); $quoted = false;
 			})
 		|(var_ref[false]) => libbash_string=var_ref[false] { $libbash_value += libbash_string; $quoted = false; }
+		|libbash_string=command_substitution { $libbash_value += libbash_string; $quoted = false; }
 		|(libbash_string=any_string { $libbash_value += libbash_string; $quoted = false; })
 	)+);
 
@@ -308,6 +310,16 @@ command_list: ^(LIST logic_command_list+);
 
 compound_command: ^(CURRENT_SHELL command_list);
 
+command_substitution returns[std::string libbash_value]
+@declarations {
+	std::stringstream out;
+}
+	:^(COMMAND_SUB{ walker->set_output_stream(&out); } command_list) {
+		walker->restore_output_stream();
+		$libbash_value = out.str();
+		walker->trim_trailing_eols($libbash_value);
+	};
+
 function_def returns[int placeholder]
 	:^(FUNCTION ^(STRING name) {
 		// Define the function with current index

diff --git a/scripts/command_execution.ebuild b/scripts/command_execution.ebuild
index d76c230..0f7cd03 100644
--- a/scripts/command_execution.ebuild
+++ b/scripts/command_execution.ebuild
@@ -6,3 +6,5 @@ hi
 echo hello world
 true
 false
+FOO001=$(echo hello)
+FOO002=$(hi)

diff --git a/scripts/command_execution.ebuild.result b/scripts/command_execution.ebuild.result
index 984ab54..4330a65 100644
--- a/scripts/command_execution.ebuild.result
+++ b/scripts/command_execution.ebuild.result
@@ -1,2 +1,4 @@
 Hello World
 hello world
+FOO001=hello
+FOO002=Hello World

diff --git a/src/core/interpreter.cpp b/src/core/interpreter.cpp
index a5a3307..f7e8f64 100644
--- a/src/core/interpreter.cpp
+++ b/src/core/interpreter.cpp
@@ -30,6 +30,7 @@
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/trim.hpp>
 
 #include "libbashWalker.h"
 
@@ -157,3 +158,8 @@ void interpreter::lazy_remove_at_end(std::string& value,
 {
   replace_at_end(value, pattern, "");
 }
+
+void interpreter::trim_trailing_eols(std::string& value)
+{
+  boost::trim_right_if(value, boost::is_any_of("\n"));
+}

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index 0656299..af81c49 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -132,6 +132,16 @@ public:
     return members.end();
   }
 
+  void set_output_stream(std::ostream* stream)
+  {
+    out = stream;
+  }
+
+  void restore_output_stream()
+  {
+    out = &std::cout;
+  }
+
   /// \brief parse the text value of a tree to integer
   /// \param the target tree
   /// \return the parsed value
@@ -684,5 +694,8 @@ public:
   static void lazy_remove_at_end(std::string& value,
                                  const std::string& pattern);
 
+  /// \brief remove trailing EOLs from the value
+  /// \param[in, out] the target
+  static void trim_trailing_eols(std::string& value);
 };
 #endif