lisp 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8415c51f19fcf2d2407b4e648726362aed1ff518
-  data.tar.gz: d7fa8e0de34061c8dcdb030a50b382fd77a9d627
+  metadata.gz: 38d7b0804909b38cc12ccd8c10ee47e5386d7e2d
+  data.tar.gz: f7aca5e50f7d1c9959e6e8994c63de59f86d3c11
 SHA512:
-  metadata.gz: 3c38eaf6967bc43c5ab122095664cd41ae9a2f36dde51207f4c926592c4ff7431a033942ad8cf0c695385f59e011f6f68571141ee77ed2e0774e967c4154e905
-  data.tar.gz: 14f4a2af0e2b7413301f6b86ee1d3ce0228f1806244ac98cccf5c6179bbbac28dd33e6a21a6e17cec7a2015dc6a8f255c8f8ec028599b328522f51c9ca360f2a
+  metadata.gz: 3746975bc6337ab8dac411fa08e04295031c3e29a869aee9b3dcc3928f76eb750964a049d991401ec16ebd97ecf6f8f099ded84f9845396bfdd25dcc84e609bd
+  data.tar.gz: 7004c064a67d1713ea8780ff153ff5864ae18281439f5c0f796507b7dda3357023583038d54795987b8b39123f2779434818c5f8618c3aa17029e9feb2145a35

data/.travis

@@ -0,0 +1,8 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.0.0
+before_install: gem install bundler -v 1.12.5
+addons:
+    code_climate:
+        repo_token: 0a4c13b71635c00cee43aba776853ade9404cc745c42977e25a5877a3e148527

data/.travis.yml

@@ -0,0 +1,10 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.0.0
+before_install: gem install bundler -v 1.12.5
+addons:
+  code_climate:
+    repo_token: 0a4c13b71635c00cee43aba776853ade9404cc745c42977e25a5877a3e148527
+after_success:
+  - bundle exec codeclimate-test-reporter

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 group :test do
   gem "simplecov"
-  gem "codeclimate-test-reporter", require: nil
+  gem "codeclimate-test-reporter", "~> 1.0.0"
 end
 
 gemspec

data/README.md

@@ -1,25 +1,21 @@
 lisp
 ====
 
