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

[Petteri Räty]

commit:     b36f96514be51edfa2fa147157972a627adcc292
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 15:04:32 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu May 26 14:56:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=b36f9651

Core: return default value when name doesn't exist

The interpreter class would throw an exception if the variable name
was "" and would return the default value if the variable couldn't
be find. Now this behavior is unified by returning the default value.

---
 src/core/interpreter.cpp            |    3 ++-
 src/core/tests/interpreter_test.cpp |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/core/interpreter.cpp b/src/core/interpreter.cpp
index 2337e87..c8611d6 100644
--- a/src/core/interpreter.cpp
+++ b/src/core/interpreter.cpp
@@ -101,7 +101,8 @@ std::string interpreter::get_string(pANTLR3_BASE_TREE node)
 std::shared_ptr<variable> interpreter::resolve_variable(const std::string& name) const
 {
   if(name.empty())
-    throw interpreter_exception("Variable name shouldn't be empty");
+    return std::shared_ptr<variable>();
+
   // positional parameter
   if(isdigit(name[0]) && !local_members.empty())
   {

diff --git a/src/core/tests/interpreter_test.cpp b/src/core/tests/interpreter_test.cpp
index ab24449..0322a6b 100644
--- a/src/core/tests/interpreter_test.cpp
+++ b/src/core/tests/interpreter_test.cpp
@@ -34,6 +34,7 @@ TEST(interpreter, define_resolve_int)
   walker.define("aint", 4);
   EXPECT_EQ(4, walker.resolve<int>("aint"));
   EXPECT_EQ(0, walker.resolve<int>("undefined"));
+  EXPECT_EQ(0, walker.resolve<int>(""));
 }
 
 TEST(interpreter, define_resolve_string)
@@ -42,6 +43,7 @@ TEST(interpreter, define_resolve_string)
   walker.define("astring", "hello");
   EXPECT_STREQ("hello", walker.resolve<string>("astring").c_str());
   EXPECT_STREQ("", walker.resolve<string>("undefined").c_str());
+  EXPECT_STREQ("", walker.resolve<string>("").c_str());
 }
 
 TEST(interpreter, define_resolve_array)