bus-scheme 0.7 → 0.7.1

data/Manifest.txt

@@ -13,4 +13,5 @@ lib/parser.rb
 test/foo.scm
 test/test_eval.rb
 test/test_helper.rb
+test/test_lambda.rb
 test/test_parser.rb

data/README.txt

@@ -33,15 +33,17 @@ $ bus # drop into a repl
 
 $ bus -e "(do some stuff)"
 
-$ bus foo.scm # load a file -- todo
+$ bus foo.scm # load a file
 
 == Todo
 
 Bus Scheme is currently missing pieces of functionality:
 
-* changes to closure variables don't affect original scope
+* move as many definitions into Scheme as possible
+* compile to Rubinius bytecode
 * optimize tail call recursion
 * continuations (?!?)
+* check for memory leaks
 * parse cons cells
 * parse character literals
 * parse quote, unquote

data/lib/array_extensions.rb

@@ -1,10 +1,4 @@
 class Array
-  def to_hash
-    {}.affect do |hash|
-      self.each { |pair| hash[pair.first] = pair.last }
-    end
-  end
-
   # Lisp-style list access
   def rest
     self[1 .. -1]
@@ -13,3 +7,11 @@ class Array
   alias_method :car, :first
   alias_method :cdr, :rest
 end
+
+module Enumerable # for 1.9, zip is defined on Enumerable
+  def to_hash
+    {}.affect do |hash|
+      self.each { |pair| hash[pair.first] = pair.last }
+    end
+  end
+end

data/lib/bus_scheme.rb

@@ -15,27 +15,26 @@ require 'definitions'
 require 'lambda'
 
 module BusScheme
-  VERSION = "0.7"
+  VERSION = "0.7.1"
 
   SYMBOL_TABLE = {}.merge(PRIMITIVES).merge(SPECIAL_FORMS)
-  LOCAL_SCOPES = []
   PROMPT = '> '
 
   # what scope is appropraite for this symbol
   def self.scope_of(symbol)
-    ([LOCAL_SCOPES.last] + Lambda.environment + [SYMBOL_TABLE]).compact.detect { |scope| scope.has_key?(symbol) }
+    [Lambda.scope, SYMBOL_TABLE].compact.detect { |scope| scope.has_key?(symbol) }
   end
   
   # symbol lookup
   def self.[](symbol)
     scope = scope_of(symbol)
-    raise EvalError.new("Undefined symbol: #{symbol}") if scope.nil?
-    scope[symbol]
+    raise EvalError.new("Undefined symbol: #{symbol}") unless scope
+    scope && scope[symbol]
   end
 
   # symbol assignment to value
   def self.[]=(symbol, value)
-    (scope_of(symbol) || SYMBOL_TABLE)[symbol] = value
+    (scope_of(symbol) || Lambda.scope || SYMBOL_TABLE)[symbol] = value
   end
 
   # symbol special form predicate
@@ -46,16 +45,16 @@ module BusScheme
   # Read-Eval-Print-Loop
   def self.repl
     loop do
-      begin
-        puts BusScheme.eval_string(Readline.readline(PROMPT))
-      rescue Interrupt
-        puts 'Type "(quit)" to leave Bus Scheme.'
-      rescue BusSchemeError => e
-        puts "Error: #{e}"
-      rescue StandardError => e
-        puts "You found a bug in Bus Scheme!"
-        puts "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
-      end
+      puts begin
+             BusScheme.eval_string(Readline.readline(PROMPT))
+           rescue Interrupt
+             'Type "(quit)" to leave Bus Scheme.'
+           rescue BusSchemeError => e
+             "Error: #{e}"
+           rescue StandardError => e
+             "You found a bug in Bus Scheme!\n" +
+               "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+           end
     end
   end
 end

data/lib/definitions.rb

@@ -15,11 +15,16 @@ module BusScheme
 
     :> => lambda { |x, y| x > y },
     :< => lambda { |x, y| x < y },
