0
@@ -77,6 +77,7 @@ module BusScheme
0
 
0
     # allows for (mylist 4) => (nth mylist 4)
0
     def call(nth)
0
+      nth = nth.car if nth.is_a? Cons # TODO: remove?
0
       nth == 0 ? @car : @cdr.call(nth - 1)
0
     end
0
     include Callable

0
@@ -49,7 +49,7 @@ module BusScheme
0
       @body = body
0
     end
0
 
0
-    def call(*args)
0
+    def call(args)
0
       BusScheme.stack.push StackFrame.new({}, BusScheme.current_scope, @called_as)
0
       begin
0
         val = @body.call(*args)

0
@@ -21,8 +21,9 @@ module Callable
0
     self.call(*args)
0
   end
0
 
0
-  def call(*args)
0
-    self.[](*args)
0
+  def call(arg)
0
+    arg = arg.car if arg.respond_to? :car # TODO: remove?
0
+    self[arg]
0
   end
0
 end
0
 

0
@@ -32,14 +32,20 @@ module BusScheme
0
   end
0
   
0
   # Nest a list from a 1-dimensional list of tokens
0
-  def parse_list(tokens)
0
+  def parse_list(tokens, level = 0)
0
+    # puts ' ' * level + tokens.inspect
0
     raise IncompleteError if tokens.empty?
0
-    return if (element = tokens.shift) == :')'
0
+    element = tokens.shift
0
 
0
     if element == :'('
0
-      cons(parse_list(tokens), parse_list(tokens))
0
+      car = parse_list(tokens, level + 2) || cons
0
+      cdr = parse_list(tokens, level + 2)
0
+      
0
+      cons(car, cdr)
0
+    elsif element == :')'
0
+      return
0
     else
0
-      cons(element, parse_list(tokens))
0
+      cons(element, parse_list(tokens, level + 2))
0
     end
0
   end
0
 
0
@@ -47,6 +53,8 @@ module BusScheme
0
   def parse_dots_into_cons(list)
0
     if(list && list.length > 2 && list.cdr.car == :'.')
0
       cons(:cons.sym, cons(list.car, cons(list.cdr.cdr.car)))
0
+    elsif list.car.nil?
0
+      cons(cons, list.cdr)
0
     else
0
       list
0
     end

