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

[Petteri Räty]

commit:     2d27dd160050b05cb4309a7eeec4bde936079033
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 08:53:30 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 15:57:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=2d27dd16

Fix a bug in resolving non-exist symbols

We should return an empty shared_ptr if the symbol doesn't exist.

---
 src/core/symbols.hpp            |    3 ++-
 src/core/tests/symbols_test.cpp |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/core/symbols.hpp b/src/core/symbols.hpp
index a4ae514..8734548 100644
--- a/src/core/symbols.hpp
+++ b/src/core/symbols.hpp
@@ -252,7 +252,8 @@ public:
   /// \return target symbol passed by reference
   std::shared_ptr<symbol> resolve(const std::string& name)
   {
-    return members[name];
+    auto iter = members.find(name);
+    return (iter == members.end()? std::shared_ptr<symbol>() : iter->second);
   }
 protected:
   /// \var protected::member

diff --git a/src/core/tests/symbols_test.cpp b/src/core/tests/symbols_test.cpp
index 7620be0..73a6a9c 100644
--- a/src/core/tests/symbols_test.cpp
+++ b/src/core/tests/symbols_test.cpp
@@ -80,4 +80,5 @@ TEST(scope_test, define_resolve)
   auto an_int = shared_ptr<variable>(new variable("integer_symbol", 100));
   members.define(an_int);
   EXPECT_EQ(an_int, members.resolve("integer_symbol"));
+  EXPECT_FALSE(members.resolve("not exist"));
 }