diff options
| author | Joel Martin <github@martintribe.org> | 2014-05-10 15:46:15 -0500 |
|---|---|---|
| committer | Joel Martin <github@martintribe.org> | 2014-05-10 15:47:05 -0500 |
| commit | 92474a1bef0daaa37187f6e9871bfe9ce63b4779 (patch) | |
| tree | daf3a34cf6de5e6dcb1eb98fecb10a8220d01f85 | |
| parent | 70aff0c1fe3d3ba7953b4e12708e91fd41fed5eb (diff) | |
| download | mal-92474a1bef0daaa37187f6e9871bfe9ce63b4779.tar.gz mal-92474a1bef0daaa37187f6e9871bfe9ce63b4779.zip | |
Java, Make: return nil from core readline function on EOF.
| -rw-r--r-- | java/src/main/java/mal/core.java | 2 | ||||
| -rw-r--r-- | 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 0f1d226..7af2f72 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 2ee6597..dc55ed5 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)))) |