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

[Petteri Räty]

commit:     1b7da0e59f91f963e616e8762f2d03e736908ad4
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 13:51:42 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun May 29 11:44:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=1b7da0e5

Builtin: support continue built-in

---
 Makefile.am                                        |    3 +
 src/builtins/builtin_exceptions.h                  |   21 ++++++
 .../{builtin_exceptions.h => continue_builtin.cpp} |   43 ++++++++-----
 .../{builtin_exceptions.h => continue_builtin.h}   |   22 ++----
 src/builtins/tests/continue_tests.cpp              |   69 ++++++++++++++++++++
 src/cppbash_builtin.cpp                            |    2 +
 6 files changed, 130 insertions(+), 30 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ebe12ee..423bcc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,6 +98,7 @@ cppunittests_SOURCES =  test/run_tests.cpp \
 						src/core/tests/interpreter_test.cpp \
 						src/core/tests/bash_ast_test.cpp \
 						src/core/tests/bash_condition_test.cpp \
+						src/builtins/tests/continue_tests.cpp \
 						src/builtins/tests/echo_tests.cpp \
 						src/builtins/tests/declare_tests.cpp \
 						src/builtins/tests/boolean_tests.cpp \
@@ -174,6 +175,8 @@ libcppbash_la_SOURCES = src/common.h \
 						src/libbash.cpp \
 						src/cppbash_builtin.cpp \
 						src/cppbash_builtin.h \
+						src/builtins/continue_builtin.cpp \
+						src/builtins/continue_builtin.h \
 						src/builtins/echo_builtin.cpp \
 						src/builtins/echo_builtin.h \
 						src/builtins/declare_builtin.cpp \

diff --git a/src/builtins/builtin_exceptions.h b/src/builtins/builtin_exceptions.h
index 5548d14..a5cc28b 100644
--- a/src/builtins/builtin_exceptions.h
+++ b/src/builtins/builtin_exceptions.h
@@ -27,6 +27,8 @@
 
 #include <stdexcept>
 
+#include "core/interpreter_exception.h"
+
 ///
 /// \class return_exception
 /// \brief thrown when executing the return builtin
@@ -38,4 +40,23 @@ public:
     runtime_error("return exception"){}
 };
 
+class continue_exception: public std::exception
+{
+  int count;
+public:
+  explicit continue_exception(int c): count(c)
+  {
+    if(c < 1)
+      throw interpreter_exception("continue: argument should be greater than or equal to 1");
+  }
+
+  void rethrow_unless_correct_frame()
+  {
+    if(count != 1)
+    {
+      --count;
+      throw *this;
+    }
+  }
+};
 #endif

diff --git a/src/builtins/builtin_exceptions.h b/src/builtins/continue_builtin.cpp
similarity index 52%
copy from src/builtins/builtin_exceptions.h
copy to src/builtins/continue_builtin.cpp
index 5548d14..87dd59a 100644
--- a/src/builtins/builtin_exceptions.h
+++ b/src/builtins/continue_builtin.cpp
@@ -17,25 +17,36 @@
    along with libbash.  If not, see <http://www.gnu.org/licenses/>.
 */
 ///
-/// \file builtin_exceptions.h
+/// \file continue_builtin.h
 /// \author Mu Qiao
-/// \brief implementations for builtin exceptions
+/// \brief implementation for the continue builtin
 ///
+#include <boost/lexical_cast.hpp>
 
-#ifndef LIBBASH_BUILTINS_BUILTIN_EXCEPTIONS_H_
-#define LIBBASH_BUILTINS_BUILTIN_EXCEPTIONS_H_
+#include "builtins/builtin_exceptions.h"
+#include "core/interpreter_exception.h"
 
-#include <stdexcept>
+#include "builtins/continue_builtin.h"
 
-///
-/// \class return_exception
-/// \brief thrown when executing the return builtin
-///
-class return_exception: public std::runtime_error
+int continue_builtin::exec(const std::vector<std::string>& bash_args)
 {
-public:
-  explicit return_exception():
-    runtime_error("return exception"){}
-};
-
-#endif
+  int nth = 1;
+
+  if(bash_args.size() > 1)
+  {
+    throw interpreter_exception("continue: too many arguments");
+  }
+  else if(bash_args.size() == 1)
+  {
+    try
+    {
+      nth = boost::lexical_cast<int>(bash_args[0]);
+    }
+    catch(boost::bad_lexical_cast& e)
+    {
+      throw interpreter_exception("continue: argument should be an integer");
+    }
+  }
+
+  throw continue_exception(nth);
+}