0
@@ -2,17 +2,17 @@
0
          (send x 'is_a? (ruby type))))
0
 
0
 (define boolean? (lambda (x) (or (= x #t)
0
-				 (= x #f))))
0
+			    (= x #f))))
0
 (define symbol? (lambda (x) (isa? x "Sym")))
0
 (define cons? (lambda (x) (isa? x "Cons")))
0
 (define pair? cons?)
0
 
0
 (define string? (lambda (x) (and (isa? x "String")
0
-				 (not (isa? x "Sym")))))
0
+			    (not (isa? x "Sym")))))
0
 (define number? (lambda (x) (isa? x "Fixnum")))
0
 (define vector? (lambda (x) (isa? x "Array")))
0
 (define procedure? (lambda (x) (isa? x "Lambda")))
0
 (define char? (lambda (x) (and (isa? x "String")
0
-			       (= 1 (length x)))))
0
+			  (= 1 (length x)))))
0
 
0
 ;;; TODO: port?

0
@@ -4,11 +4,10 @@ require 'timeout'
0
 
0
 class BusSchemeEvalTest < Test::Unit::TestCase
0
   def test_eval_empty_list
0
-    # assert BusScheme.eval(cons)
0
-    
0
-    assert BusScheme.eval(cons('begin'.sym, cons))
0
-    # assert BusScheme.eval_string('()'), "Empty list should be true"
0
-    # assert_evals_to true, "(if () #t #f)"
0
+    assert BusScheme.eval(cons)
0
+#     assert BusScheme.eval(cons('begin'.sym, cons))
0
+#     assert BusScheme.eval_string('()'), "Empty list should be true"
0
+#     assert_evals_to true, "(if () #t #f)"
0
   end
0
 
0
   def test_eval_number
0
@@ -44,7 +43,7 @@ class BusSchemeEvalTest < Test::Unit::TestCase
0
   def test_variable_substitution
0
     eval! "(define foo 7)"
0
     assert_evals_to 7, :foo.sym
0
-    assert_evals_to 21, [:*.sym, 3, :foo.sym]
0
+    assert_evals_to 21, cons(:*.sym, cons(3, cons(:foo.sym)))
0
   end
0
 
0
   def test_single_quote
0
@@ -61,11 +60,6 @@ class BusSchemeEvalTest < Test::Unit::TestCase
0
     assert_evals_to [:+.sym, 2, 3].to_list, "'(+ 2 3)"
0
   end
0
 
0
-  def test_array_of_args_or_list_of_args
0
-    assert_evals_to 5, cons(:+.sym, cons(2, cons(3)))
0
-    assert_evals_to 5, cons(:+.sym, cons(2, cons(3)).to_a)
0
-  end
0
-
0
   def test_eval_multiple_forms
0
     assert_raises(EvalError) do
0
       eval! "(+ 2 2) (undefined-symbol)"
0
@@ -82,9 +76,9 @@ class BusSchemeEvalTest < Test::Unit::TestCase
0
     assert_evals_to 3, "((list 1 2 3) 2)"
0
   end
0
 
0
-  def test_funcall_vector_means_nth
0
-    assert_evals_to 3, "((vector 1 2 3) 2)"
0
-  end
0
+#   def test_funcall_vector_means_nth
0
+#     assert_evals_to 3, "((vector 1 2 3) 2)"
0
+#  end
0
 
0
   def test_funcall_hash_means_lookup
0
     assert_evals_to 3, "((hash (1 1) (2 2) (3 3)) 3)"

0
@@ -61,7 +61,7 @@ class Test::Unit::TestCase
0
   def trace
0
     BusScheme.trace = true
0
     yield
0
-  rescue
0
+  ensure
0
     BusScheme.trace = false
0
   end
0
 end

0
@@ -7,7 +7,7 @@ class BusSchemeLambdaTest < Test::Unit::TestCase
0
     assert l.is_a?(Lambda)
0
     assert_equal [[:+.sym, 1, 1].to_list], l.body
0
     assert_equal 0, l.formals.length
0
-
0
+    
0
     eval!("(define foo (lambda () (+ 1 1)))")
0
     assert BusScheme[:foo.sym].is_a?(Lambda)
0
     assert_evals_to 2, [:foo.sym]

0
@@ -17,7 +17,7 @@ class BusSchemeParserTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_parses_list
0
-    assert_parses_to "()", Cons.new(nil, nil)
0
+    assert_parses_to "()", cons
0
     assert_parses_to "(hey)", [:hey.sym]
0
     assert_parses_to "(hey there)", [:hey.sym, :there.sym]
0
   end
0
@@ -207,6 +207,19 @@ class BusSchemeParserTest < Test::Unit::TestCase
0
     tree = BusScheme.parse("(define foo 23)")
0
     assert_equal "(eval)", tree.cdr.car.file
0
   end
0
+
0
+  def test_parses_empty_list_correctly
0
+    parse "1"
0
+    # want: cons(:lambda.sym, cons(cons, cons(1)))
0
+    tokens = [:'(', :lambda.sym, :'(', :')', 1, :')']
0
+    assert_equal tokens, tokenize("(lambda () 1)")
0
+    
0
+    list = parse_tokens [:'(', :lambda.sym, :'(', :')', 1, :')']
0
+    assert_equal [:lambda.sym, [], 1].to_list(true), list
0
+
0
+#     list = parse_list(tokenize("(lambda () 1)"))
0
+#     assert_equal [:lambda.sym, [], 1].to_list(true), list
0
+  end
0
   
0
   private
0