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

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

commit:     6911bc054a5684377ab303a3133ca91349675b30
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Thu Jun 16 16:49:41 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 16:49:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=6911bc05

Merge remote-tracking branch 'mu/bash_options' into review

Conflicts:
	bashast/libbashWalker.g
	src/core/interpreter.cpp
	src/core/tests/interpreter_test.cpp


 bashast/libbashWalker.g             |    6 ++-
 scripts/var_def.bash                |    2 +-
 scripts/var_def.bash.result         |    2 +-
 src/builtins/shopt_builtin.cpp      |    4 +-
 src/builtins/tests/shopt_tests.cpp  |   10 +++---
 src/core/interpreter.cpp            |   55 ++++++++++++++++++++++++++++++----
 src/core/interpreter.h              |   18 +++++++----
 src/core/tests/interpreter_test.cpp |   19 ++++++++----
 utils/variable_printer.cpp          |    2 +-
 9 files changed, 86 insertions(+), 32 deletions(-)

diff --cc bashast/libbashWalker.g
index 9d297d2,458dcd8..f74f64e
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@@ -247,8 -247,8 +247,8 @@@ bash_pattern[boost::xpressive::sregex& 
  	bool do_append = false;
  	sregex pattern_list;
  	auto check_extglob = [&]() {
- 		if(!walker->get_option("extglob"))
+ 		if(!walker->get_additional_option("extglob"))
 -			throw interpreter_exception("Entered extended pattern matching with extglob disabled");
 +			throw libbash::interpreter_exception("Entered extended pattern matching with extglob disabled");
  	};
  }
  	:^(STRING (
diff --cc src/core/interpreter.cpp
index c71233d,eca7987..d34ce96
--- a/src/core/interpreter.cpp
+++ b/src/core/interpreter.cpp
@@@ -372,20 -413,20 +413,20 @@@ void interpreter::unset(const std::stri
    }
  }
  
- bool interpreter::get_option(const std::string& name) const
+ bool interpreter::get_additional_option(const std::string& name) const
  {
-   auto iter = bash_options.find(name);
-   if(iter == bash_options.end())
+   auto iter = additional_options.find(name);
+   if(iter == additional_options.end())
 -    throw interpreter_exception("Invalid bash option");
 +    throw libbash::interpreter_exception("Invalid bash option");
  
    return iter->second;
  }
  
- void interpreter::set_option(const std::string& name, bool value)
+ void interpreter::set_additional_option(const std::string& name, bool value)
  {
-   auto iter = bash_options.find(name);
-   if(iter == bash_options.end())
+   auto iter = additional_options.find(name);
+   if(iter == additional_options.end())
 -    throw interpreter_exception(name + " is not a valid bash option");
 +    throw libbash::interpreter_exception(name + " is not a valid bash option");
  
    iter->second = value;
  }
diff --cc src/core/tests/interpreter_test.cpp
index 678ac00,54971ab..f207bfb
--- a/src/core/tests/interpreter_test.cpp
+++ b/src/core/tests/interpreter_test.cpp
@@@ -240,10 -240,17 +240,17 @@@ TEST(interpreter, bash_additional_optio
  {
    interpreter walker;
  
-   EXPECT_THROW(walker.set_option("not exist", false), libbash::interpreter_exception);
-   EXPECT_THROW(walker.get_option("not exist"), libbash::interpreter_exception);
 -  EXPECT_THROW(walker.set_additional_option("not exist", false), interpreter_exception);
 -  EXPECT_THROW(walker.get_additional_option("not exist"), interpreter_exception);
++  EXPECT_THROW(walker.set_additional_option("not exist", false), libbash::interpreter_exception);
++  EXPECT_THROW(walker.get_additional_option("not exist"), libbash::interpreter_exception);
+ 
+   EXPECT_FALSE(walker.get_additional_option("extglob"));
+   walker.set_additional_option("extglob", true);
+   EXPECT_TRUE(walker.get_additional_option("extglob"));
+ }
+ 
+ TEST(interpreter, bash_option)
+ {
+   interpreter walker;
  
-   EXPECT_FALSE(walker.get_option("extglob"));
-   walker.set_option("extglob", true);
-   EXPECT_TRUE(walker.get_option("extglob"));
+   EXPECT_STREQ("Bh", walker.resolve<std::string>("-").c_str());
  }