diff --git a/src/builtins/builtin_exceptions.h b/src/builtins/continue_builtin.h
similarity index 64%
copy from src/builtins/builtin_exceptions.h
copy to src/builtins/continue_builtin.h
index 5548d14..cd5223b 100644
--- a/src/builtins/builtin_exceptions.h
+++ b/src/builtins/continue_builtin.h
@@ -17,25 +17,19 @@
    along with libbash.  If not, see <http://www.gnu.org/licenses/>.
 */
 ///
-/// \file builtin_exceptions.h
-/// \author Mu Qiao
-/// \brief implementations for builtin exceptions
+/// \file continue_builtin.h
+/// \brief implementation for the continue builtin
 ///
+#ifndef LIBBASH_BUILTINS_CONTINUE_BUILTIN_H_
+#define LIBBASH_BUILTINS_CONTINUE_BUILTIN_H_
 
-#ifndef LIBBASH_BUILTINS_BUILTIN_EXCEPTIONS_H_
-#define LIBBASH_BUILTINS_BUILTIN_EXCEPTIONS_H_
+#include "cppbash_builtin.h"
 
-#include <stdexcept>
-
-///
-/// \class return_exception
-/// \brief thrown when executing the return builtin
-///
-class return_exception: public std::runtime_error
+class continue_builtin : public virtual cppbash_builtin
 {
 public:
-  explicit return_exception():
-    runtime_error("return exception"){}
+  BUILTIN_CONSTRUCTOR(continue)
+  virtual int exec(const std::vector<std::string>& );
 };
 
 #endif

diff --git a/src/builtins/tests/continue_tests.cpp b/src/builtins/tests/continue_tests.cpp
new file mode 100644
index 0000000..4a8d67c
--- /dev/null
+++ b/src/builtins/tests/continue_tests.cpp
@@ -0,0 +1,69 @@
+/*
+   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 continue_tests.cpp
+/// \brief series of unit tests for continue builtin
+///
+#include <boost/lexical_cast.hpp>
+#include <gtest/gtest.h>
+
+#include "builtins/builtin_exceptions.h"
+#include "core/interpreter.h"
+#include "cppbash_builtin.h"
+
+TEST(continue_builtin_test, bad_argument)
+{
+  interpreter walker;
+  EXPECT_THROW(cppbash_builtin::exec("continue", {"abc"}, std::cout, std::cerr, std::cin, walker), interpreter_exception);
+  EXPECT_THROW(cppbash_builtin::exec("continue", {"1", "2"}, std::cout, std::cerr, std::cin, walker), interpreter_exception);
+  EXPECT_THROW(cppbash_builtin::exec("continue", {"0"}, std::cout, std::cerr, std::cin, walker), interpreter_exception);
+  EXPECT_THROW(cppbash_builtin::exec("continue", {"-1"}, std::cout, std::cerr, std::cin, walker), interpreter_exception);
+}
+
+TEST(continue_builtin_test, throw_exception)
+{
+  interpreter walker;
+  try
+  {
+    cppbash_builtin::exec("continue", {}, std::cout, std::cerr, std::cin, walker);
+    FAIL();
+  }
+  catch(continue_exception& e)
+  {
+    EXPECT_NO_THROW(e.rethrow_unless_correct_frame());
+  }
+
+  try
+  {
+    cppbash_builtin::exec("continue", {"2"}, std::cout, std::cerr, std::cin, walker);
+    FAIL();
+  }
+  catch(continue_exception& e)
+  {
+    try
+    {
+      e.rethrow_unless_correct_frame();
+      FAIL();
+    }
+    catch(continue_exception& e)
+    {
+      EXPECT_NO_THROW(e.rethrow_unless_correct_frame());
+    }
+  }
+}

diff --git a/src/cppbash_builtin.cpp b/src/cppbash_builtin.cpp
index 98d3acc..c762f5f 100644
--- a/src/cppbash_builtin.cpp
+++ b/src/cppbash_builtin.cpp
@@ -25,6 +25,7 @@
 #include "cppbash_builtin.h"
 
 #include "builtins/boolean_builtins.h"
+#include "builtins/continue_builtin.h"
 #include "builtins/declare_builtin.h"
 #include "builtins/echo_builtin.h"
 #include "builtins/inherit_builtin.h"
@@ -40,6 +41,7 @@ cppbash_builtin::cppbash_builtin(BUILTIN_ARGS): _out_stream(&out), _err_stream(&
 
 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*>()},
       {"declare", boost::factory<declare_builtin*>()},
       {"source", boost::factory<source_builtin*>()},