-
+    :'=' => lambda { |x, y| x == y }, # may not honor scheme's equality notions
+    :null? => lambda { |x| x.nil? },
+    
     :intern => lambda { |x| x.intern },
-    :concat => lambda { |x, y| x + y },
     :substring => lambda { |x, from, to| x[from .. to] },
 
+    :car => lambda { |list| list.car },
+    :cdr => lambda { |list| list.cdr },
+
+    :ruby => lambda { |code| eval(code) },
     :load => lambda { |filename| eval_string(File.read(filename)) },
     :exit => lambda { exit }, :quit => lambda { exit },
   }

data/lib/lambda.rb

@@ -1,32 +1,50 @@
 module BusScheme
+  class Scope < Hash
+    def initialize(table, parent)
+      @parent = parent
+      table.each { |k, v| self[k] = v }
+    end
+
+    alias_method :old_has_key?, :has_key?
+    def has_key?(symbol)
+      old_has_key?(symbol) or @parent && @parent.has_key?(symbol)
+    end
+
+    alias_method :lookup, :[]
+    def [](symbol)
+      lookup(symbol) or @parent && @parent[symbol]
+    end
+
+    alias_method :old_set, :[]=
+    def []=(symbol, value)
+      if !old_has_key?(symbol) and @parent and @parent.has_key?(symbol)
+        @parent[symbol] = value
+      else
+        old_set symbol, value
+      end
+    end
+  end
+
   class Lambda
-    @@current = nil
+    @@stack = []
+
+    attr_reader :scope
     
     # create new lambda object
     def initialize(arg_names, body)
-      @arg_names, @body, @environment = [arg_names, body, LOCAL_SCOPES]
+      @arg_names, @body, @enclosing_scope = [arg_names, body, Lambda.scope]
     end
-
-    attr_reader :environment
     
     # execute lambda with given arg_values
     def call(*arg_values)
       raise BusScheme::ArgumentError if @arg_names.length != arg_values.length
-      with_local_scope(@arg_names.zip(arg_values).to_hash) { BusScheme[:begin].call(*@body) }
+      @scope = Scope.new(@arg_names.zip(arg_values).to_hash, @enclosing_scope)
+      @@stack << self
+      BusScheme[:begin].call(*@body).affect { @@stack.pop }
     end
 
-    def self.environment
-      @@current ? @@current.environment : []
-    end
-    
-    # execute a block with a given local scope
-    def with_local_scope(scope, &block)
-      BusScheme::LOCAL_SCOPES << scope
-      @@current = self
-      block.call.affect do
-        BusScheme::LOCAL_SCOPES.delete(scope)
-        @@current = nil
-      end
+    def self.scope
+      @@stack.empty? ? nil : @@stack.last.scope
     end
   end
 end

data/test/test_compiler.rb

@@ -0,0 +1,19 @@
+$LOAD_PATH << File.dirname(__FILE__)
+require 'test_helper'
+
+# must be run in Rubinius
+# how to check?
+
+class BusSchemeCompilerTest < Test::Unit::TestCase
+#  def test_compiles_arithmetic
+#    assert_equivalent "(+ 1 2)", "1 + 2"
+#  end
+
+  private
+  def assert_equivalent(scheme, ruby)
+    scheme = BusScheme.parse(scheme) if scheme.is_a? String # for convenience
+    parsed_ruby = ruby.to_sexp.last
+    compiled_scheme = BusScheme::Compiler.compile(scheme)
+    assert_equal 
+  end
+end

data/test/test_eval.rb

@@ -10,6 +10,11 @@ class BusSchemeEvalTest < Test::Unit::TestCase
     assert_evals_to 2, 2
   end
 
+  def test_set_symbol
+    BusScheme[:hi] = 'hi'
+    assert BusScheme::SYMBOL_TABLE[:hi]
+  end
+  
   def test_eval_symbol
     eval "(define hi 13)"
     assert_evals_to 13, :hi
