[gentoo-commits] proj/libbash:master commit in: /

["Petteri Räty" <betelgeuse@gentoo.org>]

commit:     95c82eca762174b0d329af65029fd2e1a280232b
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Jun 25 10:04:08 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 10:04:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=95c82eca

Merge remote-tracking branch 'mu/break_builtin'

Conflicts:
	src/builtins/builtin_exceptions.h


 Makefile.am                                        |    3 +
 bashast/libbashWalker.g                            |   28 ++++++-
 scripts/compound_command.bash                      |   87 ++++++++++++++++++++
 scripts/compound_command.bash.result               |   10 ++-
 .../{continue_builtin.cpp => break_builtin.cpp}    |   16 ++--
 src/builtins/{let_builtin.h => break_builtin.h}    |   12 ++--
 src/builtins/builtin_exceptions.h                  |   46 +++++++++--
 .../tests/{continue_tests.cpp => break_tests.cpp}  |   26 +++---
 src/cppbash_builtin.cpp                            |    2 +
 9 files changed, 189 insertions(+), 41 deletions(-)

diff --cc src/builtins/builtin_exceptions.h
index 9b0c1d8,c535417..7b45efc
--- a/src/builtins/builtin_exceptions.h
+++ b/src/builtins/builtin_exceptions.h
@@@ -59,6 -61,36 +61,36 @@@ public
    }
  };
  
+ class continue_exception: public loop_control_exception
+ {
+ protected:
+   virtual void rethrow()
+   {
+     throw *this;
+   }
+ 
+ public:
+   explicit continue_exception(int c): loop_control_exception(c) {
+     if(c < 1)
 -      throw libbash::interpreter_exception("continue: argument should be greater than or equal to 1");
++      throw libbash::illegal_argument_exception("continue: argument should be greater than or equal to 1");
+   }
+ };
+ 
+ class break_exception: public loop_control_exception
+ {
+ protected:
+   virtual void rethrow()
+   {
+     throw *this;
+   }
+ 
+ public:
+   explicit break_exception(int c): loop_control_exception(c) {
+     if(c < 1)
 -      throw libbash::interpreter_exception("break: argument should be greater than or equal to 1");
++      throw libbash::illegal_argument_exception("break: argument should be greater than or equal to 1");
+   }
+ };
+ 
  class suppress_output: public std::exception
  {
  };