From 92474a1bef0daaa37187f6e9871bfe9ce63b4779 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Sat, 10 May 2014 15:46:15 -0500
Subject: [PATCH] Java, Make: return nil from core readline function on EOF.

---
 java/src/main/java/mal/core.java | 2 +-
 make/core.mk                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/src/main/java/mal/core.java b/java/src/main/java/mal/core.java
index 0f1d226a..7af2f72c 100644
--- a/java/src/main/java/mal/core.java
+++ b/java/src/main/java/mal/core.java
@@ -98,7 +98,7 @@ public class core {
             } catch (IOException e) {
                 throw new MalException(new MalString(e.getMessage()));
             } catch (readline.EOFException e) {
-                throw new MalException(new MalString(e.getMessage()));
+                return Nil;
             }
         }
     };
diff --git a/make/core.mk b/make/core.mk
index 2ee6597b..dc55ed52 100644
--- a/make/core.mk
+++ b/make/core.mk
@@ -60,7 +60,7 @@ str     = $(call _string,$(call _pr_str_mult,$(1),,))
 prn     = $(info $(call _pr_str_mult,$(1),yes, ))
 println = $(info $(subst \n,$(NEWLINE),$(call _pr_str_mult,$(1),, )))
 
-readline= $(foreach res,$(call _string,$(call READLINE,"$(call str_decode,$($(1)_value))")),$(if $(READLINE_EOF),$(__nil),$(res)))
+readline= $(foreach res,$(call _string,$(call READLINE,"$(call str_decode,$($(1)_value))")),$(if $(READLINE_EOF),$(eval READLINE_EOF :=)$(__nil),$(res)))
 read_str= $(call READ_STR,$(1))
 slurp   = $(call _string,$(call _read_file,$(call str_decode,$($(1)_value))))