crystal,java: fix empty list handling.

diff --git a/crystal/step8_macros.cr b/crystal/step8_macros.cr
index f7b5cb3..cca3710 100755 (executable)
--- a/crystal/step8_macros.cr
+++ b/crystal/step8_macros.cr
@@ -87,6 +87,7 @@ module Mal
   def macro_call?(ast, env)
     list = ast.unwrap
     return false unless list.is_a? Mal::List
+    return false if list.empty?
 
     sym = list.first.unwrap
     return false unless sym.is_a? Mal::Symbol
@@ -136,7 +137,10 @@ module Mal
     # 'next' in 'do...end' has a bug in crystal 0.7.1
     # https://github.com/manastech/crystal/issues/659
     while true
-      return eval_ast(ast, env) unless ast.unwrap.is_a? Mal::List
+      list = ast.unwrap
+
+      return eval_ast(ast, env) unless list.is_a? Mal::List
+      return ast if list.empty?
 
       ast = macroexpand(ast, env)
 

diff --git a/crystal/step9_try.cr b/crystal/step9_try.cr
index 0de286f..5d63bc8 100755 (executable)
--- a/crystal/step9_try.cr
+++ b/crystal/step9_try.cr
@@ -87,6 +87,7 @@ module Mal
   def macro_call?(ast, env)
     list = ast.unwrap
     return false unless list.is_a? Mal::List
+    return false if list.empty?
 
     sym = list.first.unwrap
     return false unless sym.is_a? Mal::Symbol
@@ -136,7 +137,10 @@ module Mal
     # 'next' in 'do...end' has a bug in crystal 0.7.1
     # https://github.com/manastech/crystal/issues/659
     while true
-      return eval_ast(ast, env) unless ast.unwrap.is_a? Mal::List
+      list = ast.unwrap
+
+      return eval_ast(ast, env) unless list.is_a? Mal::List
+      return ast if list.empty?
 
       ast = macroexpand(ast, env)
 

diff --git a/crystal/stepA_mal.cr b/crystal/stepA_mal.cr
index bf1a201..e8af4fb 100755 (executable)
--- a/crystal/stepA_mal.cr
+++ b/crystal/stepA_mal.cr
@@ -143,7 +143,10 @@ module Mal
     # 'next' in 'do...end' has a bug in crystal 0.7.1
     # https://github.com/manastech/crystal/issues/659
     while true
-      return eval_ast(ast, env) unless ast.unwrap.is_a? Mal::List
+      list = ast.unwrap
+
+      return eval_ast(ast, env) unless list.is_a? Mal::List
+      return ast if list.empty?
 
       ast = macroexpand(ast, env)
 

diff --git a/java/src/main/java/mal/step8_macros.java b/java/src/main/java/mal/step8_macros.java
index a109a88..c2fec4f 100644 (file)
--- a/java/src/main/java/mal/step8_macros.java
+++ b/java/src/main/java/mal/step8_macros.java
@@ -107,6 +107,7 @@ public class step8_macros {
         if (!orig_ast.list_Q()) {
             return eval_ast(orig_ast, env);
         }
+        if (((MalList)orig_ast).size() == 0) { return orig_ast; }
 
         // apply list
         MalVal expanded = macroexpand(orig_ast, env);

diff --git a/java/src/main/java/mal/step9_try.java b/java/src/main/java/mal/step9_try.java
index e5f77f5..1262bd8 100644 (file)
--- a/java/src/main/java/mal/step9_try.java
+++ b/java/src/main/java/mal/step9_try.java
@@ -109,6 +109,7 @@ public class step9_try {
         if (!orig_ast.list_Q()) {
             return eval_ast(orig_ast, env);
         }
+        if (((MalList)orig_ast).size() == 0) { return orig_ast; }
 
         // apply list
         MalVal expanded = macroexpand(orig_ast, env);

diff --git a/java/src/main/java/mal/stepA_mal.java b/java/src/main/java/mal/stepA_mal.java
index c4162c6..6bd36bc 100644 (file)
--- a/java/src/main/java/mal/stepA_mal.java
+++ b/java/src/main/java/mal/stepA_mal.java
@@ -109,6 +109,7 @@ public class stepA_mal {
         if (!orig_ast.list_Q()) {
             return eval_ast(orig_ast, env);
         }
+        if (((MalList)orig_ast).size() == 0) { return orig_ast; }
 
         // apply list
         MalVal expanded = macroexpand(orig_ast, env);