-[![Code Climate](https://codeclimate.com/github/jamesmoriarty/lisp-rb/badges/gpa.svg)](https://codeclimate.com/github/jamesmoriarty/lisp-rb) [![Test Coverage](https://codeclimate.com/github/jamesmoriarty/lisp-rb/badges/coverage.svg)](https://codeclimate.com/github/jamesmoriarty/lisp-rb/coverage)
+[![Code Climate](https://codeclimate.com/github/jamesmoriarty/lisp-rb/badges/gpa.svg)](https://codeclimate.com/github/jamesmoriarty/lisp-rb) [![Test Coverage](https://codeclimate.com/github/jamesmoriarty/lisp-rb/badges/coverage.svg)](https://codeclimate.com/github/jamesmoriarty/lisp-rb/coverage) [![Build Status](https://travis-ci.org/jamesmoriarty/lisp.svg?branch=master)](https://travis-ci.org/jamesmoriarty/lisp)
 
 Lisp Interpreter in the Ruby Programming Language - 70 LOC. Inspired by [Lis.py](http://norvig.com/lispy.html).
 
 ```
-$ lisp-rb
+$ lisp-repl
 ctrl-c to exit
-> (define pi 3.14)
-3.14
-> (* pi 2)
-6.28
-> (define area (lambda (r) (* 3.141592653 (* r r))))
-#<Proc:0x007f8af9c59ff0@./lisp.rb:44>
-> (area 3)
-28.274333877
-> (define fact (lambda (n) (if (<= n 1) 1 (* n (fact (- n 1))))))
-#<Proc:0x007f9a4cc4acf0@./lisp.rb:63 (lambda)>
-> (fact 10)
-3628800.0
+> (begin                                                                        
+(>   (define incf                                                               
+((>     (lambda (x)                                                             
+(((>       (set! x (+ x 1))))                                                   
+(>   (define one 1)                                                             
+(>   (incf one))                                                                
+2
+>                                      
 ```
 
 Install

data/lib/lisp.rb

@@ -39,8 +39,8 @@ module Lisp
   end
 
   def self.execute expression, scope = global
-    return scope[expression] if     expression.is_a? Symbol
-    return expression        unless expression.is_a? Array
+    return scope.fetch(expression) { |var| raise "#{var} is undefined" } if expression.is_a? Symbol
+    return expression                                                    unless expression.is_a? Array
 
     case expression[0]
     when :define
@@ -58,7 +58,7 @@ module Lisp
       if scope.has_key?(var) then scope[var] = execute expression, scope else raise "#{var} is undefined" end
     when :begin
       _, *expression = expression
-      expression.map { |expression| execute expression }.last
+      expression.map { |expression| execute expression, scope }.last
     else
       function, *args = expression.map { |expression| execute expression, scope }
       function.call *args

data/lib/lisp/ext/proc.rb

@@ -0,0 +1,9 @@
+class Proc
+  def to_s
+    "(lambda (...) (...))"
+  end
+
+  def inspect
+    to_s
+  end
+end

data/lib/lisp/repl.rb

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
+
 require "coolline"
 require "coderay"
 
+require "lisp/ext/proc"
+
 module Lisp
   class REPL
     attr_reader :io, :input

data/lib/lisp/version.rb

@@ -1,3 +1,3 @@
 module Lisp
-  VERSION = "1.4.0"
+  VERSION = '1.4.2'.freeze
 end

data/lisp.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "coderay"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest", "> 5"
 end

data/test/test_lisp.rb

@@ -72,6 +72,15 @@ class TestLisp < MiniTest::Unit::TestCase
     eos
   end
 
+  def test_lambda_no_args
+    assert_equal 42, Lisp.eval(<<-eos)
+      (begin
+        (define test
+          (lambda () 42))
+        (test))
+    eos
+  end
+
   def test_lambda_call_self
     assert_equal 3628800, Lisp.eval(<<-eos)
       (begin
@@ -93,6 +102,21 @@ class TestLisp < MiniTest::Unit::TestCase
     eos
   end
 
+  def test_nested_begin
+    assert_raises(RuntimeError, "one is undefined") do
+      Lisp.eval(<<-eos)
+        (begin
+          (define test
+            (lambda ()
+              (begin
+                (define one 1)
+                (+ one 1))))
+          (test)
+          (+ 2 one))
+      eos
+    end
+  end
+
   def test_program
     assert_equal 2, Lisp.eval(<<-eos)
       (begin
@@ -112,7 +136,7 @@ class TestLisp < MiniTest::Unit::TestCase
       Process.kill("INT", pid)
       thread.join
     end
-    
+
     assert_output("ctrl-c to exit\n") do
       subject.run
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lisp
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - James Moriarty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coolline
@@ -66,25 +66,41 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '5'
 description: ''
 email:
 - jamespaulmoriarty@gmail.com
 executables:
-- lisp-rb
+- lisp-repl
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/lisp-rb
+- bin/lisp-repl
 - lib/lisp.rb
+- lib/lisp/ext/proc.rb
 - lib/lisp/repl.rb
 - lib/lisp/version.rb
 - lisp.gemspec
-- test/support/codeclimate.rb
 - test/support/simplecov.rb
 - test/test_lisp.rb
 homepage: ''
@@ -112,6 +128,5 @@ signing_key:
 specification_version: 4
 summary: Lisp Interpreter in Ruby.
 test_files:
-- test/support/codeclimate.rb
 - test/support/simplecov.rb
 - test/test_lisp.rb

data/test/support/codeclimate.rb

@@ -1,2 +0,0 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start