dslisprb 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.0.4   Implemented apply and funcall 
+
+        Fix of variable assignments on lambda calla
+
+        Load of source files from console and multiline functions allowing line breaks
+
 0.0.3   fixed interpretation of special nil and T symbols
 
         implemented autocompletion of lisp variable names on dslisp console

data/Rakefile

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

data/bin/dslisprb

@@ -24,23 +24,43 @@ if ARGV[0]
 else
   # repl
   require 'readline'
-  print "enter lisp commands or quit to exit\n"
+  print "enter lisp commands and see the output
+enter quit to exit
+enter load to execute a source file. Example: load test.lisp
+
+Tip: use tab key to autocomplete variable/function names
+"
+
 
   stty_save = `stty -g`.chomp
   trap('INT') { system('stty', stty_save); exit }
 
   Readline.completion_append_character = " "
   Readline.completion_proc = proc do |s|
-    dslisp.variables.grep( /^#{Regexp.escape(s)}/ )
+    (dslisp.variables + ["quit", "load"]).grep( /^#{Regexp.escape(s)}/ )
   end
 
-  while cmd = Readline.readline('> ', true)
-    if cmd == "quit"
-      exit
-    end
+  accumulated = ""
 
+  while cmd = Readline.readline(accumulated == "" ? '> ' : '?> ', true)
     begin
-      print dslisp.evaluate(cmd).lisp_inspect,"\n"
+      if cmd.split.first == "quit"
+        exit
+      elsif cmd.split.first == "load"
+        filename = cmd.split[1]
+        print dslisp.evaluate(File.open(filename).read.gsub("\n"," ")).lisp_inspect,"\n"
+      else
+        accumulated = accumulated + " " + cmd
+        if accumulated.count('(') - accumulated.count(')') == 0
+          begin
+            print dslisp.evaluate(accumulated.gsub("\n"," ")).lisp_inspect,"\n"
+          ensure
+            accumulated = ""
+          end        
+        end
+      end
+    rescue SystemExit => e
+      raise e    
     rescue Exception => e
       p e
       print e.backtrace.join("\n"),"\n"

data/lib/dslisprb.rb

@@ -66,13 +66,17 @@ class DsLisp
 
       def lambda(code)
         arguments = code[1].map(&ToRuby.method(:name_convert)).map(&:to_s)
-        "(#{arguments.join(",")} = #{code[1].map{"nil"}.join(",")} ;lambda{|*x|
-            oldargs = [ #{arguments.join(",")} ] # save current bindings
+
+        @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(";")} 
             begin
               aux = #{ToRuby.to_ruby(code[2])}
             ensure
-              #{arguments.join(",")} = oldargs # restore bindings
+              #{(0..arguments.size-1).map{|i| "#{arguments[i]} = #{oldargsvar}[#{i}]" }.join(";")}
             end
             aux
           }.lisp_inner_code(#{code.lisp_inspect.inspect}))"
@@ -121,6 +125,10 @@ class DsLisp
   end
 
   def parse(str)
+    if str =~ /^\s*$/
+      return :nil
+    end
+
     if str.count("(") != str.count(")")
       raise "Parentheshis count does not match, try adding parenthesis at the end of string :P"
     end
@@ -199,7 +207,7 @@ private
       _nth = lambda{|index,list| list[index-1]}
 
       # list constructors
-      _cons = lambda{|element, list| [element]+list}
+      _cons = lambda{|element, list| [element]+list.to_a}
       _append = plus
       _list = lambda{|*args| args}
 
@@ -229,8 +237,8 @@ private
       as_function = lambda{|object|
         if Symbol === object
           eval(ToRuby.name_convert(object),@binding)
-        elsif not object.respond_to?(:call)
-          lambda{|*x| object}
+        elsif Array === object
+          evaluate(object)
         else
           object
         end
@@ -243,6 +251,8 @@ 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) }    
     end
     @binding
   end

data/lib/dslisprb.rb~

@@ -66,13 +66,17 @@ class DsLisp
 
       def lambda(code)
         arguments = code[1].map(&ToRuby.method(:name_convert)).map(&:to_s)
-        "(#{arguments.join(",")} = #{code[1].map{"nil"}.join(",")} ;lambda{|*x|
-            oldargs = [ #{arguments.join(",")} ] # save current bindings
+
+        @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(";")} 
             begin
               aux = #{ToRuby.to_ruby(code[2])}
             ensure
-              #{arguments.join(",")} = oldargs # restore bindings
+              #{(0..arguments.size-1).map{|i| "#{arguments[i]} = #{oldargsvar}[#{i}]" }.join(";")}
             end
             aux
           }.lisp_inner_code(#{code.lisp_inspect.inspect}))"
@@ -121,6 +125,10 @@ class DsLisp
   end
 
   def parse(str)
+    if str =~ /^\s*$/
+      return :nil
+    end
+
     if str.count("(") != str.count(")")
       raise "Parentheshis count does not match, try adding parenthesis at the end of string :P"
     end
@@ -199,7 +207,7 @@ private
       _nth = lambda{|index,list| list[index-1]}
 
       # list constructors
-      _cons = lambda{|element, list| [element]+list}
+      _cons = lambda{|element, list| [element]+list.to_a}
       _append = plus
       _list = lambda{|*args| args}
 
@@ -230,6 +238,7 @@ private
         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}
         else
           object
