lisp 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3f57fa1db992fb2625e762541d96ba5e99f8090
-  data.tar.gz: ce30c466b692400a1da5ea079b5b0397cc260d28
+  metadata.gz: cd79b300ba14a7d6c45496292f33a72767c9f839
+  data.tar.gz: a7500b1c04cdc5262d899dee558b6a68648cb141
 SHA512:
-  metadata.gz: 5d8b15d758dbc2f8ec0988997d92a9896462d0dfa7cef8a935fbb8fcaa57976961ed5dd3e7fce7f31f142cd3ad6383fda42560accff6e43f8610cd1f890adfb9
-  data.tar.gz: 2af028559c5a13e1921928fedc01be94e30e6fbe19745e133e97cf42c3a1539e0e298895641957eb0f57f4f11bd289383729a4f9fb604f8366afd656b0a5454a
+  metadata.gz: 43b51dfb0eb3ace2920704f9bf54cf4690889a79bf38edca8e06cc703e453fddc3dd6055e45f8965e6a4d1410c8883ae9c2472624ed1e79d37e5157c9441f067
+  data.tar.gz: e67b94f6412a29046f759f1666d8fcefef4c5a4f07439f4ff2cfba076cfe04b63d4d14e5ee5ecb581fcd184e79a0684c2dc1a7c0cb963daff398a8d05ca9e3ea

data/README.md

@@ -47,6 +47,6 @@ Features
 
 - [ ] __quotation__	- (quote exp) Return the exp literally; do not evaluate it. _Example: (quote (a b c)) ⇒ (a b c)_
 
-- [ ] __assignment__ -	(set! var exp)	Evaluate exp and assign that value to var, which must have been previously defined (with a define or as a parameter to an enclosing procedure). _Example: (set! x2 (* x x))_
+- [x] __assignment__ -	(set! var exp)	Evaluate exp and assign that value to var, which must have been previously defined (with a define or as a parameter to an enclosing procedure). _Example: (set! x2 (* x x))_
 
-- [ ] __sequencing__ -	(begin exp...)	 Evaluate each of the expressions in left-to-right order, and return the final value. _Example: (begin (set! x 1) (set! x (+ x 1)) (* x 2)) ⇒ 4_
+- [x] __sequencing__ -	(begin exp...)	 Evaluate each of the expressions in left-to-right order, and return the final value. _Example: (begin (set! x 1) (set! x (+ x 1)) (* x 2)) ⇒ 4_

data/lib/lisp.rb

@@ -52,6 +52,12 @@ module Lisp
       _, test, conseq, alt = exp
       exp = execute(test, scope) ? conseq : alt
       execute(exp, scope)
+    when :set!
+      _, var, exp = exp
+      if scope.has_key?(var) then scope[var] = execute(exp, scope) else raise "#{var} is undefined" end
+    when :begin
+      _, *exp = exp
+      exp.map { |exp| execute(exp) }.last
     else
       func, *args = exp.map { |exp| execute(exp, scope) }
       func.call(*args)

data/lib/lisp/repl.rb

@@ -8,17 +8,13 @@ module Lisp
     catch(:exit) do
       loop do
         puts begin
-          eval input.readline
+          eval Coolline.new.readline
         rescue Exception => e
           e.message
         end
       end
     end
   end
-
-  def self.input
-    Coolline.new
-  end
 end
 
 if __FILE__ == $0

data/lib/lisp/version.rb

@@ -1,3 +1,3 @@
 module Lisp
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/test/test_lisp.rb

@@ -48,6 +48,14 @@ class TestLisp < MiniTest::Unit::TestCase
     assert_equal 1, Lisp.eval("(if(!= 1 2) 1 2)")
   end
 
+  def test_set!
+    assert_raises(RuntimeError) { Lisp.eval("(set! foo 0)") }
+  end
+
+  def test_begin
+    assert_equal 4, Lisp.eval("(begin (define x 1) (set! x (+ x 1)) (* x 2))")
+  end
+
   def test_lambda
     Lisp.eval("(define area (lambda (r) (* 3.141592653 (* r r))))")
     assert_equal 28.274333877, Lisp.eval("(area 3)")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lisp
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - James Moriarty