From 0ed944e84ed0611fda64c19db78c8d68debd8822 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 17 Aug 2014 09:27:01 +0000
Subject: OpenAxiom::VM::Value is now a distinct type.

---
 src/rt/Database.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/rt')

diff --git a/src/rt/Database.cc b/src/rt/Database.cc
index df6ec0a3..81d6f83a 100644
--- a/src/rt/Database.cc
+++ b/src/rt/Database.cc
@@ -51,8 +51,11 @@ namespace OpenAxiom {
             reader.position(n);
             toc = Lisp::retract_to_pair(ctx.make_value(reader.read()));
          }
-         else if (auto data = Lisp::assoc(key, toc))
-            return dict.insert({ key, data }).first->second;
+         else {
+            auto data = Lisp::assoc(key, toc);
+            if (data != nil)
+               return dict.insert({ key, data }).first->second;
+         }
          return nil;
       }
    }
-- 
cgit v1.2.3