dslisprb 0.0.1 → 0.0.2

data/CHANGELOG

@@ -0,0 +1,7 @@
+0.0.2   conditional structure if and cond   
+
+        mapcar and mapcan
+
+        Defined functions and variable persistance between multiple evaluate calls by using binding  
+
+0.0.1   First release

data/README.rdoc

@@ -20,8 +20,6 @@ allowing reuse of the ruby stack instead of reimplement it
 
 == TODO:
 
-* MAPCAR
-* Defined functions and variable persistent between multiple evaluate calls
 * caaaar, cdadar, cddra, etc...
 
 == SYNOPSIS:

data/Rakefile

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

data/TODO

@@ -1,3 +1 @@
-* MAPCAR
-* Defined functions and variable persistent between multiple evaluate calls
 * caaaar, cdadar, cddra, etc...

data/bin/dslisprb

@@ -11,7 +11,7 @@ if ARGV[0]
     evaluate lisp expression, shows the result on standard output and exit
 
     Example:
-      dslisprb \"(car '(1 2 3))\"
+      dslisprb \"(cdr '(1 2 3))\"
       (2 3)
 
   dslisprb without arguments starts the repl

data/lib/dslisprb.rb

@@ -29,7 +29,13 @@ class DsLisp
             end
           end    
         else
-          code.inspect  
+          if code == :nil
+            nil
+          elsif code == :T
+            true
+          else
+            code.inspect
+          end  
         end
       end    
     end
@@ -41,6 +47,23 @@ class DsLisp
         code[1].inspect
       end
 
+      def cond(code)
+        "(nil.tap { 
+        " + code[1..-1].map{ |condition_code|
+          "(break (#{ToRuby.to_ruby condition_code[1]}) if (#{ToRuby.to_ruby condition_code[0]}))"
+        }.join(";") + "})"
+      end
+
+      def if(code)
+        "(if (#{ToRuby.to_ruby code[1]})
+            #{ToRuby.to_ruby code[2]}
+          else
+            #{ToRuby.to_ruby code[3]}
+          end
+         )
+         "
+      end
+
       def lambda(code)
         arguments = code[1].map(&:to_s).join(",")
         "lambda{|#{arguments}| #{ToRuby.to_ruby(code[2])}}.lisp_inner_code(#{code.lisp_inspect.inspect})"
@@ -127,46 +150,75 @@ class DsLisp
     if String === code
       return evaluate(parse code)
     end
-    # arithmethic
-    plus = lambda{|x,y| x+y}
-    mult = lambda{|x,y| x*y}
-    divide = lambda{|x,y| x/y}
-    minus = lambda{|x,y| x-y}
-
-    lt = lambda{|x,y| x<y || nil}
-    ht = lambda{|x,y| x>y || nil}
-    _eq = lambda{|x,y| x==y || nil}
-
-      
-    # list selectors
-    _car = lambda{|x| x.first}
-    _cdr = lambda{|x| x[1..-1]}
-    _nth = lambda{|index,list| list[index-1]}
-
-    # list constructors
-    _cons = lambda{|element, list| [element]+list}
-    _append = plus
-    _list = lambda{|*args| args}
-
-    # recognizers
-    _null = lambda{|element| (element == nil or element == []) || nil}
-    _atom = lambda{|element| (not Array === element) || nil}
-    _numberp = lambda{|element| Numeric === element || nil}
-    _symbolp = lambda{|element| Symbol === element || nil}
-    _listp = lambda{|element| Array === element || nil}
-    _length = lambda{|list| list.size}
-
-    # nil
-    _nil = lambda{nil}
-
-    # boolean
-    _not = lambda{|a| (not a) || nil}
-    _and = lambda{|a,b| (a and b) || nil}
-    _or = lambda{|a,b| (a or b) || nil}
 
     # generate ruby code for lisp ast
     ruby_code = ToRuby.to_ruby(code)
