lisp 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728f826f5c7ad7f2b90d6861cdd6d0792c9af21f
-  data.tar.gz: 21b608d9ee103ad308ab4a2b346f459609684120
+  metadata.gz: 8415c51f19fcf2d2407b4e648726362aed1ff518
+  data.tar.gz: d7fa8e0de34061c8dcdb030a50b382fd77a9d627
 SHA512:
-  metadata.gz: 451e92aa8b46ea6b0ad3b6d7bab7b0118052f2ec43fdc3c9779ce93817e6a178e6cf99c11e92732e193b952d8f65375eac2338f0360bac181ad892270d14d999
-  data.tar.gz: d297679c014dfa9f0c52be2e8e73baf9c9175e4b3a1038440da0cb20d2597139a526a68d90845d0ab6efdec0f2ef55ae567af36c0219a45ec333d02c31554b3e
+  metadata.gz: 3c38eaf6967bc43c5ab122095664cd41ae9a2f36dde51207f4c926592c4ff7431a033942ad8cf0c695385f59e011f6f68571141ee77ed2e0774e967c4154e905
+  data.tar.gz: 14f4a2af0e2b7413301f6b86ee1d3ce0228f1806244ac98cccf5c6179bbbac28dd33e6a21a6e17cec7a2015dc6a8f255c8f8ec028599b328522f51c9ca360f2a

data/.gitignore

@@ -1,3 +1,4 @@
 Gemfile.lock
 env
 pkg
+coverage

data/Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
-group :development do
+group :test do
+  gem "simplecov"
   gem "codeclimate-test-reporter", require: nil
 end
 

data/README.md

@@ -1,9 +1,9 @@
-lisp-rb
-=======
+lisp
+====
 
