dslisprb 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,17 @@
+0.0.5   Fix list processing functions when recieve nil arguments
+
+        Optional arguments for functions
+
+        Implemented reverse function
+
+        Implemented inspect function
+
+        Implemented let
+
+        Fixed parse of nested quotes
+
+        Fixed reference of variables for recursive calls
+
 0.0.4   Implemented apply and funcall 
 
         Fix of variable assignments on lambda calla

data/Rakefile

@@ -7,7 +7,7 @@ require "rspec/core/rake_task"
 
 spec = Gem::Specification.new do |s|
   s.name = 'dslisprb'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.author = 'Dario Seminara'
   s.email = 'robertodarioseminara@gmail.com'
   s.platform = Gem::Platform::RUBY

data/lib/dslisprb.rb

@@ -31,8 +31,7 @@ class DsLisp
           elsif code == :T
             "true"
           elsif Symbol === code
-#            "(local_variables.include?(#{name_convert(code)}) ? #{name_convert(code)} : nil)"
-            name_convert(code).to_s 
+            "eval(\"#{name_convert(code).to_s}\")" 
           else
             code.inspect
           end  
@@ -64,15 +63,27 @@ class DsLisp
          "
       end
 
+      def let(code)
+        newcode = [[:lambda, code[1].map(&:first), code[2]]] + code[1].map{|x|x[1]}
+        ToRuby.to_ruby(newcode)
+      end
+
       def lambda(code)
-        arguments = code[1].map(&ToRuby.method(:name_convert)).map(&:to_s)
+        arguments = code[1].select{|x| x != :"&optional"}.map{|x| Array === x ? x[0] : x}.map(&ToRuby.method(:name_convert)).map(&:to_s)
+        x_optional = code[1].select{|x| x != :"&optional"}.map{|x|
+            if Array === x
+              ToRuby.to_ruby(x[1])
+            else
+              "nil"
+            end
+        }
 
         @count = (@count || 0) + 1
         oldargsvar = "oldargs_#{@count}"
 
         "(lambda{|*x|
             #{oldargsvar} = [ #{arguments.map{|z| "begin; #{z}; rescue; nil; end"}.join(",")} ] # save current bindings
-            #{(0..arguments.size-1).map{|i| "#{arguments[i]} = x[#{i}]" }.join(";")} 
+            #{(0..arguments.size-1).map{|i| "#{arguments[i]} = x[#{i}] || #{x_optional[i]}" }.join(";")} 
             begin
               aux = #{ToRuby.to_ruby(code[2])}
             ensure
@@ -134,7 +145,7 @@ class DsLisp
     end
 
     if matchdata = /^\s*\'(.*)\s*$/.match(str)
-      [:quote, parse(matchdata[1].sub("'",""))]
+      [:quote, parse(matchdata[1])]
     elsif matchdata = /^\s*\((.*)\)\s*$/.match(str)
       inside_code = matchdata[1]
       if inside_code =~ /^\s*$/
@@ -157,6 +168,8 @@ class DsLisp
     else
       if str =~ /^\s*\d+\s*$/
         str.to_i
+      elsif str =~ /^\s*nil\s*$/
+        nil
       else
         str.strip.to_sym
       end
@@ -202,8 +215,8 @@ private
 
         
       # list selectors
-      _car = lambda{|x| x.first}
-      _cdr = lambda{|x| x[1..-1]}
+      _car = lambda{|x| x ? x.first : nil}
+      _cdr = lambda{|x| x ? x[1..-1] : nil}
       _nth = lambda{|index,list| list[index-1]}
 
       # list constructors
@@ -252,7 +265,11 @@ private
 
       _mapcar = lambda{|function, list| list.map(&as_function.call(function))}
       _apply = lambda{|function, arguments| as_function.call(function).call(*arguments) }    
-      _funcall = lambda{|function, *arguments| as_function.call(function).call(*arguments) }    
+      _funcall = lambda{|function, *arguments| as_function.call(function).call(*arguments) }
+
+      _reverse = :reverse.to_proc
+
+      _p = lambda{|a| p a}  
     end
     @binding
   end

data/lib/dslisprb.rb~

@@ -31,8 +31,7 @@ class DsLisp
           elsif code == :T
             "true"
           elsif Symbol === code
-#            "(local_variables.include?(#{name_convert(code)}) ? #{name_convert(code)} : nil)"
-            name_convert(code).to_s 
+            "eval(\"#{name_convert(code).to_s}\")" 
           else
             code.inspect
           end  