-    eval(ruby_code)
+    eval(ruby_code, main_binding)
+  end
+
+private
+  
+  def main_binding
+    unless @binding
+      @binding = binding
+
+      # arithmethic
+      plus = lambda{|x,y| x+y}
+      mult = lambda{|x,y| x*y}
+      divide = lambda{|x,y| x/y}
+      minus = lambda{|x,y| x-y}
+
+      lt = lambda{|x,y| x<y || nil}
+      ht = lambda{|x,y| x>y || nil}
+      _eq = lambda{|x,y| x==y || nil}
+
+        
+      # list selectors
+      _car = lambda{|x| x.first}
+      _cdr = lambda{|x| x[1..-1]}
+      _nth = lambda{|index,list| list[index-1]}
+
+      # list constructors
+      _cons = lambda{|element, list| [element]+list}
+      _append = plus
+      _list = lambda{|*args| args}
+
+      # recognizers
+      _null = lambda{|element| (element == nil or element == []) || nil}
+      _atom = lambda{|element| (not Array === element) || nil}
+      _numberp = lambda{|element| Numeric === element || nil}
+      _symbolp = lambda{|element| Symbol === element || nil}
+      _listp = lambda{|element| Array === element || nil}
+      _length = lambda{|list| list.size}
+
+      # nil
+      _nil = lambda{nil}
+
+      # boolean
+      _not = lambda{|a| (not a) || nil}
+      _and = lambda{|a,b| (a and b) || nil}
+      _or = lambda{|a,b| (a or b) || nil}
+
+
+      as_function = lambda{|object|
+        if Symbol === object
+          eval(ToRuby.name_convert(object),@binding)
+        elsif not object.respond_to?(:call)
+          lambda{|*x| object}
+        else
+          object
+        end
+      }
+
+      _mapcan = lambda{|function, list|
+        list.map(&as_function.call(function)).map{|x|
+          x || [] 
+        }.inject(&:+)
+      }
+
+      _mapcar = lambda{|function, list| list.map(&as_function.call(function))}
+    end
+    @binding
   end
 end
 

data/lib/dslisprb.rb~

@@ -29,7 +29,13 @@ class DsLisp
             end
           end    
         else
-          code.inspect  
+          if code == :nil
+            nil
+          elsif code == :T
+            true
+          else
+            code.inspect
+          end  
         end
       end    
     end
@@ -41,6 +47,24 @@ class DsLisp
         code[1].inspect
       end
 
+      def cond(code)
+        "(nil.tap { 
+        " + code[1..-1].map{ |condition_code|
+          "(break (#{ToRuby.to_ruby condition_code[1]}) if (#{ToRuby.to_ruby condition_code[0]}))"
+        }.join(";")
+        + "})"
+      end
+
+      def if(code)
+        "(if (#{ToRuby.to_ruby code[1]})
+            #{ToRuby.to_ruby code[2]}
+          else
+            #{ToRuby.to_ruby code[3]}
+          end
+         )
+         "
+      end
+
       def lambda(code)
         arguments = code[1].map(&:to_s).join(",")
         "lambda{|#{arguments}| #{ToRuby.to_ruby(code[2])}}.lisp_inner_code(#{code.lisp_inspect.inspect})"
@@ -90,7 +114,7 @@ class DsLisp
 
   def parse(str)
     if str.count("(") != str.count(")")
-      raise "Parentheshis count does not match, try adding parenthesis to the end :P"
+      raise "Parentheshis count does not match, try adding parenthesis at the end of string :P"
     end
 
     if matchdata = /^\s*\'(.*)\s*$/.match(str)
@@ -127,46 +151,75 @@ class DsLisp
     if String === code
       return evaluate(parse code)
     end
