apricot 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0295d0651dd359754c9580022c471cd7ba23c4e6
+  data.tar.gz: fac2f3950287af5573cdd62b2aed0d583da8a31c
+SHA512:
+  metadata.gz: a3354fab2b0c27a994730be6aaf88220095b8d35638bbfc413a85b5e08c790b71f1c28927c1de4ec6708d11c6de8ec131f4d7b6644d1c3999ed9304a614b1969
+  data.tar.gz: 814994187ebb326df71597fc548d98b1dd7f409bbacc0e43d3435d342de4b5eea44770cca42625cb7392df843b9bfa4b09f0ebd8153b8c1bb43dff2bad4bf0c1

data/.gitignore

@@ -1,3 +1,4 @@
 *.rbc
 .rbx
 *.gem
+coverage

data/.ruby-version

@@ -1 +1 @@
-rbx-head
+rubinius

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
 notifications:
   webhooks:
     - http://rcmp.tenthbit.net/
+    - http://rcmp.tenthbit.net/irc.freenode.net/apricot

data/Gemfile.lock

@@ -2,25 +2,243 @@ PATH
   remote: .
   specs:
     apricot (0.0.1)
+      rubysl (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.1)
-    rake (10.0.3)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
+    diff-lcs (1.2.4)
+    ffi2-generators (0.1.1)
+    minitest (4.7.5)
+    psych (2.0.1)
+    racc (1.4.9)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.14.3)
+    rubysl (2.0.7)
+      minitest (~> 4.5)
+      psych (~> 2.0)
+      racc (~> 1.4)
+      rubysl-abbrev (~> 2.0)
+      rubysl-base64 (~> 2.0)
+      rubysl-benchmark (~> 2.0)
+      rubysl-bigdecimal (~> 2.0)
+      rubysl-cgi (~> 2.0)
+      rubysl-cgi-session (~> 2.0)
+      rubysl-cmath (~> 2.0)
+      rubysl-complex (~> 2.0)
+      rubysl-continuation (~> 2.0)
+      rubysl-coverage (~> 2.0)
+      rubysl-csv (~> 2.0)
+      rubysl-curses (~> 2.0)
+      rubysl-date (~> 2.0)
+      rubysl-delegate (~> 2.0)
+      rubysl-digest (~> 2.0)
+      rubysl-drb (~> 2.0)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-english (~> 2.0)
+      rubysl-enumerator (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-etc (~> 2.0)
+      rubysl-expect (~> 2.0)
+      rubysl-fcntl (~> 2.0)
+      rubysl-fiber (~> 2.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-find (~> 2.0)
+      rubysl-forwardable (~> 2.0)
+      rubysl-getoptlong (~> 2.0)
+      rubysl-gserver (~> 2.0)
+      rubysl-io-console (~> 2.0)
+      rubysl-io-nonblock (~> 2.0)
+      rubysl-io-wait (~> 2.0)
+      rubysl-ipaddr (~> 2.0)
+      rubysl-irb (~> 2.0)
+      rubysl-json (~> 2.0)
+      rubysl-logger (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-matrix (~> 2.0)
+      rubysl-mkmf (~> 2.0)
+      rubysl-monitor (~> 2.0)
+      rubysl-mutex_m (~> 2.0)
+      rubysl-net-ftp (~> 2.0)
+      rubysl-net-http (~> 2.0)
+      rubysl-net-imap (~> 2.0)
+      rubysl-net-pop (~> 2.0)
+      rubysl-net-protocol (~> 2.0)
+      rubysl-net-smtp (~> 2.0)
+      rubysl-net-telnet (~> 2.0)
+      rubysl-nkf (~> 2.0)
+      rubysl-observer (~> 2.0)
+      rubysl-open-uri (~> 2.0)
+      rubysl-open3 (~> 2.0)
+      rubysl-openssl (~> 2.0)
+      rubysl-optparse (~> 2.0)
+      rubysl-ostruct (~> 2.0)
+      rubysl-pathname (~> 2.0)
+      rubysl-prettyprint (~> 2.0)
+      rubysl-prime (~> 2.0)
+      rubysl-profile (~> 2.0)
+      rubysl-profiler (~> 2.0)
+      rubysl-pstore (~> 2.0)
+      rubysl-pty (~> 2.0)
+      rubysl-rational (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-resolv (~> 2.0)
+      rubysl-rexml (~> 2.0)
+      rubysl-rinda (~> 2.0)
+      rubysl-ripper (~> 2.0)
+      rubysl-rss (~> 2.0)
+      rubysl-scanf (~> 2.0)
+      rubysl-securerandom (~> 2.0)
+      rubysl-set (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+      rubysl-singleton (~> 2.0)
+      rubysl-socket (~> 2.0)
+      rubysl-stringio (~> 2.0)
+      rubysl-strscan (~> 2.0)
+      rubysl-syslog (~> 2.0)
+      rubysl-tempfile (~> 2.0)
+      rubysl-test-unit (~> 2.0)
+      rubysl-thread (~> 2.0)
+      rubysl-thwait (~> 2.0)
+      rubysl-time (~> 2.0)
+      rubysl-timeout (~> 2.0)
+      rubysl-tmpdir (~> 2.0)
+      rubysl-tracer (~> 2.0)
+      rubysl-tsort (~> 2.0)
+      rubysl-un (~> 2.0)
+      rubysl-uri (~> 2.0)
+      rubysl-weakref (~> 2.0)
+      rubysl-webrick (~> 2.0)
+      rubysl-xmlrpc (~> 2.0)
+      rubysl-yaml (~> 2.0)
+      rubysl-zlib (~> 2.0)
+    rubysl-abbrev (2.0.2)
+    rubysl-base64 (2.0.0)
+    rubysl-benchmark (2.0.0)
+    rubysl-bigdecimal (2.0.2)
+    rubysl-cgi (2.0.0)
+    rubysl-cgi-session (2.0.0)
+    rubysl-cmath (2.0.0)
+    rubysl-complex (2.0.0)
+    rubysl-continuation (2.0.0)
+    rubysl-coverage (2.0.3)
+    rubysl-csv (2.0.1)
+      rubysl-english (~> 2.0)
+    rubysl-curses (2.0.0)
+    rubysl-date (2.0.5)
+    rubysl-delegate (2.0.0)
+    rubysl-digest (2.0.2)
+    rubysl-drb (2.0.1)
+    rubysl-e2mmap (2.0.0)
+    rubysl-english (2.0.0)
+    rubysl-enumerator (2.0.0)
+    rubysl-erb (2.0.0)
+    rubysl-etc (2.0.3)
+      ffi2-generators (~> 0.1)
+    rubysl-expect (2.0.0)
+    rubysl-fcntl (2.0.4)
+      ffi2-generators (~> 0.1)
+    rubysl-fiber (2.0.0)
+    rubysl-fileutils (2.0.2)
+    rubysl-find (2.0.0)
+    rubysl-forwardable (2.0.0)
+    rubysl-getoptlong (2.0.0)
+    rubysl-gserver (2.0.0)
+      rubysl-socket (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-io-console (2.0.0)
+    rubysl-io-nonblock (2.0.0)
+    rubysl-io-wait (2.0.0)
+    rubysl-ipaddr (2.0.0)
+    rubysl-irb (2.0.3)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-thread (~> 2.0)
+      rubysl-tracer (~> 2.0)
+    rubysl-json (2.0.2)
+    rubysl-logger (2.0.0)
+    rubysl-mathn (2.0.0)
+    rubysl-matrix (2.1.0)
+      rubysl-e2mmap (~> 2.0)
+    rubysl-mkmf (2.0.1)
+      rubysl-fileutils (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+    rubysl-monitor (2.0.0)
+    rubysl-mutex_m (2.0.0)
+    rubysl-net-ftp (2.0.1)
+    rubysl-net-http (2.0.4)
+      rubysl-cgi (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-singleton (~> 2.0)
+    rubysl-net-imap (2.0.1)
+    rubysl-net-pop (2.0.1)
+    rubysl-net-protocol (2.0.1)
+    rubysl-net-smtp (2.0.1)
+    rubysl-net-telnet (2.0.0)
+    rubysl-nkf (2.0.0)
+    rubysl-observer (2.0.0)
+    rubysl-open-uri (2.0.0)
+    rubysl-open3 (2.0.0)
+    rubysl-openssl (2.0.0)
+    rubysl-optparse (2.0.1)
+      rubysl-shellwords (~> 2.0)
+    rubysl-ostruct (2.0.4)
+    rubysl-pathname (2.0.0)
+    rubysl-prettyprint (2.0.1)
+    rubysl-prime (2.0.0)
+    rubysl-profile (2.0.0)
+    rubysl-profiler (2.0.1)
+    rubysl-pstore (2.0.0)
+    rubysl-pty (2.0.1)
+    rubysl-rational (2.0.1)
+    rubysl-readline (2.0.2)
+    rubysl-resolv (2.0.0)
+    rubysl-rexml (2.0.1)
+    rubysl-rinda (2.0.0)
+    rubysl-ripper (2.0.0)
+    rubysl-rss (2.0.0)
+    rubysl-scanf (2.0.0)
+    rubysl-securerandom (2.0.0)
+    rubysl-set (2.0.1)
+    rubysl-shellwords (2.0.0)
+    rubysl-singleton (2.0.0)
+    rubysl-socket (2.0.0)
+    rubysl-stringio (2.0.0)
+    rubysl-strscan (2.0.0)
+    rubysl-syslog (2.0.1)
+      ffi2-generators (~> 0.1)
+    rubysl-tempfile (2.0.0)
+    rubysl-test-unit (2.0.1)
+      minitest (~> 4.7)
+    rubysl-thread (2.0.2)
+    rubysl-thwait (2.0.0)
+    rubysl-time (2.0.2)
+    rubysl-timeout (2.0.0)
+    rubysl-tmpdir (2.0.0)
+    rubysl-tracer (2.0.0)
+    rubysl-tsort (2.0.1)
+    rubysl-un (2.0.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-optparse (~> 2.0)
+    rubysl-uri (2.0.0)
+    rubysl-weakref (2.0.0)
+    rubysl-webrick (2.0.0)
+    rubysl-xmlrpc (2.0.0)
+    rubysl-yaml (2.0.0)
+    rubysl-zlib (2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   apricot!
-  rake (~> 10.0.3)
-  rspec (~> 2.13.0)
+  rake (~> 10.1.0)
+  rspec (~> 2.14.0)

data/README.md

@@ -1,37 +1,34 @@
-# Apricot [![Build Status](https://secure.travis-ci.org/programble/apricot.png?branch=master)](http://travis-ci.org/programble/apricot) [![Dependency Status](https://gemnasium.com/programble/apricot.png?travis)](https://gemnasium.com/programble/apricot)
+# Apricot [![Gem Version](https://badge.fury.io/rb/apricot.png)](http://badge.fury.io/rb/apricot) [![Build Status](https://secure.travis-ci.org/apricot-lang/apricot.png?branch=master)](http://travis-ci.org/apricot-lang/apricot) [![Dependency Status](https://gemnasium.com/apricot-lang/apricot.png?travis)](https://gemnasium.com/apricot-lang/apricot)
 
-A Clojure-like Lisp on Rubinius.
+A Clojure-like Lisp on [Rubinius](http://rubini.us/).
 
 Try to contain your excitement, please.
 
 
-## Setup
-To get Apricot up and running, make sure you have Rubinius and Bundler
-installed.  The easiest way to get Rubinius is with [RVM](https://rvm.io/).
-Whenever you are using Apricot you need to be running Rubinius in Ruby 1.9
-mode. We make this easy in the Apricot repository with the `.ruby-version`
-file which RVM automatically reads to figure out which Ruby to switch to.
+## Install
+
+First of all, you're going to need Rubinius. I recommend installing the latest
+Rubinius with Ruby 1.9-mode default from [RVM](https://rvm.io/).
 
 ``` sh
 $ rvm install rbx-head --1.9
-$ rvm use rbx-head
-$ gem install bundler
-$ bundle
+$ rvm use rbx
+$ gem install apricot
 ```
 
+To use Apricot you must be running Rubinius in Ruby 1.9 mode.
+
+
 ## The REPL
-Apricot provides a nice read-eval-print-loop with line editing, history,
-tab-completion, and some interesting commands like `!bytecode`. To enter the
-REPL just run:
 
-``` sh
-$ bin/apricot
-```
+Apricot provides an awesome read-eval-print-loop with line editing, history,
+tab-completion, and some interesting commands like `!bytecode`. To enter the
+REPL just run `apricot`.
 
-Once in the repl you can ask for help by using `!help` and you can exit with
-`!exit`. See the documentation of any function with `(doc <name>)`. Play
-around, read `kernel/core.apr` and try out our functions, and make some of
-your own. Experiment. Tell us what you think!
+Once in the repl you can get help with `!help` or use `(doc <name>)` to see
+the documentation of any function or macro. Play around, read
+`kernel/core.apr` and try out our functions, and make some of your own.
+Experiment. Tell us what you think!
 
 ``` clojure
 apr> (+ 1 2 3)
@@ -54,28 +51,48 @@ comp
 => nil
 ```
 
+
 ## Hello World
+
 So you want to put your program in a file and not type it into the REPL? Sure:
 
 ``` sh
 $ cat hello.apr
-(puts "Hello, world!")
-$ bin/apricot hello.apr
+(println "Hello, world!")
+$ apricot hello.apr
 Hello, world!
 ```
 
+
+## Development
+
+If you want to hack on Apricot, first install Rubinius as explained above.
+When you `cd` to the Apricot git repo, RVM should automatically switch to
+Rubinius thanks to the `.ruby-version` file. Now install and run Bundler:
+
+``` sh
+$ gem install bundler
+$ bundle
+```
+
+You're all set. Run the tests with `rake` and run the bleeding edge REPL with
+`ruby -Ilib bin/apricot`. Similarily, use `irb -Ilib -rapricot` for an IRB
+session with Apricot loaded.
+
+
 ## Contact / Bug Reports
-Come visit us on [freenode](http://freenode.net/) in the #apricot channel, or
-drop one of us an email. Please send your bug reports to the GitHub
-[issue tracker](https://github.com/programble/apricot/issues). They will be
-greatly appreciated!
+
+If you have any questions don't hesitate to email us or visit us in `#apricot`
+on [freenode](http://freenode.net/) (we are `curtism` and `tsion`). And we'd
+really appreciate it if you opened bug reports on the GitHub [issue
+tracker](https://github.com/programble/apricot/issues)!
 
 
 ## License
 
-Copyright (c) 2012-2013, Curtis McEnroe <programble@gmail.com>
+Copyright (c) 2012-2013, Curtis McEnroe \<programble@gmail.com>
 
-Copyright (c) 2012-2013, Scott Olson <scott@scott-olson.org>
+Copyright (c) 2012-2013, Scott Olson \<scott@scott-olson.org>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler/setup'
-require 'rspec/core'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/apricot.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = Apricot::VERSION
   s.authors     = ["Curtis McEnroe", "Scott Olson"]
   s.email       = ["programble@gmail.com", "scott@scott-olson.org"]
-  s.homepage    = "https://github.com/programble/apricot"
+  s.homepage    = "https://github.com/apricot-lang/apricot"
   s.license     = "ISC"
   s.summary     = "A Clojure-like programming language on Rubinius"
   s.description = "A compiler for a Clojure-like programming language on the Rubinius VM"
@@ -16,7 +16,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rake", "~> 10.0.3"
-  s.add_development_dependency "rspec", "~> 2.13.0"
+  s.add_dependency "rubysl", "~> 2.0"
+
+  s.add_development_dependency "rake", "~> 10.1.0"
+  s.add_development_dependency "rspec", "~> 2.14.0"
+  #s.add_development_dependency "simplecov", "~> 0.7.0"
+  #s.add_development_dependency "rubinius-coverage", "~> 2.0"
 end
 

data/benchmarks/factorial.rb

@@ -0,0 +1,51 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'apricot'
+
+begin
+  require 'benchmark/ips'
+rescue LoadError
+  $stderr.puts "The benchmark-ips gem is not installed."
+  exit 1
+end
+
+ruby_loop = lambda do |n|
+  cnt = n
+  acc = 1
+
+  while cnt > 0
+    acc *= cnt
+    cnt -= 1
+  end
+
+  acc
+end
+
+apricot_loop = Apricot::Compiler.eval <<CODE
+  (fn [n]
+    (loop [n n acc 1]
+      (if (pos? n)
+        (recur (dec n) (* n acc))
+        acc)))
+CODE
+
+ruby_reduce = lambda do |n|
+  (1..n).reduce(1, :*)
+end
+
+apricot_reduce_1 = Apricot::Compiler.eval <<CODE
+  (fn [n] (.reduce (Range. 1 n) 1 :*))
+CODE
+
+apricot_reduce_2 = Apricot::Compiler.eval <<CODE
+  (fn [n] (reduce * (Range. 1 n)))
+CODE
+
+n = 100
+
+Benchmark.ips do |x|
+  x.report("ruby loop")        { ruby_loop.call(n) }
+  x.report("apricot loop")     { apricot_loop.call(n) }
+  x.report("ruby reduce")      { ruby_reduce.call(n) }
+  x.report("apricot reduce 1") { apricot_reduce_1.call(n) }
+  x.report("apricot reduce 2") { apricot_reduce_2.call(n) }
+end