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

[Petteri Räty]

commit:     951bb1b72491976c03939ac186c9cfe4a236fb84
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 11:38:06 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 11:38:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=951bb1b7

Rename is_null to is_unset_or_null

is_null method will always check if the variable is unset. So
change the name to a more proper one.

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

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index c0cc12d..ab6b9e8 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -366,7 +366,7 @@ public:
   ///        if the variable is undefined
   /// \param variable name
   /// \return whether the value of the variable is null
-  bool is_null(const std::string& name)
+  bool is_unset_or_null(const std::string& name)
   {
     std::shared_ptr<variable> value = members.resolve(name);
     if(value)
@@ -422,7 +422,7 @@ public:
   const std::string do_default_expansion(const std::string& name,
                                          const std::string& value)
   {
-    return (is_null(name)? value : resolve<std::string>(name));
+    return (is_unset_or_null(name)? value : resolve<std::string>(name));
   }
 };
 #endif

diff --git a/src/core/tests/interpreter_test.cpp b/src/core/tests/interpreter_test.cpp
index 6f8d0c4..2d46e62 100644
--- a/src/core/tests/interpreter_test.cpp
+++ b/src/core/tests/interpreter_test.cpp
@@ -44,13 +44,13 @@ TEST(interpreter, define_resolve_string)
   EXPECT_STREQ("", walker.resolve<string>("undefined").c_str());
 }
 
-TEST(interpreter, is_null)
+TEST(interpreter, is_unset_or_null)
 {
   interpreter walker;
   walker.define("foo", "hello");
-  EXPECT_FALSE(walker.is_null("foo"));
+  EXPECT_FALSE(walker.is_unset_or_null("foo"));
   walker.define("foo", "hello", false, true);
-  EXPECT_TRUE(walker.is_null("foo"));
+  EXPECT_TRUE(walker.is_unset_or_null("foo"));
 }
 
 TEST(interpreter, is_unset)