apricot 0.0.1 → 0.0.2

data/spec/spec_helper.rb

@@ -1,10 +1,46 @@
 require 'bundler/setup'
 require 'rspec'
 
-unless Rubinius.ruby19?
-  puts "Error: Apricot must be run in Ruby 1.9 mode"
-  exit 1
-end
+# require 'simplecov'
+
+# SimpleCov.configure do
+#   add_filter 'spec/'
+#   add_filter 'kernel/' # SimpleCov doesn't understand Apricot code
+
+#   add_group 'Compiler' do |src|
+#     ['code_loader.rb',
+#      'compiler.rb',
+#      'errors.rb',
+#      'generator.rb',
+#      'scopes.rb',
+#      'variables.rb',
+#      'reader.rb'].any? {|f| src.filename.end_with? "apricot/#{f}" }
+#   end
+#   add_group 'Special Forms', 'special_forms'
+#   add_group 'Runtime' do |src|
+#     ['boot.rb',
+#      'cons.rb',
+#      'identifier.rb',
+#      'list.rb',
+#      'macroexpand.rb',
+#      'misc.rb',
+#      'namespace.rb',
+#      'ruby_ext.rb',
+#      'seq.rb'].any? {|f| src.filename.end_with? "apricot/#{f}" }
+#   end
+# end
+# SimpleCov.start unless ENV['TRAVIS']
 
 require 'apricot'
 include Apricot
+
+# Common spec helper functions
+module CompilerSpec
+  def apr(code)
+    Apricot::Compiler.eval code
+  end
+
+  def bad_apr(code)
+    expect { apr(code) }.to raise_error(CompileError)
+  end
+end

data/spec/special_forms_spec.rb

@@ -0,0 +1,203 @@
+describe 'Apricot' do
+  include CompilerSpec
+
+  it 'compiles def forms' do
+    apr('(def A 1)')
+    A.should == 1
+
+    B = Module.new
+    apr('(def B::C 1)')
+    B::C.should == 1
+
+    apr('(def a 1)')
+    Apricot.current_namespace.get_var(:a).should == 1
+  end
+
+  it 'does not compile invalid def forms' do
+    bad_apr '(def)'
+    bad_apr '(def A 1 2)'
+    bad_apr '(def 1 2)'
+    bad_apr '(def self 1)'
+  end
+
+  it 'compiles do forms' do
+    apr('(do)').should == nil
+    apr('(do 1 2 3)').should == 3
+  end
+
+  it 'compiles send forms' do
+    apr('(. 1 class)').should == Fixnum
+    apr('(. 1 (class))').should == Fixnum
+    apr('(. "foo" append "bar")').should == 'foobar'
+    apr('(. "foo" (append "bar"))').should == 'foobar'
+  end
+
+  it 'compiles send forms with block args' do
+    apr('(. [1] map | :to_s)').should == ['1']
+    apr('(. [1] (map | :to_s))').should == ['1']
+    apr('(. [1] map | #(. % to_s))').should == ['1']
+  end
+
+  it 'compiles send forms with splat args' do
+    apr('(. "foo bar baz" split & [" " 2])').should == ['foo', 'bar baz']
+    apr('(. "foo bar baz" (split & [" " 2]))').should == ['foo', 'bar baz']
+  end
+
+  it 'compiles new send forms' do
+    apr('(. Array new 3 1)').should == [1, 1, 1]
+  end
+
+  it 'does not compile invalid send forms' do
+    bad_apr '(.)'
+    bad_apr '(. 1)'
+    bad_apr '(. 1 ())'
+    bad_apr '(. 1 1)'
+    bad_apr '(. [1] map |)'
+    bad_apr '(. "" split &)'
+  end
+
+  it 'compiles shorthand send forms' do
+    apr('(.class 1)').should == Fixnum
+    apr('(.append "foo" "bar")').should == 'foobar'
+  end
+
+  it 'compiles shorthand send forms with block args' do
+    apr('(.map [1] | :to_s)').should == ['1']
+    apr('(.map [1] | #(.to_s %))').should == ['1']
+  end
+
+  it 'compiles shorthand send forms with splat args' do
+    apr('(.split "foo bar baz" & [" " 2])').should == ['foo', 'bar baz']
+  end
+
+  it 'macroexpands shorthand send forms' do
+    form = apr "'(.meth recv arg1 arg2)"
+    ex = Apricot.macroexpand(form)
+    ex.should == List[*[:'.', :recv, :meth, :arg1, :arg2].map {|x| Identifier.intern(x) }]
+  end
+
+  it 'compiles shorthand new send forms' do
+    apr('(Array. 3 1)').should == [1, 1, 1]
+  end
+
+  it 'compiles shorthand new send forms with block args' do
+    apr('(Array. 3 | :to_s)').should == ['0', '1', '2']
+    apr('(Array. 3 | #(.to_s %))').should == ['0', '1', '2']
+  end
+
+  it 'macroexpands shorthand new send forms' do
+    form = apr "'(Klass. arg1 arg2)"
+    ex = Apricot.macroexpand(form)
+    ex.should == List[*[:'.', :Klass, :new, :arg1, :arg2].map {|x| Identifier.intern(x) }]
+  end
+
+  it 'compiles if forms' do
+    apr('(if true 1 2)').should == 1
+    apr('(if false 1 2)').should == 2
+    apr('(if true 1)').should == 1
+    apr('(if false 1)').should == nil
+  end
+
+  it 'does not compile invalid if forms' do
+    bad_apr '(if)'
+    bad_apr '(if true)'
+    bad_apr '(if true 1 2 3)'
+  end
+
+  it 'compiles let forms' do
+    apr('(let [])').should == nil
+    apr('(let [] 1 2 3)').should == 3
+    apr('(let [a 1] a)').should == 1
+    apr('(let [a 1 b a] b)').should == 1
+  end
+
+  it 'compiles nested let forms' do
+    apr('(let [a 1] (let [a 2] a))').should == 2
+    apr('(let [a 1] (let [b 2] a))').should == 1
+    apr('(let [a 1] (let [a 2]) a)').should == 1
+    apr('(let [a 1] (let [b a] b))').should == 1
+  end
+
+  it 'does not compile invalid let forms' do
+    bad_apr '(let)'
+    bad_apr '(let 1)'
+    bad_apr '(let [a 1 b])'
+    bad_apr '(let [1 2])'
+  end
+
+  it 'compiles loop forms' do
+    apr('(loop [])').should == nil
+    apr('(loop [a 1] a)').should == 1
+    apr('(loop [a true] (if a (recur false) 1))').should == 1
+  end
+
+  it 'does not compile invalid loop forms' do
+    bad_apr '(loop)'
+    bad_apr '(loop 1)'
+    bad_apr '(loop [a 1 b])'
+    bad_apr '(loop [1 2])'
+  end
+
+  it 'compiles quote forms' do
+    apr('(quote quote)').should == Identifier.intern(:quote)
+  end
+
+  it 'does not compile invalid quote forms' do
+    bad_apr '(quote)'
+    bad_apr '(quote 1 2)'
+  end
+
+  it 'does not compile invalid recur forms' do
+    bad_apr '(recur)'
+    bad_apr '(loop [] (recur 1))'
+    bad_apr '(fn [[x 1]] (recur))'
+    bad_apr '(fn [x & y] (recur 1))'
+    bad_apr '(fn [x & y] (recur 1 2 3))'
+  end
+
+  it 'compiles try forms' do
+    apr('(try)').should == nil
+    apr('(try 1 2 3)').should == 3
+    apr('(try 1 (rescue e 2))').should == 1
+    apr('(try (Kernel/raise "") 1 (rescue e 2))').should == 2
+    apr('(try (Kernel/raise "") 1 (rescue [e] 2))').should == 2
+    apr('(try (Kernel/raise ArgumentError) 1 (rescue [e TypeError] 2) (rescue [e ArgumentError] 3) (rescue e 4))').should == 3
+    apr('(try (Kernel/raise "") 1 (rescue e e))').should be_a(RuntimeError)
+    expect { apr '(try (Kernel/raise ""))' }.to raise_error(RuntimeError)
+    expect { apr '(try (Kernel/raise ArgumentError) 1 (rescue [e TypeError] 2))' }.to raise_error(ArgumentError)
+  end
+
+  it 'compiles try forms with ensure clauses' do
+    apr(<<-CODE).should == []
+      (let [a [1]]
+        (try
+          2
+          (ensure (. a pop)))
+        a)
+    CODE
+    apr(<<-CODE).should == []
+      (let [a [1]]
+        (try
+          (Kernel/raise "")
+          (rescue e 2)
+          (ensure (. a pop)))
+        a)
+    CODE
+    apr(<<-CODE).should == []
+      (let [a [1]]
+        (try
+          (try
+            (Kernel/raise "")
+            (ensure (. a pop)))
+          (rescue e 2))
+        a)
+    CODE
+  end
+
+  it 'does not compile invalid try forms' do
+    bad_apr '(try (ensure) 1)'
+    bad_apr '(try (rescue e e) 1)'
+    bad_apr '(try (rescue 1 2))'
+    bad_apr '(try (rescue [1] 2))'
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apricot
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Curtis McEnroe
@@ -10,179 +9,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
+  name: rubysl
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
-    none: false
+        version: '2.0'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
-    none: false
-  name: rake
-  type: :development
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  type: :development
+  name: rake
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
-    none: false
+        version: 10.1.0
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
-    none: false
-  name: rspec
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
   type: :development