@@ -64,15 +63,27 @@ class DsLisp
          "
       end
 
+      def let(code)
+        newcode = [[:lambda, code[1].map(&:first), code[2]]] + code[1].map{|x|x[1]}
+        ToRuby.to_ruby(newcode)
+      end
+
       def lambda(code)
-        arguments = code[1].map(&ToRuby.method(:name_convert)).map(&:to_s)
+        arguments = code[1].select{|x| x != :"&optional"}.map{|x| Array === x ? x[0] : x}.map(&ToRuby.method(:name_convert)).map(&:to_s)
+        x_optional = code[1].select{|x| x != :"&optional"}.map{|x|
+            if Array === x
+              ToRuby.to_ruby(x[1])
+            else
+              "nil"
+            end
+        }
 
         @count = (@count || 0) + 1
         oldargsvar = "oldargs_#{@count}"
 
         "(lambda{|*x|
             #{oldargsvar} = [ #{arguments.map{|z| "begin; #{z}; rescue; nil; end"}.join(",")} ] # save current bindings
-            #{(0..arguments.size-1).map{|i| "#{arguments[i]} = x[#{i}]" }.join(";")} 
+            #{(0..arguments.size-1).map{|i| "#{arguments[i]} = x[#{i}] || #{x_optional[i]}" }.join(";")} 
             begin
               aux = #{ToRuby.to_ruby(code[2])}
             ensure
@@ -134,7 +145,7 @@ class DsLisp
     end
 
     if matchdata = /^\s*\'(.*)\s*$/.match(str)
-      [:quote, parse(matchdata[1].sub("'",""))]
+      [:quote, parse(matchdata[1])]
     elsif matchdata = /^\s*\((.*)\)\s*$/.match(str)
       inside_code = matchdata[1]
       if inside_code =~ /^\s*$/
@@ -157,6 +168,8 @@ class DsLisp
     else
       if str =~ /^\s*\d+\s*$/
         str.to_i
+      elsif str =~ /^\s*nil\s*$/
+        nil
       else
         str.strip.to_sym
       end
@@ -202,8 +215,8 @@ private
 
         
       # list selectors
-      _car = lambda{|x| x.first}
-      _cdr = lambda{|x| x[1..-1]}
+      _car = lambda{|x| x? x.first : nil}
+      _cdr = lambda{|x| x? x[1..-1] : nil}
       _nth = lambda{|index,list| list[index-1]}
 
       # list constructors
@@ -237,9 +250,8 @@ private
       as_function = lambda{|object|
         if Symbol === object
           eval(ToRuby.name_convert(object),@binding)
-        elsif not object.respond_to?(:call)
-      _funcall = lambda{|function, *arguments| as_function.call(function).call(*arguments) }    
-          lambda{|*x| object}
+        elsif Array === object
+          evaluate(object)
         else
           object
         end
@@ -253,7 +265,11 @@ private
 
       _mapcar = lambda{|function, list| list.map(&as_function.call(function))}
       _apply = lambda{|function, arguments| as_function.call(function).call(*arguments) }    
-      _funcall = lambda{|function, *arguments| as_function.call(function).call(*arguments) }    
+      _funcall = lambda{|function, *arguments| as_function.call(function).call(*arguments) }
+
+      _reverse = :reverse.to_proc
+
+      _p = lambda{|a| p a}  
     end
     @binding
   end

data/spec/ast.rb

@@ -53,11 +53,15 @@ describe DsLisp, "ds lisp"  do
   end
 
   it "should parse nil" do
-    DsLisp.new.parse("nil").should be == :nil
+    DsLisp.new.parse("nil").should be == nil
   end
 
   it "should parse quoted empty list" do
     DsLisp.new.parse("'()").should be == [:quote, []]
   end
+
+  it "should parse nested quotes" do
+    DsLisp.new.parse("'(car '(1 2 3))").should be == [:quote, [:car, [:quote, [1, 2, 3]]]]
+  end
 end
 

data/spec/ast.rb~

@@ -53,11 +53,19 @@ describe DsLisp, "ds lisp"  do
   end
 
   it "should parse nil" do
-    DsLisp.new.parse("nil").should be == :nil
+    DsLisp.new.parse("nil").should be == nil
   end
 
   it "should parse quoted empty list" do
-    DsLisp.new.parse("'[]").should be == [:quote, []]
+    DsLisp.new.parse("'()").should be == [:quote, []]
+  end
+
+  it "should parse nested quotes" do
+    DsLisp.new.parse("'(car '(1 2 3))").should be == [:quote, [:car, [:quote, [1, 2, 3]]]]
+  end
+
+  it "should ignore comments" do
+    DsLisp.new.parse("1").should be == 1
   end
 end
 

data/spec/defun.rb

@@ -22,6 +22,44 @@ describe DsLisp, "ds lisp defun"  do
             [:lambda_test, 1]
             ]).should be == 2
   end
