groovy: Fix exception on literal empty list

Issue kanaka#190
ckafi · Apr 1, 2016 · 8ec0c2e · 8ec0c2e
1 parent 4525f9e
commit 8ec0c2e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 0 deletions.
diff --git a/groovy/step3_env.groovy b/groovy/step3_env.groovy
@@ -29,6 +29,7 @@ eval_ast = { ast, env ->
 EVAL = { ast, env ->
     //println("EVAL: ${printer.pr_str(ast,true)}")
     if (! types.list_Q(ast)) return eval_ast(ast, env)
+    if (ast.size() == 0) return ast
 
     switch (ast[0]) {
     case { it instanceof MalSymbol && it.value == "def!" }:

diff --git a/groovy/step4_if_fn_do.groovy b/groovy/step4_if_fn_do.groovy
@@ -31,6 +31,7 @@ eval_ast = { ast, env ->
 EVAL = { ast, env ->
     //println("EVAL: ${printer.pr_str(ast,true)}")
     if (! types.list_Q(ast)) return eval_ast(ast, env)
+    if (ast.size() == 0) return ast
 
     switch (ast[0]) {
     case { it instanceof MalSymbol && it.value == "def!" }:

diff --git a/groovy/step5_tco.groovy b/groovy/step5_tco.groovy
@@ -32,6 +32,7 @@ EVAL = { ast, env ->
   while (true) {
     //println("EVAL: ${printer.pr_str(ast,true)}")
     if (! types.list_Q(ast)) return eval_ast(ast, env)
+    if (ast.size() == 0) return ast
 
     switch (ast[0]) {
     case { it instanceof MalSymbol && it.value == "def!" }:

diff --git a/groovy/step6_file.groovy b/groovy/step6_file.groovy
@@ -32,6 +32,7 @@ EVAL = { ast, env ->
   while (true) {
     //println("EVAL: ${printer.pr_str(ast,true)}")
     if (! types.list_Q(ast)) return eval_ast(ast, env)
+    if (ast.size() == 0) return ast
 
     switch (ast[0]) {
     case { it instanceof MalSymbol && it.value == "def!" }:

diff --git a/groovy/step7_quote.groovy b/groovy/step7_quote.groovy
@@ -48,6 +48,7 @@ EVAL = { ast, env ->
   while (true) {
     //println("EVAL: ${printer.pr_str(ast,true)}")
     if (! types.list_Q(ast)) return eval_ast(ast, env)
+    if (ast.size() == 0) return ast
 
     switch (ast[0]) {
     case { it instanceof MalSymbol && it.value == "def!" }:

diff --git a/groovy/step8_macros.groovy b/groovy/step8_macros.groovy
@@ -15,6 +15,7 @@ READ = { str ->
 // EVAL
 macro_Q = { ast, env ->
     if (types.list_Q(ast) &&
+        ast.size() > 0 &&
         ast[0].class == MalSymbol &&
         env.find(ast[0])) {
         def obj = env.get(ast[0])
@@ -70,6 +71,7 @@ EVAL = { ast, env ->
 
     ast = macroexpand(ast, env)
     if (! types.list_Q(ast)) return eval_ast(ast, env)
+    if (ast.size() == 0) return ast
 
     switch (ast[0]) {
     case { it instanceof MalSymbol && it.value == "def!" }:

diff --git a/groovy/step9_try.groovy b/groovy/step9_try.groovy
@@ -15,6 +15,7 @@ READ = { str ->
 // EVAL
 macro_Q = { ast, env ->
     if (types.list_Q(ast) &&
+        ast.size() > 0 &&
         ast[0].class == MalSymbol &&
         env.find(ast[0])) {
         def obj = env.get(ast[0])
@@ -70,6 +71,7 @@ EVAL = { ast, env ->
 
     ast = macroexpand(ast, env)
     if (! types.list_Q(ast)) return eval_ast(ast, env)
+    if (ast.size() == 0) return ast
 
     switch (ast[0]) {
     case { it instanceof MalSymbol && it.value == "def!" }:

diff --git a/groovy/stepA_mal.groovy b/groovy/stepA_mal.groovy
@@ -15,6 +15,7 @@ READ = { str ->
 // EVAL
 macro_Q = { ast, env ->
     if (types.list_Q(ast) &&
+        ast.size() > 0 &&
         ast[0].class == MalSymbol &&
         env.find(ast[0])) {
         def obj = env.get(ast[0])
@@ -70,6 +71,7 @@ EVAL = { ast, env ->
 
     ast = macroexpand(ast, env)
     if (! types.list_Q(ast)) return eval_ast(ast, env)
+    if (ast.size() == 0) return ast
 
     switch (ast[0]) {
     case { it instanceof MalSymbol && it.value == "def!" }: