From 4f3b39e22c7a7743132ead79b1e092929679de44 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 30 May 2010 02:55:02 -0600
Subject: Empty notes and tags now return null values

---
 src/item.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/item.cc')

diff --git a/src/item.cc b/src/item.cc
index 14a0896f..0a22b260 100644
--- a/src/item.cc
+++ b/src/item.cc
@@ -227,7 +227,7 @@ namespace {
     return NULL_VALUE;
   }
   value_t get_note(item_t& item) {
-    return string_value(item.note ? *item.note : empty_string);
+    return item.note ? string_value(*item.note) : NULL_VALUE;
   }
 
   value_t has_tag(call_scope_t& args) {
@@ -260,7 +260,8 @@ namespace {
     return false;
   }
 
-  value_t get_tag(call_scope_t& args) {
+  value_t get_tag(call_scope_t& args)
+  {
     item_t& item(find_scope<item_t>(args));
     optional<string> str;
 
@@ -292,14 +293,14 @@ namespace {
     if (str)
       return string_value(*str);
     else
-      return string_value(empty_string);
+      return NULL_VALUE;
   }
 
   value_t get_pathname(item_t& item) {
     if (item.pos)
       return string_value(item.pos->pathname.string());
     else
-      return string_value(empty_string);
+      return NULL_VALUE;
   }
 
   value_t get_beg_pos(item_t& item) {
-- 
cgit v1.2.3