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

[Petteri Räty]

commit:     dde59df4c102af140d45ba77d6b64544da541adb
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 09:16:42 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 11:37:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=dde59df4

Builtin: support eval built-in

---
 Makefile.am                           |    2 +
 scripts/command_execution.bash        |    2 +
 scripts/command_execution.bash.result |    2 +
 src/builtins/eval_builtin.cpp         |   39 +++++++++++++++++++++++++++
 src/builtins/eval_builtin.h           |   47 +++++++++++++++++++++++++++++++++
 src/cppbash_builtin.cpp               |    2 +
 6 files changed, 94 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e511111..d4614cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,6 +179,8 @@ libcppbash_la_SOURCES = src/common.h \
 						src/builtins/continue_builtin.h \
 						src/builtins/echo_builtin.cpp \
 						src/builtins/echo_builtin.h \
+						src/builtins/eval_builtin.cpp \
+						src/builtins/eval_builtin.h \
 						src/builtins/declare_builtin.cpp \
 						src/builtins/declare_builtin.h \
 						src/builtins/boolean_builtins.h \

diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash
index 8005a23..c8faf7f 100644
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@ -47,3 +47,5 @@ declare -F unset_outer
 echo '$FOO006 "abc" $(( 1 + 2 )) $(echo hi) ...'
 echo "abc $(echo def) ghi"
 FOO008="abc $(echo def) ghi"
+eval "FOO009=10"
+eval "echo abc" "def" "xyz"

diff --git a/scripts/command_execution.bash.result b/scripts/command_execution.bash.result
index d47650d..4113c12 100644
--- a/scripts/command_execution.bash.result
+++ b/scripts/command_execution.bash.result
@@ -15,6 +15,7 @@ FOO006= in global
 unset_outer
 $FOO006 "abc" $(( 1 + 2 )) $(echo hi) ...
 abc def ghi
+abc def xyz
 DEFAULTED=yes
 FOO001=hello
 FOO002=Hello World
@@ -22,3 +23,4 @@ FOO003=1
 FOO004=abc
 FOO005=1 2 3
 FOO008=abc def ghi
+FOO009=10

diff --git a/src/builtins/eval_builtin.cpp b/src/builtins/eval_builtin.cpp
new file mode 100644
index 0000000..5e5a61b
--- /dev/null
+++ b/src/builtins/eval_builtin.cpp
@@ -0,0 +1,39 @@
+/*
+   Please use git log for copyright holder and year information
+
+   This file is part of libbash.
+
+   libbash is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 2 of the License, or
+   (at your option) any later version.
+
+   libbash is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with libbash.  If not, see <http://www.gnu.org/licenses/>.
+*/
+///
+/// \file eval_builtin.h
+/// \author Mu Qiao
+/// \brief class that implements the eval builtin
+///
+
+#include "builtins/eval_builtin.h"
+
+#include <sstream>
+
+#include <boost/algorithm/string/join.hpp>
+
+#include "core/bash_ast.h"
+#include "core/interpreter.h"
+
+int eval_builtin::exec(const std::vector<std::string>& bash_args)
+{
+  std::stringstream script(boost::algorithm::join(bash_args, " "));
+  bash_ast(script).interpret_with(_walker);
+  return _walker.get_status();
+}

diff --git a/src/builtins/eval_builtin.h b/src/builtins/eval_builtin.h
new file mode 100644
index 0000000..87746e9
--- /dev/null
+++ b/src/builtins/eval_builtin.h
@@ -0,0 +1,47 @@
+/*
+   Please use git log for copyright holder and year information
+
+   This file is part of libbash.
+
+   libbash is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 2 of the License, or
+   (at your option) any later version.
+
+   libbash is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with libbash.  If not, see <http://www.gnu.org/licenses/>.
+*/
+///
+/// \file eval_builtin.h
+/// \author Mu Qiao
+/// \brief class that implements the eval builtin
+///
+
+#ifndef LIBBASH_BUILTINS_eval_BUILTIN_H_
+#define LIBBASH_BUILTINS_eval_BUILTIN_H_
+
+#include "cppbash_builtin.h"
+
+///
+/// \class eval_builtin
+/// \brief the eval builtin for bash
+///
+class eval_builtin: public virtual cppbash_builtin
+{
+  public:
+    BUILTIN_CONSTRUCTOR(eval)
+
+    ///
+    /// \brief runs the eval builtin on the supplied arguments
+    /// \param bash_args the arguments to the eval builtin
+    /// \return exit status of eval
+    ///
+    virtual int exec(const std::vector<std::string>& bash_args);
+};
+
+#endif

diff --git a/src/cppbash_builtin.cpp b/src/cppbash_builtin.cpp
index c762f5f..a66622e 100644
--- a/src/cppbash_builtin.cpp
+++ b/src/cppbash_builtin.cpp
@@ -28,6 +28,7 @@
 #include "builtins/continue_builtin.h"
 #include "builtins/declare_builtin.h"
 #include "builtins/echo_builtin.h"
+#include "builtins/eval_builtin.h"
 #include "builtins/inherit_builtin.h"
 #include "builtins/let_builtin.h"
 #include "builtins/return_builtin.h"
@@ -43,6 +44,7 @@ cppbash_builtin::builtins_type& cppbash_builtin::builtins() {
   static boost::scoped_ptr<builtins_type> p(new builtins_type {
       {"continue", boost::factory<continue_builtin*>()},
       {"echo", boost::factory<echo_builtin*>()},
+      {"eval", boost::factory<eval_builtin*>()},
       {"declare", boost::factory<declare_builtin*>()},
       {"source", boost::factory<source_builtin*>()},
       {"shopt", boost::factory<shopt_builtin*>()},