-    # arithmethic
-    plus = lambda{|x,y| x+y}
-    mult = lambda{|x,y| x*y}
-    divide = lambda{|x,y| x/y}
-    minus = lambda{|x,y| x-y}
-
-    lt = lambda{|x,y| x<y || nil}
-    ht = lambda{|x,y| x>y || nil}
-    _eq = lambda{|x,y| x==y || nil}
-
-      
-    # list selectors
-    _car = lambda{|x| x.first}
-    _cdr = lambda{|x| x[1..-1]}
-    _nth = lambda{|index,list| list[index-1]}
-
-    # list constructors
-    _cons = lambda{|element, list| [element]+list}
-    _append = plus
-    _list = lambda{|*args| args}
-
-    # recognizers
-    _null = lambda{|element| (element == nil or element == []) || nil}
-    _atom = lambda{|element| (not Array === element) || nil}
-    _numberp = lambda{|element| Numeric === element || nil}
-    _symbolp = lambda{|element| Symbol === element || nil}
-    _listp = lambda{|element| Array === element || nil}
-    _length = lambda{|list| list.size}
-
-    # nil
-    _nil = lambda{nil}
-
-    # boolean
-    _not = lambda{|a| (not a) || nil}
-    _and = lambda{|a,b| (a and b) || nil}
-    _or = lambda{|a,b| (a or b) || nil}
 
     # generate ruby code for lisp ast
     ruby_code = ToRuby.to_ruby(code)
-    eval(ruby_code)
+    eval(ruby_code, main_binding)
+  end
+
+private
+  
+  def main_binding
+    unless @binding
+      @binding = binding
+
+      # arithmethic
+      plus = lambda{|x,y| x+y}
+      mult = lambda{|x,y| x*y}
+      divide = lambda{|x,y| x/y}
+      minus = lambda{|x,y| x-y}
+
+      lt = lambda{|x,y| x<y || nil}
+      ht = lambda{|x,y| x>y || nil}
+      _eq = lambda{|x,y| x==y || nil}
+
+        
+      # list selectors
+      _car = lambda{|x| x.first}
+      _cdr = lambda{|x| x[1..-1]}
+      _nth = lambda{|index,list| list[index-1]}
+
+      # list constructors
+      _cons = lambda{|element, list| [element]+list}
+      _append = plus
+      _list = lambda{|*args| args}
+
+      # recognizers
+      _null = lambda{|element| (element == nil or element == []) || nil}
+      _atom = lambda{|element| (not Array === element) || nil}
+      _numberp = lambda{|element| Numeric === element || nil}
+      _symbolp = lambda{|element| Symbol === element || nil}
+      _listp = lambda{|element| Array === element || nil}
+      _length = lambda{|list| list.size}
+
+      # nil
+      _nil = lambda{nil}
+
+      # boolean
+      _not = lambda{|a| (not a) || nil}
+      _and = lambda{|a,b| (a and b) || nil}
+      _or = lambda{|a,b| (a or b) || nil}
+
+
+      as_function = lambda{|object|
+        if Symbol === object
+          eval(ToRuby.name_convert(object),@binding)
+        elsif not object.respond_to?(:call)
+          lambda{|*x| object}
+        else
+          object
+        end
+      }
+
+      _mapcan = lambda{|function, list|
+        list.map(&as_function.call(function)).map{|x|
+          x || [] 
+        }.inject(&:+)
+      }
+
+      _mapcar = lambda{|function, list| list.map(&as_function.call(function))}
+    end
+    @binding
   end
 end
 

data/spec/execution.rb

@@ -20,6 +20,12 @@ describe DsLisp, "ds lisp execution"  do
 
   it "should evaluate quote call to define literals" do
     DsLisp.new.evaluate([:quote, [1, 2, 3]]).should be == [1, 2, 3]
+  end
+
+  it "should preserve variables through multiple function calls" do
+    dslisp = DsLisp.new
+    dslisp.evaluate("(defun foo (x) (+ x 1))")
+    dslisp.evaluate("(foo 3)").should be == 4
   end 
 end
 

data/spec/execution.rb~

@@ -19,7 +19,11 @@ describe DsLisp, "ds lisp execution"  do
   end 
 
   it "should evaluate quote call to define literals" do
