rubylisp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e43b771e458951f6724a4ea368359b651af68aa
-  data.tar.gz: 32043fab0730d6414558a3fed26e3063b0a16943
+  metadata.gz: bb83eafd57c37cbb7ef8e45248b31ec8aed7b124
+  data.tar.gz: e9660c1b0bf3b359b18d0ff10af7b21790ef32cd
 SHA512:
-  metadata.gz: 13a455aa9220f5f7850a5a2f9e6c54f2544cc6b5f946d3529cc056a0d4b589ca856f426da3604f22e1c986ff7535b1b96690a08fd4d30f25883eed3c2151a23a
-  data.tar.gz: c5fd927f7d655390e1dc5d9a415f1ccb04fb1ed775e59d8b60aa5b16da3eb19325aeb99bc74aff20ef76321736c7c6866fbb77593deefad49bcee2a404b7499d
+  metadata.gz: 6023b05ca6246ea48b013ff1449063925b77d164aa938682d4601a8a7197d00260a582e9bc3d4acc71b14e9517b70259bc09d0557641d1c1722c9cd4050d85cb
+  data.tar.gz: 8a4dcc8eec4c6c0bf60c17a15ee195aa08ca8a4a18fd0080622a0cf0676d56b64be890efd9eff4e781bce4d576f445112b718008ef8a6bd875bba1d43cb23afb

data/bin/rubylisp

@@ -9,6 +9,10 @@ puts 'RubyLisp REPL'
 parser = Lisp::Parser.new
 
 while line = Readline.readline('> ', true)
-  puts parser.parse(line).evaluate(Lisp::EnvironmentFrame.global).to_s
+  begin 
+    puts parser.parse_and_eval(line)
+  rescue Exception => ex
+    puts "ERROR: #{ex}"
+  end
 end
 

data/lib/rubylisp/function.rb

@@ -2,18 +2,18 @@ module Lisp
 
   class Function < Atom
 
-    attr_reader :doc
+    attr_reader :doc, :arity
     
     def compute_required_argument_count(args)
       a = args
-      @required_argument_count = 0
+      @arity = 0
       @var_args = false
       while a
         if a.symbol?
           @var_args = true
           return
         else
-          @required_argument_count += 1
+          @arity += 1
         end
         a = a.cdr
       end
@@ -35,9 +35,9 @@ module Lisp
 
     def internal_apply_to(parameters, env, should_eval)
       if @var_args
-        raise "#{@name} expected at least #{@required_argument_count} parameters, received #{parameters.length}." if parameters.length < @required_argument_count
+        raise "#{@name} expected at least #{@arity} parameters, received #{parameters.length}." if parameters.length < @arity
       else
-        raise "#{@name} expected #{@required_argument_count} parameters, received #{parameters.length}." unless parameters.length == @required_argument_count        
+        raise "#{@name} expected #{@arity} parameters, received #{parameters.length}." unless parameters.length == @arity        
       end
       
       local_env = EnvironmentFrame.extending(@env, env.frame)

data/lib/rubylisp/parser.rb

@@ -167,6 +167,11 @@ module Lisp
       return sexpr
     end
 
+    def parse_and_eval(src, env=Lisp::EnvironmentFrame.global)
+      sexpr = self.parse(src)
+      return sexpr.evaluate(env)
+    end
+
     def parse_and_eval_all(src, env=Lisp::EnvironmentFrame.global)
       tokenizer = Tokenizer.new(src)
       tokenizer.init

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubylisp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dave Astels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-09-06 00:00:00.000000000 Z
 dependencies: []
 description: An embeddable Lisp as an extension language for Ruby
 email: dastels@icloud.com
@@ -55,7 +55,7 @@ files:
 - lib/rubylisp/tokenizer.rb
 - lib/rubylisp/type_checks.rb
 - lib/rubylisp/vector.rb
-homepage: http://rubygems.org/gems/rubylisp
+homepage: https://bitbucket.org/dastels/rubylisp
 licenses:
 - MIT
 metadata: {}