-[![Code Climate](https://codeclimate.com/github/jamesmoriarty/lisp-rb.png)](https://codeclimate.com/github/jamesmoriarty/lisp-rb) [![Code Climate](https://codeclimate.com/github/jamesmoriarty/lisp-rb/coverage.png)](https://codeclimate.com/github/jamesmoriarty/lisp-rb)
+[![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)
 
-Lisp Interpreter in Ruby. Inspired by [Lis.py](http://norvig.com/lispy.html).
+Lisp Interpreter in the Ruby Programming Language - 70 LOC. Inspired by [Lis.py](http://norvig.com/lispy.html).
 
 ```
 $ lisp-rb

data/bin/lisp-rb

@@ -2,4 +2,4 @@
 
 require_relative "../lib/lisp"
 
-Lisp.repl
+Lisp::REPL.new.run

data/lib/lisp.rb

@@ -4,64 +4,64 @@ require "lisp/version"
 require "lisp/repl"
 
 module Lisp
-  def self.eval(string)
-    execute(parse(tokenize(string)))
+  def self.eval string
+    execute parse tokenize string
   end
 
-  def self.tokenize(string)
+  def self.tokenize string
     string.gsub("("," ( ").gsub(")"," ) ").split
   end
 
-  def self.parse(tokens, tree = [])
+  def self.parse tokens, tree = []
     raise "unexpected: eof" if tokens.size.zero?
 
     case token = tokens.shift
     when "("
       while tokens[0] != ")" do
-        tree.push parse(tokens)
+        tree.push parse tokens
       end
       tokens.shift
       tree
     when ")"
       raise "unexpected: )"
     else
-      evaluator(token)
+      atom token
     end
   end
 
-  def self.evaluator(token)
+  def self.atom token
     case token
     when /\d/
-      token.to_f
+      token.to_f % 1 > 0 ? token.to_f : token.to_i
     else
       token.to_sym
     end
   end
 
-  def self.execute(exp, scope = global)
-    return scope[exp] if     exp.is_a? Symbol
-    return exp        unless exp.is_a? Array
+  def self.execute expression, scope = global
+    return scope[expression] if     expression.is_a? Symbol
+    return expression        unless expression.is_a? Array
 
-    case exp[0]
+    case expression[0]
     when :define
-      _, var, exp = exp
-      scope[var] = execute(exp, scope)
+      _, var, expression = expression
+      scope[var]         = execute expression, scope
     when :lambda
-      _, params, exp = exp
-      lambda { |*args| execute(exp, scope.merge(Hash[params.zip(args)])) }
+      _, params, expression = expression
+      lambda { |*args| execute expression, scope.merge(Hash[params.zip(args)]) }
     when :if
-      _, test, conseq, alt = exp
-      exp = execute(test, scope) ? conseq : alt
-      execute(exp, scope)
+      _, test, consequent, alternative = expression
+      expression                       = if execute test, scope then consequent else alternative end
+      execute expression, scope
     when :set!
-      _, var, exp = exp
-      if scope.has_key?(var) then scope[var] = execute(exp, scope) else raise "#{var} is undefined" end
+      _, var, expression                     = expression
+      if scope.has_key?(var) then scope[var] = execute expression, scope else raise "#{var} is undefined" end
     when :begin
-      _, *exp = exp
-      exp.map { |exp| execute(exp) }.last
+      _, *expression = expression
+      expression.map { |expression| execute expression }.last
     else
-      func, *args = exp.map { |exp| execute(exp, scope) }
-      func.call(*args)
+      function, *args = expression.map { |expression| execute expression, scope }
+      function.call *args
     end
   end
 
@@ -69,7 +69,7 @@ module Lisp
     @scope ||= begin
       operators = [:==, :"!=", :"<", :"<=", :">", :">=", :+, :-, :*, :/]
       operators.inject({}) do |scope, operator|
-        scope.merge(operator => lambda { |*args| args.inject(&operator) })
+        scope.merge operator => lambda { |*args| args.inject &operator }
       end
     end
   end

data/lib/lisp/repl.rb

@@ -1,22 +1,67 @@
 #!/usr/bin/env ruby
 require "coolline"
+require "coderay"
 
 module Lisp
-  def self.repl
-    trap("SIGINT") { throw :exit }
-    puts "ctrl-c to exit"
-    catch(:exit) do
-      loop do
-        puts begin
-          eval Coolline.new.readline
-        rescue Exception => e
-          e.message
+  class REPL
+    attr_reader :io, :input
+
+    def initialize
+      @io = Coolline.new do |config|
+        config.transform_proc = proc do
+          CodeRay.scan(config.line, :clojure).term
         end
       end
+
+      reset_input!
+    end
+
+    def run
+      trap("SIGINT") { throw :exit }
+
+      puts "ctrl-c to exit"
+
+      catch(:exit) do
+        loop do
+          begin
+            @input += io.readline prompt
+
+            if open_count == close_count
+              puts Lisp.eval input
+
+              reset_input!
+            end
+          rescue Exception => e
+            puts e.message
+
+            reset_input!
+          end
+        end
+      end
+    end
+
+    private
+
+    def prompt
+      count = open_count - close_count
+      char  = count > 0 ? ?( : ?)
+      "#{char * count}> "
+    end
+
+    def reset_input!
+      @input = String.new
     end
-  end
-end
 
-if __FILE__ == $0
-   Lisp.repl
+    def open_count
+      tokens.count(?()
+    end
+
+    def close_count
+      tokens.count(?))
+    end
+
+    def tokens
+      Lisp.tokenize input
+    end
+  end
 end

data/lib/lisp/version.rb

@@ -1,3 +1,3 @@
 module Lisp
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lisp.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "coolline"
+  spec.add_dependency "coderay"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry"
 end

data/test/support/codeclimate.rb

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

data/test/support/simplecov.rb

@@ -0,0 +1,5 @@
+require 'simplecov'
+
+SimpleCov.add_filter 'vendor'
+SimpleCov.add_filter 'test'
+SimpleCov.start

data/test/test_lisp.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 require "bundler/setup"
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-require "minitest/autorun"
-require "pry"
 
-require_relative "../lib/lisp"
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support', '*.rb'))].each { |file| require file }
+
+require "lisp"
+require "minitest/autorun"
 
 class TestLisp < MiniTest::Unit::TestCase
 
@@ -39,8 +38,11 @@ class TestLisp < MiniTest::Unit::TestCase
   end
 
   def test_define
-    Lisp.eval("(define pi 3.141592653)")
-    assert_equal 6.283185306, Lisp.eval("(* pi 2)")
+    assert_equal 6.283185306, Lisp.eval(<<-eos)
+      (begin
+        (define pi 3.141592653)
+        (* pi 2))
+    eos
   end
 
   def test_if
@@ -53,13 +55,66 @@ class TestLisp < MiniTest::Unit::TestCase
   end
 
   def test_begin
-    assert_equal 4, Lisp.eval("(begin (define x 1) (set! x (+ x 1)) (* x 2))")
+    assert_equal 4, Lisp.eval(<<-eos)
+      (begin
+        (define x 1)
+        (set! x (+ x 1)) (* x 2))
+    eos
   end
 
   def test_lambda
-    Lisp.eval("(define area (lambda (r) (* 3.141592653 (* r r))))")
-    assert_equal 28.274333877, Lisp.eval("(area 3)")
-    Lisp.eval("(define fact (lambda (n) (if (<= n 1) 1 (* n (fact (- n 1))))))")
-    assert_equal 3628800, Lisp.eval("(fact 10)")
+    assert_equal 28.274333877, Lisp.eval(<<-eos)
+      (begin
+        (define area
+          (lambda (r)
+            (* 3.141592653 (* r r))))
+        (area 3))
+    eos
+  end
+
+  def test_lambda_call_self
+    assert_equal 3628800, Lisp.eval(<<-eos)
+      (begin
+        (define fact
+          (lambda (n)
+            (if (<= n 1)
+              1
+              (* n (fact (- n 1))))))
+        (fact 10))
+    eos
+  end
+
+  def test_lambda_call_arg
+    assert_equal 40, Lisp.eval(<<-eos)
+      (begin
+        (define twice (lambda (x) (* 2 x)))
+        (define repeat (lambda (f) (lambda (x) (f (f x)))))
+        ((repeat twice) 10)))
+    eos
+  end
+
+  def test_program
+    assert_equal 2, Lisp.eval(<<-eos)
+      (begin
+        (define incf
+          (lambda (x)
+            (set! x (+ x 1))))
+        (define one 1)
+        (incf one))
+    eos
+  end
+
+  def test_repl
+    pid     = Process.pid
+    subject = Lisp::REPL.new
+    thread  = Thread.new do
+      sleep 1
+      Process.kill("INT", pid)
+      thread.join
+    end
+    
+    assert_output("ctrl-c to exit\n") do
+      subject.run
+    end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: lisp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - James Moriarty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coolline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -74,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -84,6 +84,8 @@ files:
 - lib/lisp/repl.rb
 - lib/lisp/version.rb
 - lisp.gemspec
+- test/support/codeclimate.rb
+- test/support/simplecov.rb
 - test/test_lisp.rb
 homepage: ''
 licenses:
@@ -95,19 +97,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Lisp Interpreter in Ruby.
 test_files:
+- test/support/codeclimate.rb
+- test/support/simplecov.rb
 - test/test_lisp.rb