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

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

commit:     784193e4e4ba9ac58630eb791757f098492bc5f7
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 03:34:06 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Mon May 23 15:04:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=784193e4

Core: refactor get_all_elements_joined to use resolve_array

The resolve_array method is changed to return false if the array
doesn't exist.

---
 src/core/interpreter.cpp            |   12 +++---------
 src/core/interpreter.h              |    5 +++--
 src/core/tests/interpreter_test.cpp |    3 ++-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/core/interpreter.cpp b/src/core/interpreter.cpp
index 85b0ded..80bc8be 100644
--- a/src/core/interpreter.cpp
+++ b/src/core/interpreter.cpp
@@ -143,18 +143,12 @@ void interpreter::get_all_elements_joined(const std::string& name,
                                           const std::string& delim,
                                           std::string& result) const
 {
-  std::vector<std::string> source;
+  std::vector<std::string> array;
 
-  auto i = members.find(name);
-  if(i != members.end())
-  {
-    i->second->get_all_values(source);
-    result = boost::algorithm::join(source, delim);
-  }
+  if(resolve_array(name, array))
+    result = boost::algorithm::join(array, delim);
   else
-  {
     result = "";
-  }
 }
 
 void interpreter::get_all_elements(const std::string& name,

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index 5d9f518..aa13b4e 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -437,13 +437,14 @@ public:
   /// \param variable name
   /// \param[out] vector that stores all array values
   template <typename T>
-  void resolve_array(const std::string& name, std::vector<T>& values) const
+  bool resolve_array(const std::string& name, std::vector<T>& values) const
   {
     auto i = members.find(name);
     if(i == members.end())
-      return;
+      return false;
 
     i->second->get_all_values(values);
+    return true;
   }
 
   /// \brief check whether the value of the variable is null, return true

diff --git a/src/core/tests/interpreter_test.cpp b/src/core/tests/interpreter_test.cpp
index 54f25b0..a5e4ff9 100644
--- a/src/core/tests/interpreter_test.cpp
+++ b/src/core/tests/interpreter_test.cpp
@@ -136,10 +136,11 @@ TEST(interpreter, get_array_values)
   walker.define("array", values);
 
   std::vector<int> array_values;
-  walker.resolve_array("array", array_values);
+  EXPECT_TRUE(walker.resolve_array("array", array_values));
   EXPECT_EQ(1, array_values[0]);
   EXPECT_EQ(2, array_values[1]);
   EXPECT_EQ(3, array_values[2]);
+  EXPECT_FALSE(walker.resolve_array("undefined", array_values));
 }
 
 TEST(interpreter, unset_values)