aboutsummaryrefslogtreecommitdiff
path: root/src/rt
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2014-08-17 09:27:01 +0000
committerdos-reis <gdr@axiomatics.org>2014-08-17 09:27:01 +0000
commit0ed944e84ed0611fda64c19db78c8d68debd8822 (patch)
tree6a8e2bafc0fc3cc79a70bc894e71cd408a9124cf /src/rt
parentc50f5cd58337e96609479484c2cfd7fcd80db182 (diff)
downloadopen-axiom-0ed944e84ed0611fda64c19db78c8d68debd8822.tar.gz
OpenAxiom::VM::Value is now a distinct type.
Diffstat (limited to 'src/rt')
-rw-r--r--src/rt/Database.cc7
1 files changed, 5 insertions, 2 deletions
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;
}
}