lisp 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae19eed30562514f832218c6558c6900f24b73e6
-  data.tar.gz: d5be24c84e5e618069d70d4df6dcd58eb51c6fb3
+  metadata.gz: f7f4f9a7fe02524ebd2dc9df1d606df0285550ad
+  data.tar.gz: 6d2cc99951c8c70482840e55735c4f5c7510d4b4
 SHA512:
-  metadata.gz: b1b706d317e74122ce7bd634e69b785326d49beb289e899363ecd2d484ebf9b01ae6a710d5776ad6e5f526a60b5468dfaf836c5ae58f1d9f85ce714fc92c2546
-  data.tar.gz: 6957c2517635ed2a5842cf44bd0fd4fafb4c8225560bba10b4e11ed6840c0160f5aee4bf5782b21130ea8bb685391d63fc703e25735100a35bc0fd6386ad875c
+  metadata.gz: c015b086967313e762108778826e94e1d4c4d798904486ad9a4be28759120bb82466c9edd0bf1acdca9bbbcfa5d2a1eaea0abb18a7d962180575823243b319e3
+  data.tar.gz: cfc010cb803a93068a14c1b5418c1cce5b36833df0d05011bd5b2cd8fcb58f8cbfeee6b55bb549e2201a5c9ddc0d8b538de0b3fde97d7ee92e2db56676bec3c7

data/lib/lisp.rb

@@ -1,24 +1,8 @@
-#!/usr/bin/env ruby
-
 require "bundler/setup"
 require "lisp/version"
-require "lisp/scope"
+require "lisp/repl"
 
 module Lisp
-  def self.repl
-    puts "ctrl-c to exit"
-    catch(:exit) do
-      loop do
-        print "> "
-        puts begin
-          eval gets
-        rescue Exception => e
-          e.message
-        end
-      end
-    end
-  end
-
   def self.eval(string)
     execute(parse(tokenize(string)))
   end
@@ -54,41 +38,32 @@ module Lisp
   end
 
   def self.execute(exp, scope = global)
-    case exp
-    when Array
-      case exp[0]
-      when :define
-        _, var, exp = exp
-        scope[var] = execute(exp, scope)
-      when :lambda
-        _, params, exp = exp
-        lambda { |*args| execute(exp, Scope.new(params, args, scope)) }
-      when :if
-        _, test, conseq, alt = exp
-        exp = execute(test, scope) ? conseq : alt
-        execute(exp, scope)
-      else
-        func, *args = exp.map { |exp| execute(exp, scope) }
-        func.call(*args)
-      end
-    when Symbol
-      scope[exp]
+    return scope[exp] if     exp.is_a? Symbol
+    return exp        unless exp.is_a? Array
+
+    case exp[0]
+    when :define
+      _, var, exp = exp
+      scope[var] = execute(exp, scope)
+    when :lambda
+      _, params, exp = exp
+      lambda { |*args| execute(exp, scope.merge(Hash[params.zip(args)])) }
+    when :if
+      _, test, conseq, alt = exp
+      exp = execute(test, scope) ? conseq : alt
+      execute(exp, scope)
     else
-      exp
+      func, *args = exp.map { |exp| execute(exp, scope) }
+      func.call(*args)
     end
   end
 
   def self.global
     @scope ||= begin
-      methods = [:==, :"!=", :"<", :"<=", :">", :">=", :+, :-, :*, :/]
-      methods.inject(Scope.new) do |scope, method|
-        scope.merge(method => lambda { |*args| args.inject(&method) })
+      operators = [:==, :"!=", :"<", :"<=", :">", :">=", :+, :-, :*, :/]
+      operators.inject({}) do |scope, operator|
+        scope.merge(operator => lambda { |*args| args.inject(&operator) })
       end
     end
   end
 end
-
-if __FILE__ == $0
-   trap("SIGINT") { throw :exit }
-   Lisp.repl
-end

data/lib/lisp/repl.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+require "coolline"
+
+module Lisp
+  def self.repl
+    trap("SIGINT") { throw :exit }
+    puts "ctrl-c to exit"
+    catch(:exit) do
+      loop do
+        puts begin
+          eval input.readline
+        rescue Exception => e
+          e.message
+        end
+      end
+    end
+  end
+
+  def self.input
+    Coolline.new
+  end
+end
+
+if __FILE__ == $0
+   Lisp.repl
+end

data/lib/lisp/version.rb

@@ -1,3 +1,3 @@
 module Lisp
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lisp.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "coolline"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"

data/test/test_lisp.rb

@@ -54,12 +54,4 @@ class TestLisp < MiniTest::Unit::TestCase
     Lisp.eval("(define fact (lambda (n) (if (<= n 1) 1 (* n (fact (- n 1))))))")
     assert_equal 3628800, Lisp.eval("(fact 10)")
   end
-
-  def test_repl
-    assert_output "ctrl-c to exit\n> " do
-      thread = Thread.new { Lisp.repl }
-      sleep 1.0/10.0
-      thread.terminate
-    end
-  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lisp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - James Moriarty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-20 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
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +79,7 @@ files:
 - README.md
 - Rakefile
 - lib/lisp.rb
-- lib/lisp/scope.rb
+- lib/lisp/repl.rb
 - lib/lisp/version.rb
 - lisp.gemspec
 - test/test_lisp.rb

data/lib/lisp/scope.rb

@@ -1,14 +0,0 @@
-module Lisp
-  class Scope < Hash
-    attr_accessor :outer
-
-    def initialize(params = [], args = [], outer = nil)
-      update(Hash[params.zip(args)])
-      self.outer = outer
-    end
-
-    def [](name)
-      super or outer[name]
-    end
-  end
-end