-    DsLisp.new.evaluate([:quote, [1, 2, 3]).should be == [1, 2, 3]
+    DsLisp.new.evaluate([:quote, [1, 2, 3]]).should be == [1, 2, 3]
+  end
+
+  it "should preserve variables through multiple function calls" do
+    DsLisp.new.evaluate([:quote, [1, 2, 3]]).should be == [1, 2, 3]
   end 
 end
 

data/spec/flowcontrol.rb

@@ -0,0 +1,24 @@
+require "dslisprb"
+
+describe DsLisp, "ds lisp flow control"  do
+  it "should execute second statement of if when first statement return true" do
+    DsLisp.new.evaluate([:if, :T, [:+, 110, 1], [:+, 220, 2]]).should be == 111
+  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
+  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
+
+  it "should execute cond statement" do
+    DsLisp.new.evaluate([:cond, [:T, [:+, 120, 3]]]).should be == 123
+  end 
+
+  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
+

data/spec/flowcontrol.rb~

@@ -0,0 +1,33 @@
+require "dslisprb"
+
+describe DsLisp, "ds lisp flow control"  do
+  it "should execute second statement of if when first statement return true" do
+    DsLisp.new.evaluate([:if, :T, [:+, 110, 1], [:+, 220, 2]]).should be == 111
+  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
+  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
+
+  it "should execute cond statement" do
+    DsLisp.new.evaluate([:cond, [:T, [:+, 120, 3]]]).should be == 123
+  end 
+
+  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 execute third statement of if when first statement return false" do
+    DsLisp.new.evaluate([:if, :nil, [:+, 110, 1], [:+, 220, 2]]).should be == 222
+  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

@@ -127,6 +127,19 @@ describe DsLisp, "ds lisp functions"  do
     end
   end
 
+  it "should execute mapcan" do
+    DsLisp.new.evaluate("(mapcan (lambda (x) (and (numberp x) (list x))) '(a 1 b c 3 4 d 5))").should be == [1, 3, 4, 5]
+  end
+
+  it "should execute mapcar" do
+    DsLisp.new.evaluate("(mapcar (lambda (x) (+ x 1)) '(1 2 3 4))").should be == [2, 3, 4, 5]
+  end
+
+  it "should execute mapcar with defined function" do
+    dslisp = DsLisp.new
+    dslisp.evaluate("(defun foo (x) (+ x 1))")
+    dslisp.evaluate("(mapcar foo '(1 2 3 4))").should be == [2, 3, 4, 5]
+  end
 end
 
 

data/spec/functions.rb~

@@ -1,6 +1,6 @@
 require "dslisprb"
 
-describe DsLisp::CommonLispFunctions, "ds lisp functions"  do
+describe DsLisp, "ds lisp functions"  do
 
   # selectors
   it "should return 1 for (car (quote (1 2)))" do
@@ -127,6 +127,13 @@ describe DsLisp::CommonLispFunctions, "ds lisp functions"  do
     end
   end
 
+  it "should execute mapcan" do
+    DsLisp.new.evaluate("(mapcan (lambda (x) (and (numberp x) (list x))) '(a 1 b c 3 4 d 5))").should be == [1, 3, 4, 5]
+  end
+
+  it "should execute mapcar" do
+    DsLisp.new.evaluate("(mapcar (lambda (x) (+ x 1)) '(1 2 3 4))").should be == [2, 3, 4, 5]
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslisprb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000Z
+date: 2012-05-27 00:00:00.000000000Z
 dependencies: []
 description: 
 email: robertodarioseminara@gmail.com
@@ -20,7 +20,9 @@ extra_rdoc_files: []
 files:
 - lib/dslisprb.rb
 - lib/dslisprb.rb~
+- spec/flowcontrol.rb~
 - spec/macro.rb
+- spec/flowcontrol.rb
 - spec/ast.rb
 - spec/defun.rb~
 - spec/execution.rb~