+
+  it "should allow recursive funcall" do
+    dslisp = DsLisp.new
+    dslisp.evaluate([:block,
+            [:defun, :a, [:x], [:if, [:>, :x, 0], [:a, [:-, :x, 1] ] ,nil]] 
+            ])
+
+    dslisp.evaluate([:a, 3])
+  end
+
+  it "should allow recursive funcall between two functions" do
+    dslisp = DsLisp.new
+    dslisp.evaluate([:block,
+            [:defun, :a, [:x], [:if, [:>, :x, 0], [:b, [:-, :x, 1] ] ,nil]],
+            [:defun, :b, [:x], [:if, [:>, :x, 0], [:a, [:-, :x, 1] ] ,nil]] 
+            ])
+
+    dslisp.evaluate([:a, 3])
+  end
+
+  it "nil on list should be evaluated nil" do
+    dslisp = DsLisp.new
+    dslisp.evaluate("(if (car (cdr '(1 nil 3))) 2 3)").should be == dslisp.evaluate("(if nil 2 3)")
+  end
+
+  it "should accept optional arguments" do
+    dslisp = DsLisp.new
+    dslisp.evaluate("(defun foo (x &optional (y 4)) x)")
+    dslisp.evaluate("(foo 5)").should be == 5
+    dslisp.evaluate("(foo 6)").should be == 6
+  end  
+
+  it "should read optional arguments value" do
+    dslisp = DsLisp.new
+    dslisp.evaluate("(defun foo (x &optional (y 4)) y)")
+    dslisp.evaluate("(foo 5)").should be == 4
+    dslisp.evaluate("(foo 6)").should be == 4
+  end  
 end
 
 

data/spec/defun.rb~

@@ -22,6 +22,44 @@ describe DsLisp, "ds lisp defun"  do
             [:lambda_test, 1]
             ]).should be == 2
   end
+
+  it "should allow recursive funcall" do
+    dslisp = DsLisp.new
+    dslisp.evaluate([:block,
+            [:defun, :a, [:x], [:if, [:>, :x, 0], [:a, [:-, :x, 1] ] ,nil]] 
+            ])
+
+    dslisp.evaluate([:a, 3])
+  end
+
+  it "should allow recursive funcall between two functions" do
+    dslisp = DsLisp.new
+    dslisp.evaluate([:block,
+            [:defun, :a, [:x], [:if, [:>, :x, 0], [:b, [:-, :x, 1] ] ,nil]],
+            [:defun, :b, [:x], [:if, [:>, :x, 0], [:a, [:-, :x, 1] ] ,nil]] 
+            ])
+
+    dslisp.evaluate([:a, 3])
+  end
+
+  it "nil on list should be evaluated nil" do
+    dslisp = DsLisp.new
+    dslisp.evaluate("(if (car (cdr '(1 nil 3))) 2 3)").should be == dslisp.evaluate("(if nil 2 3)")
+  end
+
+  it "should accept optional arguments" do
+    dslisp = DsLisp.new
+    dslisp.evaluate("(defun foo (x &optional (y 4)) x)")
+    dslisp.evaluate("(foo 5)").should be == 5
+    dslisp.evaluate("(foo 6)").should be == 6
+  end  
+
+  it "should read optional arguments value" do
+    dslisp = DsLisp.new
+    dslisp.evaluate("(defun foo (x &optional (y 4)) x)")
+    dslisp.evaluate("(foo 5)").should be == 5
+    dslisp.evaluate("(foo 6)").should be == 6
+  end  
 end
 
 

data/spec/flowcontrol.rb~

@@ -19,15 +19,10 @@ describe DsLisp, "ds lisp flow control"  do
 
   it "should execute second statement of cond if the first fail" do
     DsLisp.new.evaluate([:cond, [:nil, [:+, 120, 3]], [:T, [:+, 120, 5]]]).should be == 125