+  name: rspec
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
 description: A compiler for a Clojure-like programming language on the Rubinius VM
 email:
 - programble@gmail.com
 - scott@scott-olson.org
 executables:
-- !binary |-
-  YXByaWNvdA==
+- apricot
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  LmdpdGlnbm9yZQ==
-- !binary |-
-  LnJzcGVj
-- !binary |-
-  LnJ1YnktdmVyc2lvbg==
-- !binary |-
-  LnRyYXZpcy55bWw=
-- !binary |-
-  R2VtZmlsZQ==
-- !binary |-
-  R2VtZmlsZS5sb2Nr
-- !binary |-
-  UkVBRE1FLm1k
-- !binary |-
-  UmFrZWZpbGU=
-- !binary |-
-  YXByaWNvdC5nZW1zcGVj
-- !binary |-
-  YmluL2Fwcmljb3Q=
-- !binary |-
-  ZXhhbXBsZXMvYm90LmFwcg==
-- !binary |-
-  ZXhhbXBsZXMvY2luY2gtYm90LmFwcg==
-- !binary |-
-  ZXhhbXBsZXMvaGFub2kuYXBy
-- !binary |-
-  ZXhhbXBsZXMvaGVsbG8uYXBy
-- !binary |-
-  ZXhhbXBsZXMvcGxvdC5hcHI=
-- !binary |-
-  ZXhhbXBsZXMvcXVpbmUuYXBy
-- !binary |-
-  a2VybmVsL2NvcmUuYXBy
-- !binary |-
-  bGliL2Fwcmljb3QucmI=
-- !binary |-
-  bGliL2Fwcmljb3QvYXN0LnJi
-- !binary |-
-  bGliL2Fwcmljb3QvYXN0L2lkZW50aWZpZXIucmI=
-- !binary |-
-  bGliL2Fwcmljb3QvYXN0L2xpc3QucmI=
-- !binary |-
-  bGliL2Fwcmljb3QvYXN0L2xpdGVyYWxzLnJi
-- !binary |-
-  bGliL2Fwcmljb3QvYXN0L25vZGUucmI=
-- !binary |-
-  bGliL2Fwcmljb3QvYXN0L3Njb3Blcy5yYg==
-- !binary |-
-  bGliL2Fwcmljb3QvYXN0L3RvcGxldmVsLnJi
-- !binary |-
-  bGliL2Fwcmljb3QvYXN0L3ZhcmlhYmxlcy5yYg==
-- !binary |-
-  bGliL2Fwcmljb3QvY29tcGlsZXIucmI=
-- !binary |-
-  bGliL2Fwcmljb3QvY29ucy5yYg==
-- !binary |-
-  bGliL2Fwcmljb3QvZXJyb3JzLnJi
-- !binary |-
-  bGliL2Fwcmljb3QvZ2VuZXJhdG9yLnJi
-- !binary |-
-  bGliL2Fwcmljb3QvaWRlbnRpZmllci5yYg==
-- !binary |-
-  bGliL2Fwcmljb3QvbGlzdC5yYg==
-- !binary |-
-  bGliL2Fwcmljb3QvbWFjcm9leHBhbmQucmI=
-- !binary |-
-  bGliL2Fwcmljb3QvbWlzYy5yYg==
-- !binary |-
-  bGliL2Fwcmljb3QvbmFtZXNwYWNlLnJi
-- !binary |-
-  bGliL2Fwcmljb3QvcGFyc2VyLnJi
-- !binary |-
-  bGliL2Fwcmljb3QvcHJpbnRlcnMucmI=
-- !binary |-
-  bGliL2Fwcmljb3QvcmVwbC5yYg==
-- !binary |-
-  bGliL2Fwcmljb3QvcnVieV9leHQucmI=
-- !binary |-
-  bGliL2Fwcmljb3Qvc2VxLnJi
-- !binary |-
-  bGliL2Fwcmljb3Qvc3BlY2lhbF9mb3Jtcy5yYg==
-- !binary |-
-  bGliL2Fwcmljb3Qvc3RhZ2VzLnJi
-- !binary |-
-  bGliL2Fwcmljb3QvdmVyc2lvbi5yYg==
-- !binary |-
-  c3BlYy9jb21waWxlcl9zcGVjLnJi
-- !binary |-
-  c3BlYy9pZGVudGlmaWVyX3NwZWMucmI=
-- !binary |-
-  c3BlYy9saXN0X3NwZWMucmI=
-- !binary |-
-  c3BlYy9wYXJzZXJfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
-homepage: https://github.com/programble/apricot
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
+- Gemfile
+- Gemfile.lock
+- README.md
+- Rakefile
+- apricot.gemspec
+- benchmarks/factorial.rb
+- benchmarks/interpolate.rb
+- bin/apricot
+- examples/bot.apr
+- examples/cinch-bot.apr
+- examples/hanoi.apr
+- examples/hello.apr
+- examples/plot.apr
+- examples/quine.apr
+- examples/sinatra.apr
+- kernel/core.apr
+- kernel/repl.apr
+- lib/apricot.rb
+- lib/apricot/boot.rb
+- lib/apricot/code_loader.rb
+- lib/apricot/compiler.rb
+- lib/apricot/cons.rb
+- lib/apricot/errors.rb
+- lib/apricot/generator.rb
+- lib/apricot/identifier.rb
+- lib/apricot/list.rb
+- lib/apricot/macroexpand.rb
+- lib/apricot/misc.rb
+- lib/apricot/namespace.rb
+- lib/apricot/reader.rb
+- lib/apricot/repl.rb
+- lib/apricot/ruby_ext.rb
+- lib/apricot/scopes.rb
+- lib/apricot/seq.rb
+- lib/apricot/special_forms.rb
+- lib/apricot/special_forms/def.rb
+- lib/apricot/special_forms/do.rb
+- lib/apricot/special_forms/dot.rb
+- lib/apricot/special_forms/fn.rb
+- lib/apricot/special_forms/if.rb
+- lib/apricot/special_forms/let.rb
+- lib/apricot/special_forms/loop.rb
+- lib/apricot/special_forms/quote.rb
+- lib/apricot/special_forms/recur.rb
+- lib/apricot/special_forms/try.rb
+- lib/apricot/variables.rb
+- lib/apricot/version.rb
+- spec/compiler_spec.rb
+- spec/fn_spec.rb
+- spec/identifier_spec.rb
+- spec/list_spec.rb
+- spec/reader_spec.rb
+- spec/spec_helper.rb
+- spec/special_forms_spec.rb
+homepage: https://github.com/apricot-lang/apricot
 licenses:
 - ISC
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Clojure-like programming language on Rubinius
 test_files:
-- !binary |-
-  c3BlYy9jb21waWxlcl9zcGVjLnJi
-- !binary |-
-  c3BlYy9pZGVudGlmaWVyX3NwZWMucmI=
-- !binary |-
-  c3BlYy9saXN0X3NwZWMucmI=
-- !binary |-
-  c3BlYy9wYXJzZXJfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
+- spec/compiler_spec.rb
+- spec/fn_spec.rb
+- spec/identifier_spec.rb
+- spec/list_spec.rb
+- spec/reader_spec.rb
+- spec/spec_helper.rb
+- spec/special_forms_spec.rb