@@ -243,6 +252,8 @@ 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) }    
     end
     @binding
   end
@@ -260,6 +271,12 @@ class Symbol
   end
 end
 
+class TrueClass
+  def lisp_inspect
+    "T"
+  end
+end
+
 class Array
   def lisp_inspect
     "(" + map(&:lisp_inspect).join(" ") + ")"  

data/spec/functions.rb

@@ -144,6 +144,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/functions.rb~

@@ -142,7 +142,7 @@ describe DsLisp, "ds lisp functions"  do
   end
 
   it "should interpret T symbol as true" do
-    DsLisp.new.evaluate(:T).should be == nil
+    DsLisp.new.evaluate(:T).should be == true
   end
 end
 

data/spec/stack.rb

@@ -10,5 +10,43 @@ describe DsLisp, "ds lisp stack"  do
     dslisp.evaluate("(set foo2 (lambda (x) (foo1 4)))")
     dslisp.evaluate("(foo2 3)").should be == 7
   end
+
+  it "should restore variable f when assigned to list" do
+
+    dslisp = DsLisp.new
+
+    dslisp.evaluate("(defun b (f x)
+  (mapcar 
+    (lambda (a)
+      (a x)
+    )
+
+    f
+  )
+) ".gsub("\n"," "))
+
+    dslisp.evaluate("(set f 100)")
+    dslisp.evaluate("(b (list car cdr) '(1 2 3))")
+    dslisp.evaluate("f").should be == 100
+  end
+
+  it "should restore variable f when assigned to list when assignment occurs before defun" do
+
+    dslisp = DsLisp.new
+
+    dslisp.evaluate("(set f 100)")
+    dslisp.evaluate("(defun b (f x)
+  (mapcar 
+    (lambda (a)
+      1
+    )
+
+    f
+  )
+) ".gsub("\n"," "))
+
+    dslisp.evaluate("(b '(list car) '(1 2 3))")
+    dslisp.evaluate("f").should be == 100
+  end
 end
 

data/spec/stack.rb~

@@ -8,7 +8,45 @@ describe DsLisp, "ds lisp stack"  do
     dslisp.evaluate("(set x 100)")
     dslisp.evaluate("(set foo1 (lambda (z) (+ x z)))")
     dslisp.evaluate("(set foo2 (lambda (x) (foo1 4)))")
-    dslisp.evluaate("(foo2 3)").should be == 7
+    dslisp.evaluate("(foo2 3)").should be == 7
+  end
+
+  it "should restore variable f when assigned to list" do
+
+    dslisp = DsLisp.new
+
+    dslisp.evaluate("(defun b (f x)
+  (mapcar 
+    (lambda (a)
+      (a x)
+    )
+
+    f
+  )
+) ".gsub("\n"," "))
+
+    dslisp.evaluate("(set f 100)")
+    dslisp.evaluate("(b (list car cdr) '(1 2 3))")
+    dslisp.evaluate("f").should be == 100
+  end
+
+  it "should restore variable f when assigned to list when assignment occurs before defun" do
+
+    dslisp = DsLisp.new
+
+    dslisp.evaluate("(set f 100)")
+    dslisp.evaluate("(defun b (f x)
+  (mapcar 
+    (lambda (a)
+      1
+    )
+
+    f
+  )
+) ".gsub("\n"," "))
+
+    dslisp.evaluate("(b '() '(1 2 3))")
+    dslisp.evaluate("f").should be == 100
   end
 end
 

metadata

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