@@ -49,11 +54,11 @@ class BusSchemeEvalTest < Test::Unit::TestCase
 
   def test_string_primitives
     assert_evals_to :hi, [:intern, 'hi']
-    assert_evals_to 'helloworld', [:concat, 'hello', 'world']
     assert_evals_to 'lo', [:substring, 'hello', 3, -1]
   end
 
   def test_booleans
+    assert BusScheme::PRIMITIVES.has_key? '#f'.intern
     assert_evals_to false, '#f'
     assert_evals_to true, '#t'
   end
@@ -105,4 +110,8 @@ class BusSchemeEvalTest < Test::Unit::TestCase
     eval "(load \"#{File.dirname(__FILE__)}/foo.scm\")"
     assert_evals_to 3, :foo
   end
+
+  def test_eval_ruby
+    assert_evals_to "foofoofoo", "(ruby \"'foo' * 3\")"
+  end
 end

data/test/test_helper.rb

@@ -9,19 +9,22 @@ $LOAD_PATH << File.dirname(__FILE__) + '/../lib/'
 require 'test/unit'
 require 'bus_scheme'
 
-def eval(form) # convenience method that accepts string or form
-  if form.is_a?(String)
-    BusScheme.eval_string(form)
-  else
-    BusScheme.eval_form(form)
+class Test::Unit::TestCase
+  # convenience method that accepts string or form
+  def eval(form)
+    if form.is_a?(String)
+      BusScheme.eval_string(form)
+    else
+      BusScheme.eval_form(form)
+    end
   end
-end
 
-def assert_evals_to(expected, form)
-  assert_equal expected, eval(form)
-end
+  def assert_evals_to(expected, form)
+    assert_equal expected, eval(form)
+  end
 
-# remove symbols from all scopes
-def clear_symbols(*symbols)
-  (BusScheme::LOCAL_SCOPES << BusScheme::SYMBOL_TABLE).map{ |scope| symbols.map{ |sym| scope.delete sym } }
+  # remove symbols from all scopes
+  def clear_symbols(*symbols)
+    [BusScheme::Lambda.scope, BusScheme::SYMBOL_TABLE].compact.map{ |scope| symbols.map{ |sym| scope.delete sym } }
+  end
 end

data/test/test_lambda.rb

@@ -48,13 +48,15 @@ class BusSchemeLambdaTest < Test::Unit::TestCase
   def test_lambda_closures
     eval "(define foo (lambda (x) ((lambda (y) (+ x y)) (* x 2))))"
     assert_evals_to 3, [:foo, 1]
+    eval "(define holder ((lambda (x) (lambda () x)) 2))"
+    assert_evals_to 2, "(holder)"
   end
 
   def test_changes_to_enclosed_variables_are_in_effect_after_lambda_execution
     assert_evals_to 2, "((lambda (x) (begin ((lambda () (set! x 2))) x)) 1)"
   end
 
-  def test_implicit_begin
-    assert_evals_to 3, "((lambda () (intern \"hi\") (+ 2 2) (* 1 3)))"
-  end
+ def test_implicit_begin
+   assert_evals_to 3, "((lambda () (intern \"hi\") (+ 2 2) (* 1 3)))"
+ end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bus-scheme
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: 0.7.1
 platform: ruby
 authors: 
 - Phil Hagelberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-10 00:00:00 -08:00
+date: 2008-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - test/foo.scm
 - test/test_eval.rb
 - test/test_helper.rb
+- test/test_lambda.rb
 - test/test_parser.rb
 has_rdoc: true
 homepage: "    by Phil Hagelberg (c) 2007"
@@ -76,6 +77,7 @@ specification_version: 2
 summary: Bus Scheme is a Scheme in Ruby, imlemented on the bus.
 test_files: 
 - test/test_lambda.rb
+- test/test_compiler.rb
 - test/test_parser.rb
 - test/test_eval.rb
 - test/test_helper.rb