-  end 
+  end
 
-  it "should execute third statement of if when first statement return false" do
-    DsLisp.new.evaluate([:if, :nil, [:+, 110, 1], [:+, 220, 2]]).should be == 222
+  it "should execute second statement of cond if the first fail" do
+    DsLisp.new.evaluate([:cond, [:nil, [:+, 120, 3]], [:T, [:+, 120, 5]]]).should be == 125
   end 
-
-  it "should return nil when first statement return false and there is no second statement" do
-    DsLisp.new.evaluate([:if, :nil, [:+, 110, 1]]).should be == nil
-  end
- 
 end
 

data/spec/functions.rb

@@ -32,6 +32,10 @@ describe DsLisp, "ds lisp functions"  do
     DsLisp.new.evaluate([:list, 1, 2, 3]).should be == [1,2,3]
   end
 
+  it "should return nil for (cdr nil)" do
+    DsLisp.new.evaluate("(cdr nil)").should be == nil
+  end
+
   # type recognizers
   [:a, 1, [1,2,3,4], [], nil].each do |obj|
     result = (obj == nil or obj == []) ? true : nil

data/spec/functions.rb~

@@ -32,6 +32,10 @@ describe DsLisp, "ds lisp functions"  do
     DsLisp.new.evaluate([:list, 1, 2, 3]).should be == [1,2,3]
   end
 
+  it "should return nil for (cdr nil)" do
+    DsLisp.new.evaluate("(cdr nil)").should be == [2, 3]
+  end
+
   # type recognizers
   [:a, 1, [1,2,3,4], [], nil].each do |obj|
     result = (obj == nil or obj == []) ? true : nil
@@ -144,6 +148,31 @@ describe DsLisp, "ds lisp functions"  do
   it "should interpret T symbol as true" do
     DsLisp.new.evaluate(:T).should be == true
   end
+
+  it "should execute apply with symbol function" do
+    DsLisp.new.evaluate("(apply 'car '((1 2 3)))").should be == 1
+  end
+
+  it "should execute apply with lambda" do
+    DsLisp.new.evaluate("(apply (lambda (x) (car x)) '((1 2 3)))").should be == 1
+  end
+
+  it "should execute apply with quoted lambda" do
+    DsLisp.new.evaluate("(apply '(lambda (x) (car x)) '((1 2 3)))").should be == 1
+  end
+
+  it "should execute funcall with symbol function" do
+    DsLisp.new.evaluate("(funcall 'car '(1 2 3))").should be == 1
+  end
+
+  it "should execute apply with lambda" do
+    DsLisp.new.evaluate("(funcall (lambda (x) (car x)) '(1 2 3))").should be == 1
+  end
+
+  it "should execute apply with quoted lambda" do
+    DsLisp.new.evaluate("(funcall '(lambda (x) (car x)) '(1 2 3))").should be == 1
+  end
+
 end
 
 

data/spec/variable.rb

@@ -4,5 +4,13 @@ describe DsLisp, "ds lisp variables"  do
   it "should evaluate variables on if" do
     DsLisp.new.evaluate("((lambda (x) (if (> x 2) x 2)) 3)").should be == 3
   end
+
+  it "should assign variables via let" do
+    DsLisp.new.evaluate("(let ((a 5)) a)").should be == 5
+  end
+
+  it "should assign multiple variables via let" do
+    DsLisp.new.evaluate("(let ((a 5) (b 6)) (+ a b) )").should be == 11
+  end
 end
 

data/spec/variable.rb~

@@ -1,8 +1,16 @@
 require "dslisprb"
 
-describe DsLisp, "ds lisp execution"  do
+describe DsLisp, "ds lisp variables"  do
   it "should evaluate variables on if" do
     DsLisp.new.evaluate("((lambda (x) (if (> x 2) x 2)) 3)").should be == 3
   end
+
+  it "should assign variables via let" do
+    DsLisp.new.evaluate("(let ((a 5)) a)").should be == 3
+  end
+
+  it "should assign multiple variables via let" do
+    DsLisp.new.evaluate("(let ((a 5) (b 6)) (+ a b) )").should be == 11
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslisprb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000Z
+date: 2013-01-03 00:00:00.000000000Z
 dependencies: []
 description: 
 email: robertodarioseminara@gmail.com