heist 0.3.2 → 0.3.3

data/lib/{runtime → heist/runtime}/runtime.rb

@@ -19,7 +19,7 @@ module Heist
   class Runtime
     
     %w[ data/expression     data/identifier   data/character
-        data/cons           data/vector
+        data/cons           data/vector       data/value
         callable/function   callable/syntax   callable/macro  callable/continuation
         frame               stack             stackless
         scope               binding
@@ -33,7 +33,7 @@ module Heist
     
     attr_accessor :stack, :top_level, :user_scope
     
-    BUILTIN_LIBRARIES = %w[primitives syntax library]
+    BUILTIN_LIBRARIES = %w[primitives syntax compiled_library]
     
     # A +Runtime+ is initialized using a set of options. The available
     # options include the following, all of which are +false+ unless

data/spec/heist_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe Heist do
+  let(:options) { {} }
+  
+  before do
+    @runtime = Heist::Runtime.new(options)
+    
+    @runtime.define 'assert' do |value|
+      value.should be_true
+    end
+    @runtime.define 'assert-equal' do |expected, actual|
+      actual.should == expected
+    end
+    @runtime.syntax 'assert-raise' do |scope, cells|
+      exception = Heist.const_get(cells.car.to_s)
+      lambda { scope.eval(cells.cdr.car) }.should raise_error(exception)
+    end
+  end
+  
+  dir = File.expand_path('../scheme_tests', __FILE__)
+  
+  shared_examples_for "Scheme interpreter" do
+    
+    tests = Dir.entries(dir).grep(/\.scm$/) -
+            %w[continuations.scm hygienic.scm unhygienic.scm]
+    
+    tests.each do |test|
+      it("runs #{test}") { @runtime.run File.join(dir, test) }
+    end
+  end
+  
+  shared_examples_for "interpreter with continuations" do
+    it "runs continuations.scm" do
+      @runtime.run File.join(dir, "continuations.scm")
+    end
+  end
+  
+  shared_examples_for "interpreter with hygienic macros" do
+    it "runs hygienic.scm" do
+      @runtime.run File.join(dir, "hygienic.scm")
+    end
+  end
+  
+  shared_examples_for "interpreter with unhygienic macros" do
+    it "runs unhygienic.scm" do
+      @runtime.run File.join(dir, "unhygienic.scm")
+    end
+  end
+  
+  describe "with default options" do
+    it_should_behave_like "Scheme interpreter"
+    it_should_behave_like "interpreter with hygienic macros"
+  end
+  
+  describe "with unhygienic macros" do
+    let(:options) { {:unhygienic => true} }
+    it_should_behave_like "Scheme interpreter"
+    it_should_behave_like "interpreter with unhygienic macros"
+    
+    describe "with continuations" do
+      let(:options) { {:unhygienic => true, :continuations => true} }
+      it_should_behave_like "Scheme interpreter"
+      it_should_behave_like "interpreter with unhygienic macros"
+      it_should_behave_like "interpreter with continuations"
+    end
+    
+    describe "with laziness" do
+      let(:options) { {:unhygienic => true, :lazy => true} }
+      it_should_behave_like "Scheme interpreter"
+      it_should_behave_like "interpreter with unhygienic macros"
+    end
+  end
+  
+  describe "with continuations" do
+    let(:options) { {:continuations => true} }
+    it_should_behave_like "Scheme interpreter"
+    it_should_behave_like "interpreter with hygienic macros"
+    it_should_behave_like "interpreter with continuations"
+  end
+  
+  describe "with laziness" do
+    let(:options) { {:lazy => true} }
+    it_should_behave_like "Scheme interpreter"
+    it_should_behave_like "interpreter with hygienic macros"
+  end
+end
+

data/{test → spec}/scheme_tests/continuations.scm

@@ -15,7 +15,7 @@
 ; calling a stored continuation aborts the current stack
 (define called #f)
 (begin
-  (r 5)
+  (r (+ 2 3))
   (set! called #t))
 (assert (not called))
 
@@ -36,6 +36,19 @@
 (r 3)
 (assert-equal 6 value)
 
+; continuations can be called using (apply)
+(apply r '(7))
+(assert-equal 10 value)
+
+; symbols can be passed back to a (set!) call
+(set! value (call/cc
+               (lambda (k)
+                 (set! r k)
+                 'foo)))
+(assert-equal 'foo value)
+(r 'bar)
+(assert-equal 'bar value)
+
 ; expressions after the call/cc are re-evaluated
 (set! y 2)
 (set! value (+ 1 (call/cc

data/{test → spec}/scheme_tests/functional.scm

@@ -2,3 +2,6 @@
 (assert-equal '(1 4 9 16) (map (lambda (x) (* x x)) '(1 2 3 4)))
 (assert-equal '(5 7 9) (map + '(1 2 3) '(4 5 6)))
 
+(assert-equal '(1 (2 (3 ()))) (fold-right list '() (list 1 2 3)))
+(assert-equal '(((() 1) 2) 3) (fold-left list '() (list 1 2 3)))
+

data/spec/scheme_tests/quoting.scm

@@ -0,0 +1,14 @@
+(assert-equal 7                             (+ 3 4))
+(assert-equal (list '+ 3 4)                 '(+ 3 4))
+(assert-equal 7                             (+ '3 4))
+(assert-equal (cons 1 8)                    '(1 . 8))
+(assert-equal (cons 1 8)                    `(1 . 8))
+(assert-equal (list '+ (list '- 7 9) 4)     '(+ (- 7 9) 4))
+(assert-equal (list 7 9 6)                  `(7 ,(+ 4 5) 6))
+(assert-equal (list 3 7 6 2 6 9)            `(3 7 6 ,@((lambda () '(2 6))) 9))
+(assert-equal (list 1 2 10)                 `(1 2 ,(+ 4 6)))
+(assert-equal (list 3 2 9 8)                `(,(/ 9 3) 2 ,@(list 9 8)))
+(assert-equal (list 1 2 4 9 8 5)            `(,@(list 1 2) 4 ,@(list 9 8) 5))
+(assert-equal (cons 9 (cons 8 (cons 5 7)))  `(,@(list 9 8) 5 . 7))
+(assert-equal (cons 9 (cons 8 24))          `(,@(list 9 8) . ,(* 4 6)))
+(assert-equal (list 'quote (list))          ''())

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+require 'bundler/setup'
+require File.expand_path('../../lib/heist', __FILE__)
+

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: heist
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors: 
 - James Coglan
@@ -9,162 +10,146 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 +00:00
-default_executable: 
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oyster
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: treetop
+        version: "0.9"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: treetop
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
-description: ""
-email: 
-- jcoglan@googlemail.com
+  version_requirements: *id003
+description: 
+email: jcoglan@gmail.com
 executables: 
 - heist
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+- README.rdoc
 files: 
 - History.txt
-- Manifest.txt
-- Rakefile
-- README.txt
+- README.rdoc
 - bin/heist
-- lib/bin_spec.rb
+- lib/heist/trie.rb
+- lib/heist/parser/scheme.tt
+- lib/heist/parser/scheme.rb
+- lib/heist/parser/ruby.rb
+- lib/heist/parser/nodes.rb
+- lib/heist/runtime/scope.rb
+- lib/heist/runtime/binding.rb
+- lib/heist/runtime/data/cons.rb
+- lib/heist/runtime/data/character.rb
+- lib/heist/runtime/data/value.rb
+- lib/heist/runtime/data/expression.rb
+- lib/heist/runtime/data/vector.rb
+- lib/heist/runtime/data/identifier.rb
+- lib/heist/runtime/stackless.rb
+- lib/heist/runtime/callable/syntax.rb
+- lib/heist/runtime/callable/continuation.rb
+- lib/heist/runtime/callable/macro/tree.rb
+- lib/heist/runtime/callable/macro/expansion.rb
+- lib/heist/runtime/callable/macro/matches.rb
+- lib/heist/runtime/callable/function.rb
+- lib/heist/runtime/callable/macro.rb
+- lib/heist/runtime/frame.rb
+- lib/heist/runtime/stack.rb
+- lib/heist/runtime/runtime.rb
+- lib/heist/stdlib/birdhouse.scm
+- lib/heist/stdlib/benchmark.scm
+- lib/heist/builtin/syntax.scm
+- lib/heist/builtin/primitives.rb
+- lib/heist/builtin/lib/character.scm
+- lib/heist/builtin/lib/list.scm
+- lib/heist/builtin/lib/string.scm
+- lib/heist/builtin/lib/util.scm
+- lib/heist/builtin/lib/logic.scm
+- lib/heist/builtin/lib/vector.scm
+- lib/heist/builtin/lib/numeric.scm
+- lib/heist/builtin/compiled_library.rb
+- lib/heist/repl.rb
 - lib/heist.rb
-- lib/repl.rb
-- lib/trie.rb
-- lib/builtin/library.scm
-- lib/builtin/library.rb
-- lib/builtin/primitives.rb
-- lib/builtin/syntax.scm
-- lib/parser/nodes.rb
-- lib/parser/ruby.rb
-- lib/parser/scheme.rb
-- lib/parser/scheme.tt
-- lib/runtime/callable/continuation.rb
-- lib/runtime/callable/function.rb
-- lib/runtime/callable/syntax.rb
-- lib/runtime/callable/macro.rb
-- lib/runtime/callable/macro/matches.rb
-- lib/runtime/callable/macro/tree.rb
-- lib/runtime/callable/macro/expansion.rb
-- lib/runtime/data/character.rb
-- lib/runtime/data/cons.rb
-- lib/runtime/data/expression.rb
-- lib/runtime/data/identifier.rb
-- lib/runtime/data/vector.rb
-- lib/runtime/binding.rb
-- lib/runtime/frame.rb
-- lib/runtime/runtime.rb
-- lib/runtime/scope.rb
-- lib/runtime/stack.rb
-- lib/runtime/stackless.rb
-- lib/stdlib/benchmark.scm
-- lib/stdlib/birdhouse.scm
-- test/helpers/lib.scm
-- test/helpers/macro-helpers.scm
-- test/helpers/vars.scm
-- test/scheme_tests/arithmetic.scm
-- test/scheme_tests/benchmarks.scm
-- test/scheme_tests/booleans.scm
-- test/scheme_tests/closures.scm
-- test/scheme_tests/conditionals.scm
-- test/scheme_tests/continuations.scm
-- test/scheme_tests/define_functions.scm
-- test/scheme_tests/define_values.scm
-- test/scheme_tests/delay.scm
-- test/scheme_tests/equivalence.scm
-- test/scheme_tests/file_loading.scm
-- test/scheme_tests/functional.scm
-- test/scheme_tests/hygienic.scm
-- test/scheme_tests/let.scm
-- test/scheme_tests/lists.scm
-- test/scheme_tests/macros.scm
-- test/scheme_tests/numbers.scm
-- test/scheme_tests/protection.scm
-- test/scheme_tests/strings.scm
-- test/scheme_tests/unhygienic.scm
-- test/scheme_tests/vectors.scm
-- test/plt-macros.txt
-- test/test_heist.rb
-has_rdoc: true
+- spec/scheme_tests/arithmetic.scm
+- spec/scheme_tests/conditionals.scm
+- spec/scheme_tests/quoting.scm
+- spec/scheme_tests/strings.scm
+- spec/scheme_tests/file_loading.scm
+- spec/scheme_tests/delay.scm
+- spec/scheme_tests/equivalence.scm
+- spec/scheme_tests/unhygienic.scm
+- spec/scheme_tests/macros.scm
+- spec/scheme_tests/booleans.scm
+- spec/scheme_tests/benchmarks.scm
+- spec/scheme_tests/closures.scm
+- spec/scheme_tests/lists.scm
+- spec/scheme_tests/hygienic.scm
+- spec/scheme_tests/define_functions.scm
+- spec/scheme_tests/functional.scm
+- spec/scheme_tests/define_values.scm
+- spec/scheme_tests/vectors.scm
+- spec/scheme_tests/numbers.scm
+- spec/scheme_tests/let.scm
+- spec/scheme_tests/protection.scm
+- spec/scheme_tests/continuations.scm
+- spec/heist_spec.rb
+- spec/plt-macros.txt
+- spec/spec_helper.rb
+- spec/helpers/macro-helpers.scm
+- spec/helpers/vars.scm
+- spec/helpers/lib.scm
 homepage: http://github.com/jcoglan/heist
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: heist
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: ""
-test_files: 
-- test/test_heist.rb
+summary: Scheme in as little Ruby as possible
+test_files: []
+