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

[Petteri Räty]

commit:     545417a9c8286a81642a3750df4af7cd977a3be0
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 12:18:30 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri May 27 14:38:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=545417a9

Builtin: support unset built-in

We do not support unsetting array indexes currently. In addition,
read-only functions can be unset for now. Note that if no options are
supplied, or the -v option is given, each name refers to a shell
variable(This behavior is supported by bash 3.2, bash-4.1 tries to
unset function if the name doesn't match a variable).

---
 Makefile.am                           |    2 +
 scripts/command_execution.bash        |   24 +++++++++++++
 scripts/command_execution.bash.result |    7 ++++
 src/builtins/unset_builtin.cpp        |   59 +++++++++++++++++++++++++++++++++
 src/builtins/unset_builtin.h          |   35 +++++++++++++++++++
 src/cppbash_builtin.cpp               |    2 +
 6 files changed, 129 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3b72d46..ebe12ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,6 +189,8 @@ libcppbash_la_SOURCES = src/common.h \
 						src/builtins/let_builtin.cpp \
 						src/builtins/inherit_builtin.h \
 						src/builtins/inherit_builtin.cpp \
+						src/builtins/unset_builtin.h \
+						src/builtins/unset_builtin.cpp \
 						src/builtins/builtin_exceptions.h \
 						$(GENERATED_PARSER_C) \
 						$(GENERATED_PARSER_H) \

diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash
index 95e1594..b1670f2 100644
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@ -19,3 +19,27 @@ FOO="abc" echo "command environment"
 export FOO003=1 FOO004=abc FOO005=(1 2 3) FOO002
 abc=1 export foo
 true > /dev/null
+
+function unset_inner()
+{
+    local FOO006=3 
+    unset FOO006 FOO007
+}
+function unset_outer()
+{
+    local FOO006=1 FOO007=2
+    unset_inner
+    echo "FOO006=$FOO006 in unset_outer"
+    echo "FOO007=$FOO007 in unset_outer"
+    unset FOO006
+    echo "FOO006=$FOO006 in unset_outer"
+}
+unset_outer
+echo "FOO006=$FOO006 in global"
+FOO006=0
+echo "FOO006=$FOO006 in global"
+unset FOO006
+echo "FOO006=$FOO006 in global"
+declare -F unset_outer
+unset -f unset_outer
+declare -F unset_outer

diff --git a/scripts/command_execution.bash.result b/scripts/command_execution.bash.result
index ae71fa5..d941a6d 100644
--- a/scripts/command_execution.bash.result
+++ b/scripts/command_execution.bash.result
@@ -6,6 +6,13 @@ 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
+FOO006= in global
+FOO006=0 in global
+FOO006= in global
+unset_outer
 DEFAULTED=yes
 FOO001=hello
 FOO002=Hello World

diff --git a/src/builtins/unset_builtin.cpp b/src/builtins/unset_builtin.cpp
new file mode 100644
index 0000000..1490013
--- /dev/null
+++ b/src/builtins/unset_builtin.cpp
@@ -0,0 +1,59 @@
+/*
+   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 unset_builtin.h
+/// \author Mu Qiao
+/// \brief implementation for the unset builtin
+///
+#include <functional>
+
+#include "core/interpreter.h"
+#include "core/unset_exception.h"
+
+#include "builtins/unset_builtin.h"
+
+int unset_builtin::exec(const std::vector<std::string>& bash_args)
+{
+  if(bash_args.empty())
+    return 0;
+
+  if(bash_args[0] == "-f")
+    for_each(bash_args.begin() + 1,
+             bash_args.end(),
+             std::bind(&interpreter::unset_function, &_walker, std::placeholders::_1));
+  else
+  /* POSIX says if neither -f nor -v is specified, name refers to a variable;
+   * if a variable by that name does not exist, it is unspecified whether a
+   * function by that name, if any, shall be unset.
+   *
+   * >=bash-4.1: without options, unset first tries to unset a variable, and
+   * if that fails, tries to unset a function.
+   * (We haven't checked bash-4.0)
+   *
+   * bash-3.2: if no options are supplied, or the -v option is given, each
+   * name refers to a shell variable.
+   *
+   * We addhere to bash-3.2
+   * */
+    for_each(bash_args.front() == "-v" ? bash_args.begin() + 1 : bash_args.begin(),
+             bash_args.end(),
+             [&](const std::string& name) { _walker.unset(name); });
+
+  return 0;
+}

diff --git a/src/builtins/unset_builtin.h b/src/builtins/unset_builtin.h
new file mode 100644
index 0000000..202e78a
--- /dev/null
+++ b/src/builtins/unset_builtin.h
@@ -0,0 +1,35 @@
+/*
+   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 unset_builtin.h
+/// \brief implementation for the unset builtin
+///
+#ifndef LIBBASH_BUILTINS_UNSET_BUILTIN_H_
+#define LIBBASH_BUILTINS_UNSET_BUILTIN_H_
+
+#include "cppbash_builtin.h"
+
+class unset_builtin : public virtual cppbash_builtin
+{
+public:
+  BUILTIN_CONSTRUCTOR(unset)
+  virtual int exec(const std::vector<std::string>& bash_args);
+};
+
+#endif

diff --git a/src/cppbash_builtin.cpp b/src/cppbash_builtin.cpp
index 9308ebb..98d3acc 100644
--- a/src/cppbash_builtin.cpp
+++ b/src/cppbash_builtin.cpp
@@ -32,6 +32,7 @@
 #include "builtins/return_builtin.h"
 #include "builtins/shopt_builtin.h"
 #include "builtins/source_builtin.h"
+#include "builtins/unset_builtin.h"
 
 cppbash_builtin::cppbash_builtin(BUILTIN_ARGS): _out_stream(&out), _err_stream(&err), _inp_stream(&in), _walker(walker)
 {
@@ -49,6 +50,7 @@ cppbash_builtin::builtins_type& cppbash_builtin::builtins() {
       {"false", boost::factory<false_builtin*>()},
       {"return", boost::factory<return_builtin*>()},
       {"let", boost::factory<let_builtin*>()},
+      {"unset", boost::factory<unset_builtin*>()},
   });
   return *p;
 }