vimscript: Use map and lambda in EvalAst

vimscript/env.vim

@@ -15,7 +15,6 @@ function NewEnvWithBinds(outer, binds, exprs)
   while i < ListCount(a:binds)
     let varname = ListNth(a:binds, i).val
     if varname == "&"
-      " TODO
       let restvarname = ListNth(a:binds, i + 1).val
       let restvarvalues = ListDrop(a:exprs, i)
       call env.set(restvarname, restvarvalues)

vimscript/step2_eval.vim

@@ -15,17 +15,9 @@ function EvalAst(ast, env)
     end
     return a:env[varname]
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)

vimscript/step3_env.vim

@@ -13,17 +13,9 @@ function EvalAst(ast, env)
     let varname = a:ast.val
     return a:env.get(varname)
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)

vimscript/step4_if_fn_do.vim

@@ -14,17 +14,9 @@ function EvalAst(ast, env)
     let varname = a:ast.val
     return a:env.get(varname)
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)

vimscript/step5_tco.vim

@@ -14,17 +14,9 @@ function EvalAst(ast, env)
     let varname = a:ast.val
     return a:env.get(varname)
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)

vimscript/step6_file.vim

@@ -14,17 +14,9 @@ function EvalAst(ast, env)
     let varname = a:ast.val
     return a:env.get(varname)
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)

vimscript/step7_quote.vim

@@ -32,17 +32,9 @@ function EvalAst(ast, env)
     let varname = a:ast.val
     return a:env.get(varname)
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)

vimscript/step8_macros.vim

@@ -57,17 +57,9 @@ function EvalAst(ast, env)
     let varname = a:ast.val
     return a:env.get(varname)
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)

vimscript/step9_try.vim

@@ -59,17 +59,9 @@ function EvalAst(ast, env)
     let varname = a:ast.val
     return a:env.get(varname)
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)

vimscript/stepA_mal.vim

@@ -59,17 +59,9 @@ function EvalAst(ast, env)
     let varname = a:ast.val
     return a:env.get(varname)
   elseif ListQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return ListNew(ret)
+    return ListNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif VectorQ(a:ast)
-    let ret = []
-    for e in a:ast.val
-      call add(ret, EVAL(e, a:env))
-    endfor
-    return VectorNew(ret)
+    return VectorNew(map(copy(a:ast.val), {_, e -> EVAL(e, a:env)}))
   elseif HashQ(a:ast)
     let ret = {}
     for [k,v] in items(a:ast.val)