From 7e9a2883fe5c25a521b1dc37e4c549e1ed508ece Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Tue, 15 Apr 2014 01:24:43 -0500
Subject: All: fix get. All pass stepA tests.

---
 make/core.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'make')

diff --git a/make/core.mk b/make/core.mk
index aaba3fd..fbea5ea 100644
--- a/make/core.mk
+++ b/make/core.mk
@@ -102,9 +102,11 @@ vals = $(foreach new_list,$(call _list),$(new_list)$(eval $(new_list)_value := $
 # retrieve the value of a string key object from the hash map, or
 # retrive a vector by number object index
 get = $(strip \
-        $(if $(call _hash_map?,$(word 1,$(1))),\
-          $(call _get,$(word 1,$(1)),$(call str_decode,$($(word 2,$(1))_value))),\
-          $(call _get,$(word 1,$(1)),$(call int_decode,$($(word 2,$(1))_value)))))
+        $(if $(call _nil?,$(word 1,$(1))),\
+          $(__nil),\
+          $(if $(call _hash_map?,$(word 1,$(1))),\
+            $(call _get,$(word 1,$(1)),$(call str_decode,$($(word 2,$(1))_value))),\
+            $(call _get,$(word 1,$(1)),$(call int_decode,$($(word 2,$(1))_value))))))
 
 contains? = $(if $(call _contains?,$(word 1,$(1)),$(call str_decode,$($(word 2,$(1))_value))),$(__true),$(__false))
 
-- 
cgit v1.2.3