Merge branch 'Haxe'

[jackhill/mal.git] / crystal / env.cr

diff --git a/crystal/env.cr b/crystal/env.cr
index 93eb21b..9f38d68 100644 (file)
--- a/crystal/env.cr
+++ b/crystal/env.cr
@@ -15,26 +15,32 @@ module Mal
 
       eval_error "binds must be list or vector" unless binds.is_a? Array
 
-      varargs = false
-
       # Note:
       # Array#zip() can't be used because overload resolution failed
       (0...binds.size).each do |idx|
-        sym, expr = binds[idx].unwrap, exprs[idx]
-        eval_error "bind list must be symbol" unless sym.is_a? Mal::Symbol
+        sym = binds[idx].unwrap
+        eval_error "bind name must be symbol" unless sym.is_a? Mal::Symbol
 
         if sym.str == "&"
-          varargs = true
-          next
-        end
-
-        if varargs
-          @data[sym.str] = Mal::Type.new exprs[idx-1..-1].each_with_object(Mal::List.new){|i, l| l << i}
+          eval_error "missing variable parameter name" if binds.size == idx
+          next_param = binds[idx+1].unwrap
+          eval_error "bind name must be symbol" unless next_param.is_a? Mal::Symbol
+          var_args = Mal::List.new
+          exprs[idx..-1].each{|e| var_args << e} if idx < exprs.size
+          @data[next_param.str] = Mal::Type.new var_args
           break
         end
 
-        @data[sym.str] = expr
+        @data[sym.str] = exprs[idx]
+      end
+    end
+
+    def dump
+      puts "ENV BEGIN".colorize.red
+      @data.each do |k, v|
+        puts "  #{k} -> #{print(v)}".colorize.red
       end
+      puts "ENV END".colorize.red
     end
 
     def set(key, value)
@@ -53,8 +59,8 @@ module Mal
     end
 
     def get(key)
-      e = find(key)
-      eval_error "#{key} not found" unless e
+      e = find key
+      eval_error "'#{key}' not found" unless e
       e.data[key]
     end
   end